diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-04-21 12:12:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-21 12:12:24 -0700 |
| commit | d3115a35fc29e7a55131a677878e67725d4cc165 (patch) | |
| tree | b6c0ecad93b631d2be36f4677aede75221a60322 /t/lib-httpd.sh | |
| parent | 42b2f894a0237e3b393770330dba995e731ec7ad (diff) | |
| parent | 376e4b39d4453ce50cbacc9c46a3bbdaad2134b2 (diff) | |
| download | git-d3115a35fc29e7a55131a677878e67725d4cc165.tar.xz | |
Merge branch 'jk/test-annoyances' into maint
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.sh | 1 |
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 |