summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-22 12:28:08 -0800
committerJunio C Hamano <gitster@pobox.com>2014-12-22 12:28:08 -0800
commit9f240ec60f29e2b9981dc33fd21b3623158f541f (patch)
tree5376ed929ad41eb65ee62c3ca69d53395688452a
parent3701aa093e2d2d003e0b04529375aeb1bbcb401d (diff)
parentb0f4c9087e1e016667e34c6c413c57435e591b45 (diff)
downloadgit-9f240ec60f29e2b9981dc33fd21b3623158f541f.tar.gz
Merge branch 'jk/test-asan'
* jk/test-asan: t: support clang/gcc AddressSanitizer
-rw-r--r--t/lib-httpd/apache.conf1
-rw-r--r--t/test-lib.sh3
2 files changed, 4 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 7713dd2609..03a4c2ee84 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -69,6 +69,7 @@ LockFile accept.lock
PassEnv GIT_VALGRIND
PassEnv GIT_VALGRIND_OPTIONS
PassEnv GNUPGHOME
+PassEnv ASAN_OPTIONS
Alias /dumb/ www/
Alias /auth/dumb/ www/auth/dumb/
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 79e8a33d04..9acdc8826f 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -140,6 +140,9 @@ else
}
fi
+: ${ASAN_OPTIONS=detect_leaks=0}
+export ASAN_OPTIONS
+
# Protect ourselves from common misconfiguration to export
# CDPATH into the environment
unset CDPATH