Skip to content

Commit a4eebfa

Browse files
committed
Merge branch 'jk/test-pass-ubsan-options-to-http-test'
UBSAN options were not propagated through the test framework to git run via the httpd, unlike ASAN options, which has been corrected. * jk/test-pass-ubsan-options-to-http-test: test-lib: set UBSAN_OPTIONS to match ASan
2 parents d15f92e + 252d693 commit a4eebfa

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

t/lib-httpd/apache.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ PassEnv GIT_VALGRIND_OPTIONS
9292
PassEnv GNUPGHOME
9393
PassEnv ASAN_OPTIONS
9494
PassEnv LSAN_OPTIONS
95+
PassEnv UBSAN_OPTIONS
9596
PassEnv GIT_TRACE
9697
PassEnv GIT_CONFIG_NOSYSTEM
9798
PassEnv GIT_TEST_SIDEBAND_ALL

t/test-lib.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ prepend_var LSAN_OPTIONS : $GIT_SAN_OPTIONS
8989
prepend_var LSAN_OPTIONS : fast_unwind_on_malloc=0
9090
export LSAN_OPTIONS
9191

92+
prepend_var UBSAN_OPTIONS : $GIT_SAN_OPTIONS
93+
export UBSAN_OPTIONS
94+
9295
if test ! -f "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
9396
then
9497
echo >&2 'error: GIT-BUILD-OPTIONS missing (has Git been built?).'

0 commit comments

Comments
 (0)