Skip to content

Commit 4cfbc44

Browse files
Revert "[clangd] Enable lit internal shell by default"
This reverts commit c51c382. This breaks at least one buildbot: 1. https://lab.llvm.org/buildbot/#/builders/134/builds/30460
1 parent c51c382 commit 4cfbc44

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

clang-tools-extra/clangd/test/lit.cfg.py

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,13 @@
1-
import os
2-
31
import lit.llvm
42

53
lit.llvm.initialize(lit_config, config)
64
lit.llvm.llvm_config.clang_setup()
75
lit.llvm.llvm_config.use_default_substitutions()
86

9-
# TODO: Consolidate the logic for turning on the internal shell by default for all LLVM test suites.
10-
# See https://github.com/llvm/llvm-project/issues/106636 for more details.
11-
#
12-
# We prefer the lit internal shell which provides a better user experience on failures
13-
# and is faster unless the user explicitly disables it with LIT_USE_INTERNAL_SHELL=0
14-
# env var.
15-
use_lit_shell = True
16-
lit_shell_env = os.environ.get("LIT_USE_INTERNAL_SHELL")
17-
if lit_shell_env:
18-
use_lit_shell = lit.util.pythonize_bool(lit_shell_env)
19-
207
config.name = "Clangd"
218
config.suffixes = [".test"]
229
config.excludes = ["Inputs"]
23-
config.test_format = lit.formats.ShTest(not use_lit_shell)
10+
config.test_format = lit.formats.ShTest(not lit.llvm.llvm_config.use_lit_shell)
2411
config.test_source_root = config.clangd_source_dir + "/test"
2512
config.test_exec_root = config.clangd_binary_dir + "/test"
2613

0 commit comments

Comments
 (0)