Skip to content

Commit 2253413

Browse files
Reapply "[compiler-rt] Default to Lit's Internal Shell"
This reverts commit 7de242b. The previous landing contained a logic error where it actually forced the use of the external shell everywhere, causing some test failures on Windows. This patch pretty much keeps the existing structure of the code, just defaulting to the internal shell everywhere instead of only on Windows.
1 parent 46ecf45 commit 2253413

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,18 @@ 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")
119122
if use_lit_shell:
120123
# 0 is external, "" is default, and everything else is internal.
121124
execute_external = use_lit_shell == "0"
122125
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"]
126+
# Otherwise we default to internal everywhere.
127+
execute_external = False
126128

127129
# Allow expanding substitutions that are based on other substitutions
128130
config.recursiveExpansionLimit = 10

0 commit comments

Comments
 (0)