summaryrefslogtreecommitdiff
path: root/t/lib-httpd.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-23 11:28:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-23 11:28:10 -0700
commit07da4e092f4ce90271f8545b1b50c1a272dfaefb (patch)
tree4bd62fea9fdc5755306670beaea9e0874bb833c9 /t/lib-httpd.sh
parentMerge branch 'jk/smart-http-hide-refs' (diff)
parentt5551: make EXPENSIVE test cheaper (diff)
downloadtgif-07da4e092f4ce90271f8545b1b50c1a272dfaefb.tar.xz
Merge branch 'jk/test-annoyances'
Test fixes. * jk/test-annoyances: t5551: make EXPENSIVE test cheaper t5541: move run_with_cmdline_limit to test-lib.sh t: pass GIT_TRACE through Apache t: redirect stderr GIT_TRACE to descriptor 4 t: translate SIGINT to an exit
Diffstat (limited to 't/lib-httpd.sh')
-rw-r--r--t/lib-httpd.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index d154d1ed1d..e6adf2f82d 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -79,6 +79,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_TRACE=$GIT_TRACE; export GIT_TRACE
if ! test -x "$LIB_HTTPD_PATH"
then