@matheusbsbs / matheus-bagliano / commits / f628825481

t/lib-httpd: handle running under --valgrind

Running the http tests with valgrind does not work for two reasons: 1. Apache complains about following the symbolic link from git-http-backend to valgrind.sh. 2. Apache does not pass through the GIT_VALGRIND variable to the backend CGI. This patch fixes both problems. Unfortunately, there is a slight hack we need to handle passing environment variables through Apache. If we just tell it: PassEnv GIT_VALGRIND then Apache will complain when GIT_VALGRIND is not set. If we try: SetEnv GIT_VALGRIND ${GIT_VALGRIND} then when GIT_VALGRIND is not set, it will pass through the literal "${GIT_VALGRIND}". Instead, we now unconditionally pass through GIT_VALGRIND from lib-httpd.sh into apache, even if it is empty. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jul 24, 2012 at 09:43 UTC f628825481b706baa3d9bf871a081cb1285c2778
2 files changed +8 -1
t/lib-httpd.sh
+4
@@ -43,6 +43,10 @@ TEST_PATH="$TEST_DIRECTORY"/lib-httpd
43 HTTPD_ROOT_PATH="$PWD"/httpd
44 HTTPD_DOCUMENT_ROOT_PATH=$HTTPD_ROOT_PATH/www
45
46 +# hack to suppress apache PassEnv warnings
47 +GIT_VALGRIND=$GIT_VALGRIND; export GIT_VALGRIND
48 +GIT_VALGRIND_OPTIONS=$GIT_VALGRIND_OPTIONS; export GIT_VALGRIND_OPTIONS
49 +
50 if ! test -x "$LIB_HTTPD_PATH"
51 then
52 skip_all="skipping test, no web server found at '$LIB_HTTPD_PATH'"
t/lib-httpd/apache.conf
+4 -1
@@ -42,6 +42,9 @@ ErrorLog error.log
42 </IfModule>
43 </IfVersion>
44
45 +PassEnv GIT_VALGRIND
46 +PassEnv GIT_VALGRIND_OPTIONS
47 +
48 Alias /dumb/ www/
49 Alias /auth/ www/auth/
50
@@ -62,7 +65,7 @@ ScriptAlias /smart/ ${GIT_EXEC_PATH}/git-http-backend/
65 ScriptAlias /smart_noexport/ ${GIT_EXEC_PATH}/git-http-backend/
66 ScriptAlias /smart_custom_env/ ${GIT_EXEC_PATH}/git-http-backend/
67 <Directory ${GIT_EXEC_PATH}>
65 - Options None
68 + Options FollowSymlinks
69 </Directory>
70 <Files ${GIT_EXEC_PATH}/git-http-backend>
71 Options ExecCGI