From dcbf2a9eee64a100d22d4194293e828864cbbdbc Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Tue, 14 Jul 2026 20:30:03 -0700 Subject: [PATCH] [clang-tools-extra] Drop option to use external shell The external shell is going to be removed from lit soon, so drop the option to enable using it. Reviewers: petrhosek, compnerd, ilovepi Pull Request: https://github.com/llvm/llvm-project/pull/209625 --- clang-tools-extra/clangd/test/lit.cfg.py | 13 +------------ clang-tools-extra/include-cleaner/test/lit.cfg.py | 13 +------------ clang-tools-extra/test/lit.cfg.py | 11 +---------- 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/clang-tools-extra/clangd/test/lit.cfg.py b/clang-tools-extra/clangd/test/lit.cfg.py index bd721c41861b..aac3a938353e 100644 --- a/clang-tools-extra/clangd/test/lit.cfg.py +++ b/clang-tools-extra/clangd/test/lit.cfg.py @@ -7,21 +7,10 @@ lit.llvm.initialize(lit_config, config) lit.llvm.llvm_config.clang_setup() lit.llvm.llvm_config.use_default_substitutions() -# TODO: Consolidate the logic for turning on the internal shell by default for all LLVM test suites. -# See https://github.com/llvm/llvm-project/issues/106636 for more details. -# -# We prefer the lit internal shell which provides a better user experience on failures -# and is faster unless the user explicitly disables it with LIT_USE_INTERNAL_SHELL=0 -# env var. -use_lit_shell = True -lit_shell_env = os.environ.get("LIT_USE_INTERNAL_SHELL") -if lit_shell_env: - use_lit_shell = lit.util.pythonize_bool(lit_shell_env) - config.name = "Clangd" config.suffixes = [".test"] config.excludes = ["Inputs"] -config.test_format = lit.formats.ShTest(not use_lit_shell) +config.test_format = lit.formats.ShTest() config.test_source_root = config.clangd_source_dir + "/test" config.test_exec_root = config.clangd_binary_dir + "/test" diff --git a/clang-tools-extra/include-cleaner/test/lit.cfg.py b/clang-tools-extra/include-cleaner/test/lit.cfg.py index 52f81bfa78cb..a4d0893a05e6 100644 --- a/clang-tools-extra/include-cleaner/test/lit.cfg.py +++ b/clang-tools-extra/include-cleaner/test/lit.cfg.py @@ -5,21 +5,10 @@ import lit.llvm lit.llvm.initialize(lit_config, config) lit.llvm.llvm_config.use_default_substitutions() -# TODO: Consolidate the logic for turning on the internal shell by default for all LLVM test suites. -# See https://github.com/llvm/llvm-project/issues/106636 for more details. -# -# We prefer the lit internal shell which provides a better user experience on failures -# and is faster unless the user explicitly disables it with LIT_USE_INTERNAL_SHELL=0 -# env var. -use_lit_shell = True -lit_shell_env = os.environ.get("LIT_USE_INTERNAL_SHELL") -if lit_shell_env: - use_lit_shell = lit.util.pythonize_bool(lit_shell_env) - config.name = "ClangIncludeCleaner" config.suffixes = [".test", ".c", ".cpp"] config.excludes = ["Inputs"] -config.test_format = lit.formats.ShTest(not use_lit_shell) +config.test_format = lit.formats.ShTest() config.test_source_root = config.clang_include_cleaner_source_dir + "/test" config.test_exec_root = config.clang_include_cleaner_binary_dir + "/test" diff --git a/clang-tools-extra/test/lit.cfg.py b/clang-tools-extra/test/lit.cfg.py index f20504fe67eb..be484b4ff217 100644 --- a/clang-tools-extra/test/lit.cfg.py +++ b/clang-tools-extra/test/lit.cfg.py @@ -12,16 +12,7 @@ from lit.llvm import llvm_config # name: The name of this test suite. config.name = "Clang Tools" -# testFormat: The test format to use to interpret tests. -# We prefer the lit internal shell which provides a better user experience on -# failures and is faster unless the user explicitly disables it with -# LIT_USE_INTERNAL_SHELL=0 env var. -use_lit_shell = True -lit_shell_env = os.environ.get("LIT_USE_INTERNAL_SHELL") -if lit_shell_env: - use_lit_shell = lit.util.pythonize_bool(lit_shell_env) - -config.test_format = lit.formats.ShTest(not use_lit_shell) +config.test_format = lit.formats.ShTest() # suffixes: A list of file extensions to treat as test files. config.suffixes = [