- (dtucker) OpenBSD CVS Sync (regress/)
- djm@cvs.openbsd.org 2003/04/04 09:34:22
[Makefile sftp-cmds.sh]
More regression tests, including recent directory rename bug; ok markus@
diff --git a/ChangeLog b/ChangeLog
index b1d1e92..b9cb8da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,9 @@
- markus@cvs.openbsd.org 2003/04/02 12:21:13
[Makefile]
enable rekey test
+ - djm@cvs.openbsd.org 2003/04/04 09:34:22
+ [Makefile sftp-cmds.sh]
+ More regression tests, including recent directory rename bug; ok markus@
20030614
- (djm) Update license on fake-rfc2553.[ch]; ok itojun@
@@ -545,4 +548,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.2811 2003/06/18 12:32:51 dtucker Exp $
+$Id: ChangeLog,v 1.2812 2003/06/18 12:35:11 dtucker Exp $
diff --git a/regress/Makefile b/regress/Makefile
index 938b7d3..2b8dbd6 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2003/04/02 12:21:13 markus Exp $
+# $OpenBSD: Makefile,v 1.22 2003/04/04 09:34:22 djm Exp $
REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7
@@ -25,6 +25,7 @@
keygen-change \
sftp \
sftp-cmds \
+ sftp-badcmds \
sftp-batch \
forwarding
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh
index 462c680..987887f 100644
--- a/regress/sftp-cmds.sh
+++ b/regress/sftp-cmds.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: sftp-cmds.sh,v 1.2 2003/01/10 07:52:41 djm Exp $
+# $OpenBSD: sftp-cmds.sh,v 1.3 2003/04/04 09:34:22 djm Exp $
# Placed in the Public Domain.
# XXX - TODO:
@@ -11,7 +11,7 @@
DATA=/bin/ls
COPY=${OBJ}/copy
-rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.*
+rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 ${BATCH}.*
verbose "$tid: lls"
echo "lls ${OBJ}" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
@@ -66,6 +66,13 @@
test -f ${COPY}.1 || fail "missing file after rename"
cmp $DATA ${COPY}.1 >/dev/null 2>&1 || fail "corrupted copy after rename"
+mkdir ${COPY}.dd
+verbose "$tid: rename directory"
+echo "rename ${COPY}.dd ${COPY}.dd2" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
+ || fail "rename directory failed"
+test -d ${COPY}.dd && fail "oldname exists after rename directory"
+test -d ${COPY}.dd2 || fail "missing newname after rename directory"
+
verbose "$tid: ln"
echo "ln ${COPY}.1 ${COPY}.2" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 || fail "ln failed"
test -L ${COPY}.2 || fail "missing file after ln"
@@ -95,6 +102,6 @@
echo "lchdir ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
|| fail "lchdir failed"
-rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.*
+rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 ${BATCH}.*