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

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

diff --git a/ChangeLog b/ChangeLog
index b839d36bcff1a13d8e45504d00824224cab6dd25..a1c0f4586942983cf02d860040bde304e6f8a059 100644 (file)
--- 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]

diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 70a4e677f311c1d637911322ae4cb5c5d52e0579..9940f15cb4accf0c7506196445d5b86e9c51f8a6 100644 (file)
--- 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"