summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--regress/multiplex.sh6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9630ed6da..9f29f6aaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
19 - dtucker@cvs.openbsd.org 2004/06/16 13:15:09 19 - dtucker@cvs.openbsd.org 2004/06/16 13:15:09
20 [regress/scp.sh] 20 [regress/scp.sh]
21 Make scp -r tests use diff -rN not cmp (which won't do dirs. ok markus@ 21 Make scp -r tests use diff -rN not cmp (which won't do dirs. ok markus@
22 - dtucker@cvs.openbsd.org 2004/06/16 13:16:40
23 [multiplex.sh]
24 Silence multiplex sftp and scp tests. ok markus@
22 - (dtucker) [regress/test-exec.sh] 25 - (dtucker) [regress/test-exec.sh]
23 Move Portable-only StrictModes to top of list to make syncs easier. 26 Move Portable-only StrictModes to top of list to make syncs easier.
24 - (dtucker) [regress/README.regress] 27 - (dtucker) [regress/README.regress]
@@ -1248,4 +1251,4 @@
1248 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1251 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1249 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1252 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1250 1253
1251$Id: ChangeLog,v 1.3396 2004/06/16 13:22:37 dtucker Exp $ 1254$Id: ChangeLog,v 1.3397 2004/06/16 13:23:50 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 70a4e677f..9940f15cb 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: multiplex.sh,v 1.1 2004/06/13 15:04:08 djm Exp $ 1# $OpenBSD: multiplex.sh,v 1.2 2004/06/16 13:16:40 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4CTL=$OBJ/ctl-sock 4CTL=$OBJ/ctl-sock
@@ -23,13 +23,13 @@ cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls"
23rm -f $OBJ/ls.copy 23rm -f $OBJ/ls.copy
24trace "sftp transfer over multiplexed connection and check result" 24trace "sftp transfer over multiplexed connection and check result"
25echo "get /bin/ls $OBJ/ls.copy" | \ 25echo "get /bin/ls $OBJ/ls.copy" | \
26 ${SFTP} -oControlPath=$CTL otherhost 26 ${SFTP} -oControlPath=$CTL otherhost >/dev/null 2>&1
27test -f $OBJ/ls.copy || fail "failed copy /bin/ls" 27test -f $OBJ/ls.copy || fail "failed copy /bin/ls"
28cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls" 28cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls"
29 29
30rm -f $OBJ/ls.copy 30rm -f $OBJ/ls.copy
31trace "scp transfer over multiplexed connection and check result" 31trace "scp transfer over multiplexed connection and check result"
32${SCP} -oControlPath=$CTL otherhost:/bin/ls $OBJ/ls.copy 32${SCP} -oControlPath=$CTL otherhost:/bin/ls $OBJ/ls.copy >/dev/null 2>&1
33test -f $OBJ/ls.copy || fail "failed copy /bin/ls" 33test -f $OBJ/ls.copy || fail "failed copy /bin/ls"
34cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls" 34cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls"
35 35