Merge remote-tracking branch 'origin/master' into nmweb

[notmuch] / test / T800-asan.sh

diff --git a/test/T800-asan.sh b/test/T800-asan.sh
index 8607732e176b9978bd72622a6e5ddf8a255e6710..9ce6baa7c80b34e767bd8900f2f74c8498676818 100755 (executable)
--- a/test/T800-asan.sh
+++ b/test/T800-asan.sh
@@ -2,14 +2,19 @@
 test_description='run code with ASAN enabled against the library'
 . $(dirname "$0")/test-lib.sh || exit 1
 
-if [ $NOTMUCH_HAVE_ASAN -ne 1 ]; then
+if [ "${NOTMUCH_HAVE_ASAN-0}" != "1" ]; then
     printf "Skipping due to missing ASAN support\n"
     test_done
 fi
 
+if [ -n "${LD_PRELOAD-}" ]; then
+    printf "Skipping due to ASAN LD_PRELOAD restrictions\n"
+    test_done
+fi
+
 add_email_corpus
 
-TEST_CFLAGS="-fsanitize=address"
+TEST_CFLAGS="${TEST_CFLAGS:-} -fsanitize=address"
 
 test_begin_subtest "open and destroy"
 test_C ${MAIL_DIR} ${NOTMUCH_CONFIG} <<EOF