Skip to content

Commit 7de242b

Browse files
Revert "[compiler-rt] Default to Lit's Internal Shell"
This reverts commit 16ab8c0. It appears this broke a couple of buildbots: 1. https://lab.llvm.org/buildbot/#/builders/193/builds/11847 2. https://lab.llvm.org/buildbot/#/builders/161/builds/8736 Reverting for now so I have a chance to investigate.
1 parent 2981b5d commit 7de242b

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,12 @@ 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-
#
119116
# Choose between lit's internal shell pipeline runner and a real shell. If
120117
# LIT_USE_INTERNAL_SHELL is in the environment, we use that as an override.
121-
use_lit_shell = True
122-
lit_shell_env = os.environ.get("LIT_USE_INTERNAL_SHELL")
123-
if lit_shell_env:
124-
use_lit_shell = lit.util.pythonize_bool(lit_shell_env)
118+
use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL")
125119
if use_lit_shell:
126-
execute_external = True
120+
# 0 is external, "" is default, and everything else is internal.
121+
execute_external = use_lit_shell == "0"
127122
else:
128123
# Otherwise we default to internal on Windows and external elsewhere, as
129124
# bash on Windows is usually very slow.

0 commit comments

Comments
 (0)