aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2023-10-29 06:22:07 +0000
committerDarren Tucker <dtucker@dtucker.net>2023-10-29 17:33:18 +1100
commit1d6a878ceba60b9dc14037dddc8f036070c0065f (patch)
tree8d519931928206b2c352709c43e29ed0b342fa86
parente612376427a66f835e284f6b426d16d7c85301bc (diff)
downloadopenssh-1d6a878ceba60b9dc14037dddc8f036070c0065f.tar.gz
upstream: Only try to chown logfiles that exist to prevent spurious
errors. OpenBSD-Regress-ID: f1b20a476734e885078c481f1324c9ea03af991e
-rw-r--r--regress/test-exec.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 928aaf2f5..5b2f2938a 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: test-exec.sh,v 1.101 2023/10/20 07:37:07 dtucker Exp $
+# $OpenBSD: test-exec.sh,v 1.102 2023/10/29 06:22:07 dtucker Exp $
# Placed in the Public Domain.
#SUDO=sudo
@@ -502,10 +502,12 @@ save_debug_log ()
testname=`echo $tid | tr ' ' _`
tarname="$OBJ/failed-$testname-logs.tar"
- if [ ! -z "$SUDO" ] ; then
- $SUDO chown -R $USER $TEST_SSH_LOGDIR $TEST_REGRESS_LOGFILE \
- $TEST_SSH_LOGFILE $TEST_SSHD_LOGFILE
- fi
+ for logfile in $TEST_SSH_LOGDIR $TEST_REGRESS_LOGFILE \
+ $TEST_SSH_LOGFILE $TEST_SSHD_LOGFILE; do
+ if [ ! -z "$SUDO" ] && [ -f "$logfile" ]; then
+ $SUDO chown -R $USER $logfile
+ fi
+ done
echo $@ >>$TEST_REGRESS_LOGFILE
echo $@ >>$TEST_SSH_LOGFILE
echo $@ >>$TEST_SSHD_LOGFILE