From bc0538e98722603104ddc0e64ddf55461ba0d04e Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Wed, 19 Nov 2025 19:10:40 +0000 Subject: [PATCH 1/2] Reapply "[compiler-rt] Default to Lit's Internal Shell (#168232)" This reverts commit eb20b5392599996ce94e4c0392095cacaa33687c. This relands the compiler-rt internal shell after XRay and Darwin tests that were failing under the internal shell have been fixed. --- compiler-rt/test/lit.common.cfg.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py index ea22fb0babc46..77e829a7ab582 100644 --- a/compiler-rt/test/lit.common.cfg.py +++ b/compiler-rt/test/lit.common.cfg.py @@ -113,6 +113,9 @@ def push_dynamic_library_lookup_path(config, new_path): config.environment[dynamic_library_lookup_var] = new_ld_library_path_64 +# TODO: Consolidate the logic for turning on the internal shell by default for all LLVM test suites. +# See https://github.com/llvm/llvm-project/issues/106636 for more details. +# # Choose between lit's internal shell pipeline runner and a real shell. If # LIT_USE_INTERNAL_SHELL is in the environment, we use that as an override. use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL") @@ -120,9 +123,8 @@ def push_dynamic_library_lookup_path(config, new_path): # 0 is external, "" is default, and everything else is internal. execute_external = use_lit_shell == "0" else: - # Otherwise we default to internal on Windows and external elsewhere, as - # bash on Windows is usually very slow. - execute_external = not sys.platform in ["win32"] + # Otherwise we default to internal everywhere. + execute_external = False # Allow expanding substitutions that are based on other substitutions config.recursiveExpansionLimit = 10 From c87796853999ead80f30449a42a61b898e7d5f74 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Thu, 20 Nov 2025 15:31:23 +0000 Subject: [PATCH 2/2] feedback --- compiler-rt/test/lit.common.cfg.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py index 77e829a7ab582..960d167ef8d64 100644 --- a/compiler-rt/test/lit.common.cfg.py +++ b/compiler-rt/test/lit.common.cfg.py @@ -119,12 +119,7 @@ def push_dynamic_library_lookup_path(config, new_path): # Choose between lit's internal shell pipeline runner and a real shell. If # LIT_USE_INTERNAL_SHELL is in the environment, we use that as an override. use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL") -if use_lit_shell: - # 0 is external, "" is default, and everything else is internal. - execute_external = use_lit_shell == "0" -else: - # Otherwise we default to internal everywhere. - execute_external = False +execute_external = use_lit_shell == "0" # Allow expanding substitutions that are based on other substitutions config.recursiveExpansionLimit = 10