[llvm-branch-commits] [lldb] 79a4eb5 - Revert "[lldb][lit] Add MallocNanoZone envvar to Darwin ASan builds (#88431)"

[via llvm-branch-commits]

Author: Chelsea Cassanova
Date: 2024-04-11T13:41:48-07:00
New Revision: 79a4eb5047d8c90568b04ad5fb90e6421e1aba69

URL: https://github.com/llvm/llvm-project/commit/79a4eb5047d8c90568b04ad5fb90e6421e1aba69
DIFF: https://github.com/llvm/llvm-project/commit/79a4eb5047d8c90568b04ad5fb90e6421e1aba69.diff

LOG: Revert "[lldb][lit] Add MallocNanoZone envvar to Darwin ASan builds (#88431)"

This reverts commit 4df854e1a98ed47c955838d2c94bf2913c50041f.

Added: 
    

Modified: 
    lldb/test/API/lit.cfg.py
    lldb/test/Shell/lit.cfg.py

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py
index 9ea389c639a013..f9497b632fc504 100644
--- a/lldb/test/API/lit.cfg.py
+++ b/lldb/test/API/lit.cfg.py
@@ -121,7 +121,6 @@ def delete_module_cache(path):
             config.environment["DYLD_INSERT_LIBRARIES"] = find_sanitizer_runtime(
                 "libclang_rt.asan_osx_dynamic.dylib"
             )
-            config.environment["MallocNanoZone"] = "0"
 
     if "Thread" in config.llvm_use_sanitizer:
         config.environment["TSAN_OPTIONS"] = "halt_on_error=1"

diff  --git a/lldb/test/Shell/lit.cfg.py b/lldb/test/Shell/lit.cfg.py
index 345627835d2bf2..31afe5151c0661 100644
--- a/lldb/test/Shell/lit.cfg.py
+++ b/lldb/test/Shell/lit.cfg.py
@@ -52,8 +52,6 @@
 # Enable sanitizer runtime flags.
 config.environment["ASAN_OPTIONS"] = "detect_stack_use_after_return=1"
 config.environment["TSAN_OPTIONS"] = "halt_on_error=1"
-if "Darwin" in config.host_os:
-    config.environment["MallocNanoZone"] = "0"
 
 # 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