From 94984d5cdbceafa786e26a9dc1f70167e574d945 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Fri, 5 Dec 2025 17:59:39 +0000 Subject: [PATCH] Reapply "[compiler-rt] Default to Lit's Internal Shell (#168232)" This reverts commit c90fb56b41cfaaee448700f6b068c830d8d0b5bd. The failures identified in the revert commit have noe been fixed: 1. 4bc783be2dab2b0b2b3010158891e44a2b4ee991 2. 126462035a1eb7adeb97f6beac48b6bddac65d09 3. d7307f458cd3522470859ce0cee8d47d37a70670 --- compiler-rt/test/lit.common.cfg.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py index dce01cc9743b..7ff4d3415345 100644 --- a/compiler-rt/test/lit.common.cfg.py +++ b/compiler-rt/test/lit.common.cfg.py @@ -113,16 +113,13 @@ 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") -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 on Windows and external elsewhere, as - # bash on Windows is usually very slow. - execute_external = not sys.platform in ["win32"] +execute_external = use_lit_shell == "0" # Allow expanding substitutions that are based on other substitutions config.recursiveExpansionLimit = 10