summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2022-01-04 08:38:54 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2022-01-04 08:38:54 +0000
commit7b13809de581c4174fdfe4950206dcc28ddd8e60 (patch)
treebb1acd3ae8edcccb6f494f99a4fc000675abf972
parent4da9697250b252dd5e609186951877a65b87cf0b (diff)
Log command invocation in debugging log to aid in manually reproducing
failing commands.
-rw-r--r--regress/usr.bin/ssh/sshd-log-wrapper.sh3
-rw-r--r--regress/usr.bin/ssh/test-exec.sh3
2 files changed, 4 insertions, 2 deletions
diff --git a/regress/usr.bin/ssh/sshd-log-wrapper.sh b/regress/usr.bin/ssh/sshd-log-wrapper.sh
index 29dc44aa0b5..4b3c9113799 100644
--- a/regress/usr.bin/ssh/sshd-log-wrapper.sh
+++ b/regress/usr.bin/ssh/sshd-log-wrapper.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: sshd-log-wrapper.sh,v 1.4 2016/11/25 02:56:49 dtucker Exp $
+# $OpenBSD: sshd-log-wrapper.sh,v 1.5 2022/01/04 08:38:53 dtucker Exp $
# Placed in the Public Domain.
#
# simple wrapper for sshd proxy mode to catch stderr output
@@ -8,4 +8,5 @@
log=$1
shift
+echo "Executing: $@" >>$log
exec "$@" -E$log
diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh
index bf298fb51ec..34a7327b815 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.87 2021/09/01 00:50:27 dtucker Exp $
+# $OpenBSD: test-exec.sh,v 1.88 2022/01/04 08:38:53 dtucker Exp $
# Placed in the Public Domain.
#SUDO=sudo
@@ -146,6 +146,7 @@ fi
SSHLOGWRAP=$OBJ/ssh-log-wrapper.sh
cat >$SSHLOGWRAP <<EOD
#!/bin/sh
+echo "Executing: ${SSH} \$@" >>${TEST_SSH_LOGFILE}
for i in "\$@";do shift;case "\$i" in -q):;; *) set -- "\$@" "\$i";;esac;done
exec ${SSH} -E${TEST_SSH_LOGFILE} "\$@"
EOD