diff options
| author | Tim Rice <tim@multitalents.net> | 2008-03-07 19:00:33 -0800 |
|---|---|---|
| committer | Tim Rice <tim@multitalents.net> | 2008-03-07 19:00:33 -0800 |
| commit | 68d293859ed2db128003d6631b63847acf0ea79f (patch) | |
| tree | 76a75f4e097484cfc54bdb52934004376278df28 | |
| parent | a79bb8ec5e22fb3d58b8871c4c4e93cb96a9889c (diff) | |
- (tim) [regress/sftp-glob.sh] Shell portability fix.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | regress/sftp-glob.sh | 7 |
2 files changed, 7 insertions, 3 deletions
@@ -37,6 +37,7 @@ - deraadt@cvs.openbsd.org 2008/03/04 21:15:42 [version.h] crank version; from djm + - (tim) [regress/sftp-glob.sh] Shell portability fix. 20080302 - (dtucker) [configure.ac] FreeBSD's glob() doesn't behave the way we expect @@ -3697,4 +3698,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4859 2008/03/07 07:35:47 djm Exp $ +$Id: ChangeLog,v 1.4860 2008/03/08 03:00:33 tim Exp $ diff --git a/regress/sftp-glob.sh b/regress/sftp-glob.sh index 62004efc..60116a74 100644 --- a/regress/sftp-glob.sh +++ b/regress/sftp-glob.sh @@ -15,9 +15,12 @@ sftp_ls() { if [ $? -ne 0 ]; then fail "$errtag failed" fi - if test "x$expected" != "x" && \ - ! fgrep "$expected" ${RESULTS} >/dev/null 2>&1 ; then + if test "x$expected" != "x" ; then + if fgrep "$expected" ${RESULTS} >/dev/null 2>&1 ; then + : + else fail "$expected missing from $errtag results" + fi fi if test "x$unexpected" != "x" && \ fgrep "$unexpected" ${RESULTS} >/dev/null 2>&1 ; then |