diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-01-23 22:26:20 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-01-23 22:26:20 +0000 |
| commit | abbe48e3493ac822f3c2d7d0f5ca122ae60a4ae9 (patch) | |
| tree | 647af7378837e4115c0a06d53145a8122d5e1370 /regress/usr.bin | |
| parent | 11512380d2c94f3df44797e70f8f12823d2a7bc0 (diff) | |
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).
Diffstat (limited to 'regress/usr.bin')
| -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\"" |