[lldb][lit] Guard MallocNanoZone envvar in shell tests (#88824)
Previously the MallocNanoZone envvar would be set to 0 on Darwin for the
LLDB shell tests, but this should guarded behind ASan being enabled as
opposed to simply running the test suite behind Darwin. This required
that the LLVM_USE_SANITIZER option be added as an attribute to the lit
config for shell tests.
GitOrigin-RevId: fe48bf672e1ab293368a3212203db94a4e21c533
diff --git a/test/Shell/lit.cfg.py b/test/Shell/lit.cfg.py
index 2905695..e24f3fb 100644
--- a/test/Shell/lit.cfg.py
+++ b/test/Shell/lit.cfg.py
@@ -50,10 +50,14 @@
)
# Enable sanitizer runtime flags.
-config.environment["ASAN_OPTIONS"] = "detect_stack_use_after_return=1"
-config.environment["TSAN_OPTIONS"] = "halt_on_error=1"
-if platform.system() == "Darwin":
- config.environment["MallocNanoZone"] = "0"
+if "Address" in config.llvm_use_sanitizer:
+ config.environment["ASAN_OPTIONS"] = "detect_stack_use_after_return=1"
+ if platform.system() == "Darwin":
+ config.environment["MallocNanoZone"] = "0"
+
+if "Thread" in config.llvm_use_sanitizer:
+ config.environment["TSAN_OPTIONS"] = "halt_on_error=1"
+
# Support running the test suite under the lldb-repro wrapper. This makes it
# possible to capture a test suite run and then rerun all the test from the
diff --git a/test/Shell/lit.site.cfg.py.in b/test/Shell/lit.site.cfg.py.in
index 736dfc3..b69e7bc 100644
--- a/test/Shell/lit.site.cfg.py.in
+++ b/test/Shell/lit.site.cfg.py.in
@@ -26,6 +26,7 @@
config.lldb_build_directory = "@LLDB_TEST_BUILD_DIRECTORY@"
config.have_lldb_server = @LLDB_TOOL_LLDB_SERVER_BUILD@
config.lldb_system_debugserver = @LLDB_USE_SYSTEM_DEBUGSERVER@
+config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
# The shell tests use their own module caches.
config.lldb_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_LLDB@", "lldb-shell")
config.clang_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_CLANG@", "lldb-shell")
