Merge git://git.bogomips.org/git-svn

diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 094d49089389c9e8dbf8c561ccc133065552fc81..d773542680d9f3c3d77e52871877560a9e545a26 100644 (file)
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -43,6 +43,10 @@ TEST_PATH="$TEST_DIRECTORY"/lib-httpd
 HTTPD_ROOT_PATH="$PWD"/httpd
 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
+
 if ! test -x "$LIB_HTTPD_PATH"
 then
        skip_all="skipping test, no web server found at '$LIB_HTTPD_PATH'"