From 2669c8e87f0c85f67ed81d48eb88df9e5bdd5bc9 Mon Sep 17 00:00:00 2001 From: dtucker Date: Wed, 1 Mar 2023 21:54:50 +0000 Subject: [PATCH] Remove old log symlinks before creating new ones. In -portable some platforms don't like overwriting existing symlinks. --- regress/usr.bin/ssh/test-exec.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh index 8567b08f5c2..0a8957d5429 100644 --- a/regress/usr.bin/ssh/test-exec.sh +++ b/regress/usr.bin/ssh/test-exec.sh @@ -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. #SUDO=sudo @@ -184,7 +184,8 @@ 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 -ln -f -s \${logfile} $TEST_SSH_LOGFILE +rm -f $TEST_SSH_LOGFILE +ln -s \${logfile} $TEST_SSH_LOGFILE exec ${SSH} -E\${logfile} "\$@" EOD @@ -198,7 +199,8 @@ cat >$SSHDLOGWRAP <>$TEST_REGRESS_LOGFILE echo "Executing: ${SSHD} \$@" >>\${logfile} exec ${SSHD} -E\${logfile} "\$@" -- 2.20.1