[openssh-commits] [openssh] 02/06: Be explicit about environment variables for tests.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit e32de6bf4f3229d4838beb127de45eed1377ccc5
Author: Darren Tucker <dtucker at dtucker.net>
AuthorDate: Fri Mar 28 16:47:58 2025 +1100

    Be explicit about environment variables for tests.
    
    This will make it easier to reproduce a test failure by cut-and-paste of
    the corresponding line from the github log.
---
 .github/run_test.sh | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/run_test.sh b/.github/run_test.sh
index ac528094..74ab2423 100755
--- a/.github/run_test.sh
+++ b/.github/run_test.sh
@@ -33,23 +33,31 @@ output_failed_logs() {
 }
 trap output_failed_logs 0
 
+env=""
+if [ ! -z "${SUDO}" ]; then
+    env="${env} SUDO=${SUDO}"
+fi
 if [ ! -z "${TCMALLOC_STACKTRACE_METHOD}" ]; then
-    echo TCMALLOC_STACKTRACE_METHOD="${TCMALLOC_STACKTRACE_METHOD}"
-    echo export TCMALLOC_STACKTRACE_METHOD
-    export TCMALLOC_STACKTRACE_METHOD
+    env="${env} TCMALLOC_STACKTRACE_METHOD=${TCMALLOC_STACKTRACE_METHOD}"
+fi
+if [ ! -z "${TEST_SSH_SSHD_ENV}" ]; then
+    env="${env} TEST_SSH_SSHD_ENV=${TEST_SSH_SSHD_ENV}"
+fi
+if [ ! -z "${env}" ]; then
+    env="env${env}"
 fi
 
 if [ -z "${LTESTS}" ]; then
-    make ${TEST_TARGET} SKIP_LTESTS="${SKIP_LTESTS}"
+    ${env} make ${TEST_TARGET} SKIP_LTESTS="${SKIP_LTESTS}"
 else
-    make ${TEST_TARGET} SKIP_LTESTS="${SKIP_LTESTS}" LTESTS="${LTESTS}"
+    ${env} make ${TEST_TARGET} SKIP_LTESTS="${SKIP_LTESTS}" LTESTS="${LTESTS}"
 fi
 
 if [ ! -z "${SSHD_CONFOPTS}" ]; then
     echo "rerunning t-exec with TEST_SSH_SSHD_CONFOPTS='${SSHD_CONFOPTS}'"
     if [ -z "${LTESTS}" ]; then
-        make t-exec SKIP_LTESTS="${SKIP_LTESTS}" TEST_SSH_SSHD_CONFOPTS="${SSHD_CONFOPTS}"
+        ${env} make t-exec SKIP_LTESTS="${SKIP_LTESTS}" TEST_SSH_SSHD_CONFOPTS="${SSHD_CONFOPTS}"
     else
-        make t-exec SKIP_LTESTS="${SKIP_LTESTS}" LTESTS="${LTESTS}" TEST_SSH_SSHD_CONFOPTS="${SSHD_CONFOPTS}"
+        ${env} make t-exec SKIP_LTESTS="${SKIP_LTESTS}" LTESTS="${LTESTS}" TEST_SSH_SSHD_CONFOPTS="${SSHD_CONFOPTS}"
     fi
 fi

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.