From: Todd Zullinger Date: Thu, 14 Feb 2019 06:35:13 +0000 (-0500) Subject: t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache X-Git-Tag: v2.21.0-rc2~7^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e18edc76d60f804419ed7d585011766fba1a5912?hp=--cc t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache 07c3c2aa16 ("tests: define GIT_TEST_SIDEBAND_ALL", 2019-01-16) added GIT_TEST_SIDEBAND_ALL to the apache.conf PassEnv list. Avoid warnings from Apache when the variable is unset, as we do for GIT_VALGRIND* and GIT_TRACE, from f628825481 ("t/lib-httpd: handle running under --valgrind", 2012-07-24) and 89c57ab3f0 ("t: pass GIT_TRACE through Apache", 2015-03-13), respectively. Signed-off-by: Todd Zullinger Signed-off-by: Junio C Hamano --- e18edc76d60f804419ed7d585011766fba1a5912 diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index a8729f8232..3eb665f4d6 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -91,6 +91,7 @@ HTTPD_DOCUMENT_ROOT_PATH=$HTTPD_ROOT_PATH/www # hack to suppress apache PassEnv warnings GIT_VALGRIND=$GIT_VALGRIND; export GIT_VALGRIND GIT_VALGRIND_OPTIONS=$GIT_VALGRIND_OPTIONS; export GIT_VALGRIND_OPTIONS +GIT_TEST_SIDEBAND_ALL=$GIT_TEST_SIDEBAND_ALL; export GIT_TEST_SIDEBAND_ALL GIT_TRACE=$GIT_TRACE; export GIT_TRACE if ! test -x "$LIB_HTTPD_PATH"