diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2024-10-22 09:13:28 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2024-10-22 10:19:26 +0200 |
| commit | 1b05d5437bf45bee5e3104772dea06ed51764f1b (patch) | |
| tree | 083d4aa44a64e913eb73ebd9b1636cb0cade61a7 | |
| parent | upstream: Add a sshd debug wrapper (diff) | |
| download | openssh-1b05d5437bf45bee5e3104772dea06ed51764f1b.tar.xz openssh-1b05d5437bf45bee5e3104772dea06ed51764f1b.zip | |
upstream: Remove sshd logfile in start_sshd
... and ssh and sshd log wrappers before recreating them. Prevents "can't
create" errors during tests when running tests without SUDO after having
run them with SUDO.
OpenBSD-Regress-ID: 2f0a83532e3dccd673a9bf0291090277268c69a6
| -rw-r--r-- | regress/test-exec.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 7a078edf6..307f002e6 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -1,4 +1,4 @@ -# $OpenBSD: test-exec.sh,v 1.120 2024/10/14 03:02:08 djm Exp $ +# $OpenBSD: test-exec.sh,v 1.121 2024/10/22 07:13:28 dtucker Exp $ # Placed in the Public Domain. #SUDO=sudo @@ -309,6 +309,7 @@ fi # to preserve our debug logging. In the rare instance where -q is desirable # -qq is equivalent and is not removed. SSHLOGWRAP=$OBJ/ssh-log-wrapper.sh +rm -f ${SSHLOGWRAP} cat >$SSHLOGWRAP <<EOD #!/bin/sh timestamp="\`$OBJ/timestamp\`" @@ -327,6 +328,7 @@ REAL_SSHD="$SSHD" SSH="$SSHLOGWRAP" SSHDLOGWRAP=$OBJ/sshd-log-wrapper.sh +rm -f ${SSHDLOGWRAP} cat >$SSHDLOGWRAP <<EOD #!/bin/sh timestamp="\`$OBJ/timestamp\`" @@ -903,6 +905,7 @@ start_sshd () i=`expr $i + 1` sleep $i done + rm -f ${TEST_SSHD_LOGFILE} ln -f -s ${logfile} $TEST_SSHD_LOGFILE test -f $PIDFILE || fatal "no sshd running on port $PORT" |