upstream: Remove old log symlinks

before creating new ones. In -portable some platforms don't like
overwriting existing symlinks.

OpenBSD-Regress-ID: 7e7ddc0beb73e945e1c4c58d51c8a125b518120f
This commit is contained in:
dtucker@openbsd.org 2023-03-01 21:54:50 +00:00 committed by Darren Tucker
parent 131fcbcaff
commit 13fe8f9785
No known key found for this signature in database
1 changed files with 5 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: test-exec.sh,v 1.95 2023/03/01 09:29:32 dtucker Exp $ # $OpenBSD: test-exec.sh,v 1.96 2023/03/01 21:54:50 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
#SUDO=sudo #SUDO=sudo
@ -301,7 +301,8 @@ logfile="${TEST_SSH_LOGDIR}/\${timestamp}.ssh.\$\$.log"
echo "Executing: ${SSH} \$@" log \${logfile} >>$TEST_REGRESS_LOGFILE echo "Executing: ${SSH} \$@" log \${logfile} >>$TEST_REGRESS_LOGFILE
echo "Executing: ${SSH} \$@" >>\${logfile} echo "Executing: ${SSH} \$@" >>\${logfile}
for i in "\$@";do shift;case "\$i" in -q):;; *) set -- "\$@" "\$i";;esac;done for i in "\$@";do shift;case "\$i" in -q):;; *) set -- "\$@" "\$i";;esac;done
ln -f -s \${logfile} $TEST_SSH_LOGFILE rm -f $TEST_SSH_LOGFILE
ln -s \${logfile} $TEST_SSH_LOGFILE
exec ${SSH} -E\${logfile} "\$@" exec ${SSH} -E\${logfile} "\$@"
EOD EOD
@ -315,7 +316,8 @@ cat >$SSHDLOGWRAP <<EOD
#!/bin/sh #!/bin/sh
timestamp="\`$OBJ/timestamp\`" timestamp="\`$OBJ/timestamp\`"
logfile="${TEST_SSH_LOGDIR}/\${timestamp}.sshd.\$\$.log" logfile="${TEST_SSH_LOGDIR}/\${timestamp}.sshd.\$\$.log"
ln -f -s \${logfile} $TEST_SSHD_LOGFILE rm -f $TEST_SSH_LOGFILE
ln -s \${logfile} $TEST_SSH_LOGFILE
echo "Executing: ${SSHD} \$@" log \${logfile} >>$TEST_REGRESS_LOGFILE echo "Executing: ${SSHD} \$@" log \${logfile} >>$TEST_REGRESS_LOGFILE
echo "Executing: ${SSHD} \$@" >>\${logfile} echo "Executing: ${SSHD} \$@" >>\${logfile}
exec ${SSHD} -E\${logfile} "\$@" exec ${SSHD} -E\${logfile} "\$@"