Merge branch 'jk/test-asan'

gitster · gitster · commit 9f240ec60f29 · 2014-12-22T12:28:08.000-08:00
* jk/test-asan:
  t: support clang/gcc AddressSanitizer
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,9 @@ else`
`140`	`140`	`}`
`141`	`141`	`fi`
`142`	`142`
	`143`	`+: ${ASAN_OPTIONS=detect_leaks=0}`
	`144`	`+export ASAN_OPTIONS`
	`145`	`+`
`143`	`146`	`# Protect ourselves from common misconfiguration to export`
`144`	`147`	`# CDPATH into the environment`
`145`	`148`	`unset CDPATH`