[llvm-branch-commits] [clang] [Clang] Drop ability to use the external shell (PR #209564)

[Aiden Grossman via llvm-branch-commits]

https://github.com/boomanaiden154 updated https://github.com/llvm/llvm-project/pull/209564

>From 6575043b8039d6b887e7a5d368fa8b70851ab3be Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman at google.com>
Date: Tue, 14 Jul 2026 20:44:44 +0000
Subject: [PATCH] rebase

Created using spr 1.3.7
---
 clang/test/Analysis/exploded-graph-rewriter/lit.local.cfg     | 3 +--
 clang/test/Analysis/lit.local.cfg                             | 2 +-
 clang/test/Analysis/scan-build/lit.local.cfg                  | 3 +--
 clang/test/utils/update_cc_test_checks/Inputs/lit.cfg.example | 2 +-
 clang/test/utils/update_cc_test_checks/lit.local.cfg          | 2 +-
 clang/utils/perf-training/bolt.lit.cfg                        | 3 +--
 clang/utils/perf-training/lit.cfg                             | 3 +--
 clang/utils/perf-training/order-files.lit.cfg                 | 3 +--
 8 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/clang/test/Analysis/exploded-graph-rewriter/lit.local.cfg b/clang/test/Analysis/exploded-graph-rewriter/lit.local.cfg
index ca334e955bb8a..997f0b18f8085 100644
--- a/clang/test/Analysis/exploded-graph-rewriter/lit.local.cfg
+++ b/clang/test/Analysis/exploded-graph-rewriter/lit.local.cfg
@@ -4,8 +4,7 @@ import lit.util
 import lit.formats
 import os
 
-use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL")
-config.test_format = lit.formats.ShTest(use_lit_shell == "0")
+config.test_format = lit.formats.ShTest()
 
 config.substitutions.append(
     (
diff --git a/clang/test/Analysis/lit.local.cfg b/clang/test/Analysis/lit.local.cfg
index 3bc2f94809c85..8718e41bd7d02 100644
--- a/clang/test/Analysis/lit.local.cfg
+++ b/clang/test/Analysis/lit.local.cfg
@@ -1,7 +1,7 @@
 # -*- Python -*- vim: set ft=python ts=4 sw=4 expandtab tw=79:
 import lit.formats
 
-config.test_format = lit.formats.ShTest(config.test_format.execute_external)
+config.test_format = lit.formats.ShTest()
 
 # Filtering command used by Clang Analyzer tests (when comparing .plist files
 # with reference output)
diff --git a/clang/test/Analysis/scan-build/lit.local.cfg b/clang/test/Analysis/scan-build/lit.local.cfg
index aed76ca0e8087..9e3325cfc7bc1 100644
--- a/clang/test/Analysis/scan-build/lit.local.cfg
+++ b/clang/test/Analysis/scan-build/lit.local.cfg
@@ -4,8 +4,7 @@ import lit.formats
 import os
 import platform
 
-use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL")
-config.test_format = lit.formats.ShTest(use_lit_shell == "0")
+config.test_format = lit.formats.ShTest()
 
 clang_path = config.clang if config.have_llvm_driver else os.path.realpath(config.clang)
 
diff --git a/clang/test/utils/update_cc_test_checks/Inputs/lit.cfg.example b/clang/test/utils/update_cc_test_checks/Inputs/lit.cfg.example
index 4e221c70b62f7..c39e63245920d 100644
--- a/clang/test/utils/update_cc_test_checks/Inputs/lit.cfg.example
+++ b/clang/test/utils/update_cc_test_checks/Inputs/lit.cfg.example
@@ -3,6 +3,6 @@ lit_config.load_config(
     config, os.path.join(lit_config.params.get('clang_lit_site_cfg')))
 config.name = 'update_cc_test_checks.py example'
 config.suffixes = ['.c', '.cpp']
-config.test_format = lit.formats.ShTest(execute_external=False)
+config.test_format = lit.formats.ShTest()
 config.test_source_root = os.path.dirname(__file__)
 config.test_exec_root = os.path.dirname(__file__)
diff --git a/clang/test/utils/update_cc_test_checks/lit.local.cfg b/clang/test/utils/update_cc_test_checks/lit.local.cfg
index d7cc78d8f67fe..065f162a97ae8 100644
--- a/clang/test/utils/update_cc_test_checks/lit.local.cfg
+++ b/clang/test/utils/update_cc_test_checks/lit.local.cfg
@@ -19,7 +19,7 @@ if config.standalone_build:
     config.unsupported = True
 else:
 
-    config.test_format = lit.formats.ShTest(execute_external=False)
+    config.test_format = lit.formats.ShTest()
     config.suffixes = [".test"]
 
     clang_path = os.path.join(config.clang_tools_dir, "clang")
diff --git a/clang/utils/perf-training/bolt.lit.cfg b/clang/utils/perf-training/bolt.lit.cfg
index dbb2dd3fd8587..b639597e222b2 100644
--- a/clang/utils/perf-training/bolt.lit.cfg
+++ b/clang/utils/perf-training/bolt.lit.cfg
@@ -45,8 +45,7 @@ config.suffixes = [
     ".test",
 ]
 
-use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL")
-config.test_format = lit.formats.ShTest(use_lit_shell == "0")
+config.test_format = lit.formats.ShTest()
 config.substitutions.append(
     ("%clang_cpp_skip_driver", f" {config.clang} --driver-mode=g++ ")
 )
diff --git a/clang/utils/perf-training/lit.cfg b/clang/utils/perf-training/lit.cfg
index 3f6089b7139a7..7b20922a63a3d 100644
--- a/clang/utils/perf-training/lit.cfg
+++ b/clang/utils/perf-training/lit.cfg
@@ -32,8 +32,7 @@ if not config.use_llvm_build:
 
 cc1_wrapper = '%s %s/perf-helper.py cc1' % (config.python_exe, config.perf_helper_dir)
 
-use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL")
-config.test_format = lit.formats.ShTest(use_lit_shell == "0")
+config.test_format = lit.formats.ShTest()
 config.cmake_compiler_args = '-DCMAKE_C_COMPILER="{0}" -DCMAKE_CXX_COMPILER="{0};--driver-mode=g++"'.format(
    config.clang.replace(' ', ';')
 )
diff --git a/clang/utils/perf-training/order-files.lit.cfg b/clang/utils/perf-training/order-files.lit.cfg
index f347fb72c3261..eece784fc04be 100644
--- a/clang/utils/perf-training/order-files.lit.cfg
+++ b/clang/utils/perf-training/order-files.lit.cfg
@@ -36,8 +36,7 @@ if 'darwin' in config.target_triple:
     dtrace_wrapper = '%s --use-oneshot' % dtrace_wrapper
     dtrace_wrapper_cc1 = '%s --use-oneshot' % dtrace_wrapper_cc1
 
-use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL")
-config.test_format = lit.formats.ShTest(use_lit_shell == "0")
+config.test_format = lit.formats.ShTest()
 config.substitutions.append( ('%clang_cpp_skip_driver', ' %s %s --driver-mode=g++ %s ' % (dtrace_wrapper_cc1, config.clang, sysroot_flags)))
 config.substitutions.append( ('%clang_cpp', ' %s %s --driver-mode=g++ %s ' % (dtrace_wrapper, config.clang, sysroot_flags)))
 config.substitutions.append( ('%clang_skip_driver', ' %s %s %s ' % (dtrace_wrapper_cc1, config.clang, sysroot_flags)))