From: Darren Tucker <dtucker@dtucker.net>
Date: Fri, 28 Mar 2025 05:47:58 +0000 (+1100)
Subject: Be explicit about environment variables for tests.
X-Git-Tag: V_10_0_P1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e32de6bf4f3229d4838beb127de45eed1377ccc5;p=thirdparty%2Fopenssh-portable.git

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.
---

diff --git a/.github/run_test.sh b/.github/run_test.sh
index ac5280947..74ab2423c 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