- dtucker@cvs.openbsd.org 2005/02/27 11:33:30

     [multiplex.sh test-exec.sh sshd-log-wrapper.sh]
     Add optional capability to log output from regress commands; ok markus@
     Use with: make TEST_SSH_LOGFILE=/tmp/regress.log

1 files changed, 14 insertions, 4 deletions

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 346b68f16..958c87109 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: test-exec.sh,v 1.26 2005/01/14 04:21:18 david Exp $
+#       $OpenBSD: test-exec.sh,v 1.27 2005/02/27 11:33:30 dtucker Exp $
 #       Placed in the Public Domain.
 
 #SUDO=sudo
@@ -47,6 +47,8 @@ else
 fi
 unset SSH_AUTH_SOCK
 
+SRC=`dirname ${SCRIPT}`
+
 # defaults
 SSH=ssh
 SSHD=sshd
@@ -91,6 +93,10 @@ if [ ! -x /$SSHD ]; then
         SSHD=`which sshd`
 fi
 
+if [ "x$TEST_SSH_LOGFILE" = "x" ]; then
+        TEST_SSH_LOGFILE=/dev/null
+fi
+
 # these should be used in tests
 export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP
 #echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER $SCP
@@ -140,6 +146,7 @@ cleanup ()
 
 trace ()
 {
+        echo "trace: $@" >>$TEST_SSH_LOGFILE
         if [ "X$TEST_SSH_TRACE" = "Xyes" ]; then
                 echo "$@"
         fi
@@ -147,6 +154,7 @@ trace ()
 
 verbose ()
 {
+        echo "verbose: $@" >>$TEST_SSH_LOGFILE
         if [ "X$TEST_SSH_QUIET" != "Xyes" ]; then
                 echo "$@"
         fi
@@ -155,12 +163,14 @@ verbose ()
 
 fail ()
 {
+        echo "FAIL: $@" >>$TEST_SSH_LOGFILE
         RESULT=1
         echo "$@"
 }
 
 fatal ()
 {
+        echo "FATAL: $@" >>$TEST_SSH_LOGFILE
         echon "FATAL: "
         fail "$@"
         cleanup
@@ -180,7 +190,7 @@ cat << EOF > $OBJ/sshd_config
         #ListenAddress          ::1
         PidFile                 $PIDFILE
         AuthorizedKeysFile      $OBJ/authorized_keys_%u
-        LogLevel                QUIET
+        LogLevel                DEBUG
         AcceptEnv               _XXX_TEST_*
         AcceptEnv               _XXX_TEST
         Subsystem       sftp    $SFTPSERVER
@@ -251,7 +261,7 @@ chmod 644 $OBJ/authorized_keys_$USER
 # create a proxy version of the client config
 (
         cat $OBJ/ssh_config
-        echo proxycommand ${SUDO} ${SSHD} -i -f $OBJ/sshd_proxy
+        echo proxycommand sh ${SRC}/sshd-log-wrapper.sh ${SUDO} ${SSHD} ${TEST_SSH_LOGFILE} -i -f $OBJ/sshd_proxy
 ) > $OBJ/ssh_proxy
 
 # check proxy config
@@ -261,7 +271,7 @@ start_sshd ()
 {
         # start sshd
         $SUDO ${SSHD} -f $OBJ/sshd_config -t    || fatal "sshd_config broken"
-        $SUDO ${SSHD} -f $OBJ/sshd_config
+        $SUDO ${SSHD} -f $OBJ/sshd_config -e >>$TEST_SSH_LOGFILE 2>&1
 
         trace "wait for sshd"
         i=0;