- dtucker@cvs.openbsd.org 2004/06/16 13:16:40

     [multiplex.sh]
     Silence multiplex sftp and scp tests.  ok markus@

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 @@
    - dtucker@cvs.openbsd.org 2004/06/16 13:15:09
      [regress/scp.sh]
      Make scp -r tests use diff -rN not cmp (which won't do dirs.  ok markus@
+   - dtucker@cvs.openbsd.org 2004/06/16 13:16:40
+     [multiplex.sh]
+     Silence multiplex sftp and scp tests.  ok markus@
  - (dtucker) [regress/test-exec.sh]
    Move Portable-only StrictModes to top of list to make syncs easier.
  - (dtucker) [regress/README.regress]
@@ -1248,4 +1251,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3396 2004/06/16 13:22:37 dtucker Exp $
+$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 @@
-#       $OpenBSD: multiplex.sh,v 1.1 2004/06/13 15:04:08 djm Exp $
+#       $OpenBSD: multiplex.sh,v 1.2 2004/06/16 13:16:40 dtucker Exp $
 #       Placed in the Public Domain.
 
 CTL=$OBJ/ctl-sock
@@ -23,13 +23,13 @@ cmp /bin/ls $OBJ/ls.copy		|| fail "corrupted copy of /bin/ls"
 rm -f $OBJ/ls.copy
 trace "sftp transfer over multiplexed connection and check result"
 echo "get /bin/ls $OBJ/ls.copy" | \
-        ${SFTP} -oControlPath=$CTL otherhost
+        ${SFTP} -oControlPath=$CTL otherhost >/dev/null 2>&1
 test -f $OBJ/ls.copy                    || fail "failed copy /bin/ls"
 cmp /bin/ls $OBJ/ls.copy                || fail "corrupted copy of /bin/ls"
 
 rm -f $OBJ/ls.copy
 trace "scp transfer over multiplexed connection and check result"
-${SCP} -oControlPath=$CTL otherhost:/bin/ls $OBJ/ls.copy
+${SCP} -oControlPath=$CTL otherhost:/bin/ls $OBJ/ls.copy >/dev/null 2>&1
 test -f $OBJ/ls.copy                    || fail "failed copy /bin/ls"
 cmp /bin/ls $OBJ/ls.copy                || fail "corrupted copy of /bin/ls"