diff options
| author | Damien Miller <djm@mindrot.org> | 2008-03-12 13:59:43 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-03-12 13:59:43 +0100 |
| commit | 4cd5fbab4d73b135e7775d90bb747eca4fca12cd (patch) | |
| tree | 7915d2c2cd4e8222b71e8f88bcaec6a7bcd56751 | |
| parent | - jmc@cvs.openbsd.org 2007/11/25 15:35:09 (diff) | |
| download | openssh-4cd5fbab4d73b135e7775d90bb747eca4fca12cd.tar.xz openssh-4cd5fbab4d73b135e7775d90bb747eca4fca12cd.zip | |
- djm@cvs.openbsd.org 2007/12/12 05:04:03
[regress/sftp-cmds.sh]
unbreak lls command and add a regress test that would have caught the
breakage; spotted by mouring@
NB. sftp code change already committed.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | regress/sftp-cmds.sh | 11 |
2 files changed, 13 insertions, 5 deletions
@@ -8,6 +8,11 @@ more existant -> existent, from Martynas Venckus; pfctl changes: ok henning ssh changes: ok deraadt + - djm@cvs.openbsd.org 2007/12/12 05:04:03 + [regress/sftp-cmds.sh] + unbreak lls command and add a regress test that would have caught the + breakage; spotted by mouring@ + NB. sftp code change already committed. 20080311 - (dtucker) [auth-pam.c monitor.c session.c sshd.c] Bug #926: Move @@ -3729,4 +3734,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.4868 2008/03/12 12:58:55 djm Exp $ +$Id: ChangeLog,v 1.4869 2008/03/12 12:59:43 djm Exp $ diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh index b7d7bb714..a9bf50472 100644 --- a/regress/sftp-cmds.sh +++ b/regress/sftp-cmds.sh @@ -1,4 +1,4 @@ -# $OpenBSD: sftp-cmds.sh,v 1.8 2007/10/24 03:32:35 djm Exp $ +# $OpenBSD: sftp-cmds.sh,v 1.9 2007/12/12 05:04:03 djm Exp $ # Placed in the Public Domain. # XXX - TODO: @@ -44,9 +44,12 @@ rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 mkdir ${COPY}.dd verbose "$tid: lls" -echo "lls ${OBJ}" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ - || fail "lls failed" -# XXX always successful +echo "cd ${OBJ}\nlls" | ${SFTP} -P ${SFTPSERVER} 2>&1 | \ + grep -q copy.dd || fail "lls failed" + +verbose "$tid: lls w/path" +echo "lls ${OBJ}" | ${SFTP} -P ${SFTPSERVER} 2>&1 | \ + grep -q copy.dd || fail "lls w/path failed" verbose "$tid: ls" echo "ls ${OBJ}" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ |