summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-03-12 23:59:43 +1100
committerDamien Miller <djm@mindrot.org>2008-03-12 23:59:43 +1100
commit4cd5fbab4d73b135e7775d90bb747eca4fca12cd (patch)
tree7915d2c2cd4e8222b71e8f88bcaec6a7bcd56751
parentd666d8e5d49f2e5bd5506a7f548d9ecee1b41d56 (diff)
- 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--ChangeLog7
-rw-r--r--regress/sftp-cmds.sh11
2 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b34a056d..e1d1d6e4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,11 @@
8 more existant -> existent, from Martynas Venckus; 8 more existant -> existent, from Martynas Venckus;
9 pfctl changes: ok henning 9 pfctl changes: ok henning
10 ssh changes: ok deraadt 10 ssh changes: ok deraadt
11 - djm@cvs.openbsd.org 2007/12/12 05:04:03
12 [regress/sftp-cmds.sh]
13 unbreak lls command and add a regress test that would have caught the
14 breakage; spotted by mouring@
15 NB. sftp code change already committed.
11 16
1220080311 1720080311
13 - (dtucker) [auth-pam.c monitor.c session.c sshd.c] Bug #926: Move 18 - (dtucker) [auth-pam.c monitor.c session.c sshd.c] Bug #926: Move
@@ -3729,4 +3734,4 @@
3729 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3734 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3730 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3735 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3731 3736
3732$Id: ChangeLog,v 1.4868 2008/03/12 12:58:55 djm Exp $ 3737$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 @@
1# $OpenBSD: sftp-cmds.sh,v 1.8 2007/10/24 03:32:35 djm Exp $ 1# $OpenBSD: sftp-cmds.sh,v 1.9 2007/12/12 05:04:03 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4# XXX - TODO: 4# XXX - TODO:
@@ -44,9 +44,12 @@ rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2
44mkdir ${COPY}.dd 44mkdir ${COPY}.dd
45 45
46verbose "$tid: lls" 46verbose "$tid: lls"
47echo "lls ${OBJ}" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ 47echo "cd ${OBJ}\nlls" | ${SFTP} -P ${SFTPSERVER} 2>&1 | \
48 || fail "lls failed" 48 grep -q copy.dd || fail "lls failed"
49# XXX always successful 49
50verbose "$tid: lls w/path"
51echo "lls ${OBJ}" | ${SFTP} -P ${SFTPSERVER} 2>&1 | \
52 grep -q copy.dd || fail "lls w/path failed"
50 53
51verbose "$tid: ls" 54verbose "$tid: ls"
52echo "ls ${OBJ}" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ 55echo "ls ${OBJ}" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \