summaryrefslogtreecommitdiff
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-03-16 00:56:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-03-18 22:37:58 (GMT)
commit1fad5033ad664e617eb05f778c83c1a75bddc8d8 (patch)
tree1904ab58f92715226efee32ec59fe9a901495c1e /t/lib-httpd
parent937978e0f3e750d917768c77665d5f8cfbd802b6 (diff)
downloadgit-1fad5033ad664e617eb05f778c83c1a75bddc8d8.zip
git-1fad5033ad664e617eb05f778c83c1a75bddc8d8.tar.gz
git-1fad5033ad664e617eb05f778c83c1a75bddc8d8.tar.bz2
t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
We set GIT_CONFIG_NOSYSTEM in our test scripts so that we do not accidentally read /etc/gitconfig and have it influence the outcome of the tests. But when running smart-http tests, Apache will clean the environment, including this variable, and the "server" side of our http operations will read it. You can see this breakage by doing something like: make ./git config --system http.getanyfile false make test which will cause t5561 to fail when it tests the fallback-to-dumb operation. We can fix this by instructing Apache to pass through the variable. Unlike with other variables (e.g., 89c57ab3's GIT_TRACE), we don't need to set a dummy value to prevent warnings from Apache. test-lib.sh already makes sure that GIT_CONFIG_NOSYSTEM is set and exported. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-httpd')
-rw-r--r--t/lib-httpd/apache.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 7d15e6d..3e6317b 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -71,6 +71,7 @@ PassEnv GIT_VALGRIND_OPTIONS
PassEnv GNUPGHOME
PassEnv ASAN_OPTIONS
PassEnv GIT_TRACE
+PassEnv GIT_CONFIG_NOSYSTEM
Alias /dumb/ www/
Alias /auth/dumb/ www/auth/dumb/