Skip to content

Commit 5125f47

Browse files
Revert "Reapply "[llvm] Use lit internal shell by default""
This reverts commit f869d7a. This broke some debuginfod tests that are not run by default in most CI configurations. Reverting for now until I have time to update the tests and figure out how to get them built locally.
1 parent b642e8b commit 5125f47

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

llvm/test/lit.cfg.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,6 @@
1717
# name: The name of this test suite.
1818
config.name = "LLVM"
1919

20-
# TODO: Consolidate the logic for turning on the internal shell by default for all LLVM test suites.
21-
# See https://github.com/llvm/llvm-project/issues/106636 for more details.
22-
#
23-
# We prefer the lit internal shell which provides a better user experience on failures
24-
# and is faster unless the user explicitly disables it with LIT_USE_INTERNAL_SHELL=0
25-
# env var.
26-
use_lit_shell = True
27-
lit_shell_env = os.environ.get("LIT_USE_INTERNAL_SHELL")
28-
if lit_shell_env:
29-
use_lit_shell = lit.util.pythonize_bool(lit_shell_env)
30-
3120
# testFormat: The test format to use to interpret tests.
3221
extra_substitutions = extra_substitutions = (
3322
[
@@ -37,7 +26,9 @@
3726
if config.enable_profcheck
3827
else []
3928
)
40-
config.test_format = lit.formats.ShTest(not use_lit_shell, extra_substitutions)
29+
config.test_format = lit.formats.ShTest(
30+
not llvm_config.use_lit_shell, extra_substitutions
31+
)
4132

4233
# suffixes: A list of file extensions to treat as test files. This is overriden
4334
# by individual lit.local.cfg files in the test subdirectories.

0 commit comments

Comments
 (0)