Skip to content

Commit b725bdb

Browse files
Reapply "[compiler-rt] Default to Lit's Internal Shell (#168232)" (#168760)
This reverts commit eb20b53. This relands the compiler-rt internal shell after XRay and Darwin tests that were failing under the internal shell have been fixed.
1 parent 21fedcb commit b725bdb

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

compiler-rt/test/lit.common.cfg.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,13 @@ def push_dynamic_library_lookup_path(config, new_path):
113113
config.environment[dynamic_library_lookup_var] = new_ld_library_path_64
114114

115115

116+
# TODO: Consolidate the logic for turning on the internal shell by default for all LLVM test suites.
117+
# See https://github.com/llvm/llvm-project/issues/106636 for more details.
118+
#
116119
# Choose between lit's internal shell pipeline runner and a real shell. If
117120
# LIT_USE_INTERNAL_SHELL is in the environment, we use that as an override.
118121
use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL")
119-
if use_lit_shell:
120-
# 0 is external, "" is default, and everything else is internal.
121-
execute_external = use_lit_shell == "0"
122-
else:
123-
# Otherwise we default to internal on Windows and external elsewhere, as
124-
# bash on Windows is usually very slow.
125-
execute_external = not sys.platform in ["win32"]
122+
execute_external = use_lit_shell == "0"
126123

127124
# Allow expanding substitutions that are based on other substitutions
128125
config.recursiveExpansionLimit = 10

0 commit comments

Comments
 (0)