Skip to content

Commit 2b9328c

Browse files
Revert "[lld] Make lld tests use lit internal shell by default"
This reverts commit 714f6b0. This caused some build failures. https://lab.llvm.org/buildbot/#/builders/23/builds/13543 Reverting for now until I have a chance to investigate.
1 parent 6aa9d92 commit 2b9328c

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

lld/test/MachO/objc-category-merging-minimal.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
############ Test merging skipped due to invalid category name ############
3535
# Modify __OBJC_$_CATEGORY_MyBaseClass_$_Category01's name to point to L_OBJC_IMAGE_INFO+3
36-
# RUN: awk '/^__OBJC_\\$_CATEGORY_MyBaseClass_\\$_Category01:/ { print; getline; sub(/^[ \t]*\.quad[ \t]+l_OBJC_CLASS_NAME_$/, "\t.quad\tL_OBJC_IMAGE_INFO+3"); print; next } { print }' merge_cat_minimal.s > merge_cat_minimal_bad_name.s
36+
# RUN: awk '/^__OBJC_\$_CATEGORY_MyBaseClass_\$_Category01:/ { print; getline; sub(/^[ \t]*\.quad[ \t]+l_OBJC_CLASS_NAME_$/, "\t.quad\tL_OBJC_IMAGE_INFO+3"); print; next } { print }' merge_cat_minimal.s > merge_cat_minimal_bad_name.s
3737

3838
# Assemble the modified source
3939
# RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos -o merge_cat_minimal_bad_name.o merge_cat_minimal_bad_name.s

lld/test/lit.cfg.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,10 @@
1616
# name: The name of this test suite.
1717
config.name = "lld"
1818

19-
# TODO: Consolidate the logic for turning on the internal shell by default for all LLVM test suites.
20-
# See https://github.com/llvm/llvm-project/issues/106636 for more details.
21-
#
22-
# We prefer the lit internal shell which provides a better user experience on failures
23-
# and is faster unless the user explicitly disables it with LIT_USE_INTERNAL_SHELL=0
24-
# env var.
25-
use_lit_shell = True
26-
lit_shell_env = os.environ.get("LIT_USE_INTERNAL_SHELL")
27-
if lit_shell_env:
28-
use_lit_shell = lit.util.pythonize_bool(lit_shell_env)
29-
3019
# testFormat: The test format to use to interpret tests.
3120
#
3221
# For now we require '&&' between commands, until they get globally killed and the test runner updated.
33-
config.test_format = lit.formats.ShTest(execute_external=not use_lit_shell)
22+
config.test_format = lit.formats.ShTest(not llvm_config.use_lit_shell)
3423

3524
# suffixes: A list of file extensions to treat as test files.
3625
config.suffixes = [".ll", ".s", ".test", ".yaml", ".objtxt"]

0 commit comments

Comments
 (0)