diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2023-03-02 08:24:41 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2023-03-02 19:32:21 +1100 |
| commit | 0d514659b23a257247491179cfbb53a6dd64e164 (patch) | |
| tree | 5eb27f26fa2d169d35dcb321914a4083df75b6cd /regress | |
| parent | 860201201d4ae655702807966901682cff30a171 (diff) | |
| download | openssh-git-0d514659b23a257247491179cfbb53a6dd64e164.tar.gz | |
upstream: Fix breakage on dhgex test.
This was due to the sshd logs being written to the wrong log file.
While there, make save_debug_logs less verbose, write the name of the
tarball to regress.log and use $SUDO to remove the old symlinks (which
shouldn't be needed, but won't hurt). Initial problem spotted by anton@.
OpenBSD-Regress-ID: 9c44fb9cd418e6ff31165e7a6c1f9f11a6d19f5b
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/test-exec.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 8e596244..0ba30d58 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -1,4 +1,4 @@ -# $OpenBSD: test-exec.sh,v 1.96 2023/03/01 21:54:50 dtucker Exp $ +# $OpenBSD: test-exec.sh,v 1.97 2023/03/02 08:24:41 dtucker Exp $ # Placed in the Public Domain. #SUDO=sudo @@ -301,7 +301,7 @@ logfile="${TEST_SSH_LOGDIR}/\${timestamp}.ssh.\$\$.log" echo "Executing: ${SSH} \$@" log \${logfile} >>$TEST_REGRESS_LOGFILE echo "Executing: ${SSH} \$@" >>\${logfile} for i in "\$@";do shift;case "\$i" in -q):;; *) set -- "\$@" "\$i";;esac;done -rm -f $TEST_SSH_LOGFILE +$SUDO rm -f $TEST_SSH_LOGFILE ln -s \${logfile} $TEST_SSH_LOGFILE exec ${SSH} -E\${logfile} "\$@" EOD @@ -316,8 +316,8 @@ cat >$SSHDLOGWRAP <<EOD #!/bin/sh timestamp="\`$OBJ/timestamp\`" logfile="${TEST_SSH_LOGDIR}/\${timestamp}.sshd.\$\$.log" -rm -f $TEST_SSH_LOGFILE -ln -s \${logfile} $TEST_SSH_LOGFILE +$SUDO rm -f $TEST_SSHD_LOGFILE +ln -s \${logfile} $TEST_SSHD_LOGFILE echo "Executing: ${SSHD} \$@" log \${logfile} >>$TEST_REGRESS_LOGFILE echo "Executing: ${SSHD} \$@" >>\${logfile} exec ${SSHD} -E\${logfile} "\$@" @@ -495,15 +495,18 @@ start_debug_log () save_debug_log () { + testname=`echo $tid | tr ' ' _` + tarname="$OBJ/failed-$testname-logs.tar" + echo $@ >>$TEST_REGRESS_LOGFILE echo $@ >>$TEST_SSH_LOGFILE echo $@ >>$TEST_SSHD_LOGFILE + echo "Saving debug logs to $tarname" >>$TEST_REGRESS_LOGFILE (cat $TEST_REGRESS_LOGFILE; echo) >>$OBJ/failed-regress.log (cat $TEST_SSH_LOGFILE; echo) >>$OBJ/failed-ssh.log (cat $TEST_SSHD_LOGFILE; echo) >>$OBJ/failed-sshd.log # Save all logfiles in a tarball. - testname=`echo $tid | tr ' ' _` (cd $OBJ && logfiles="" for i in $TEST_REGRESS_LOGFILE $TEST_SSH_LOGFILE $TEST_SSHD_LOGFILE \ @@ -514,7 +517,7 @@ save_debug_log () logfiles="$logfiles $i" fi done - tar cfv $OBJ/failed-$testname-logs.tar $logfiles) + tar cf "$tarname" $logfiles) } trace () |