summaryrefslogtreecommitdiff
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorLibravatar Jiang Xin <worldhello.net@gmail.com>2019-05-31 14:34:26 +0800
committerLibravatar Jiang Xin <worldhello.net@gmail.com>2019-05-31 14:34:26 +0800
commita17177ce3ac74afc0b2e6fc6c80c1e1991b96a13 (patch)
tree0ff1a62d28a13bc8d8708148b85d3b0ba2632f92 /t/lib-httpd
parentMerge branch 'master' of https://github.com/Softcatala/git-po (diff)
parentGit 2.22-rc2 (diff)
downloadtgif-a17177ce3ac74afc0b2e6fc6c80c1e1991b96a13.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
* 'master' of git://git.kernel.org/pub/scm/git/git: (66 commits) Git 2.22-rc2 ...
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 06a81b54c7..5c1c86c193 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -76,6 +76,7 @@ PassEnv GIT_VALGRIND
PassEnv GIT_VALGRIND_OPTIONS
PassEnv GNUPGHOME
PassEnv ASAN_OPTIONS
+PassEnv LSAN_OPTIONS
PassEnv GIT_TRACE
PassEnv GIT_CONFIG_NOSYSTEM
PassEnv GIT_TEST_SIDEBAND_ALL