diff options
| author |   bluhm <bluhm@openbsd.org> | 2017-01-23 22:26:19 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2017-01-23 22:26:19 +0000 |
| commit | 88cb8eb8f5612809f0388ee989998539abf1e91a (patch) | |
| tree | 6e6bfd01f9d6daa60b473e2887b1524c79763ef1 | |
| parent | When run as root, fstat prints the pcb pointer instead of 0x0. (diff) | |
| download | wireguard-openbsd-88cb8eb8f5612809f0388ee989998539abf1e91a.tar.xz wireguard-openbsd-88cb8eb8f5612809f0388ee989998539abf1e91a.zip | |
The ftp program is only verbose by default, if stdin is a tty. As
the test greps for messages that are in the verbose output, add a
ftp -v option so that make regress can be run by cron(8).
| -rw-r--r-- | regress/usr.bin/ftp/redirect.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/regress/usr.bin/ftp/redirect.sh b/regress/usr.bin/ftp/redirect.sh index 2d6590ebeb0..7432b1e1e3a 100644 --- a/regress/usr.bin/ftp/redirect.sh +++ b/regress/usr.bin/ftp/redirect.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: redirect.sh,v 1.4 2017/01/23 22:03:46 bluhm Exp $ +# $OpenBSD: redirect.sh,v 1.5 2017/01/23 22:26:19 bluhm Exp $ : ${FTP:=ftp} @@ -20,12 +20,13 @@ echo "HTTP/1.0 302 Found\r\nLocation: $loc\r\n\r" | \ # Wait for the "server" to start until fstat | egrep 'nc[ ]+.*tcp 0x[0-9a-f]* \*:9000' > /dev/null; do -sleep .1 + sleep .1 done unset ftp_proxy -res=$(${FTP} -4 -o/dev/null $req1 2>&1 | sed '/^Redirected to /{s///;x;};$!d;x') +res=$(${FTP} -4 -o/dev/null -v $req1 2>&1 | \ + sed '/^Redirected to /{s///;x;};$!d;x') if [ X"$res" != X"$req2" ]; then echo "*** Fail; expected \"$req2\", got \"$res\"" |