Skip to content

Commit ff77427

Browse files
boomanaiden154github-actions[bot]
authored andcommitted
Automerge: Revert "[clangd] Enable lit internal shell by default (#170186)"
This reverts commit 671a8ce. This stil broke the clangd-ubuntu-tsan bot. It seems like somehow the PATH variable is not getting propagated in the system-include-extractor.test test.
2 parents 326958f + 43b6916 commit ff77427

File tree

2 files changed

+2
-23
lines changed

2 files changed

+2
-23
lines changed

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

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,14 @@
1-
import os
2-
import shutil
3-
41
import lit.llvm
52
import lit.util
63

74
lit.llvm.initialize(lit_config, config)
85
lit.llvm.llvm_config.clang_setup()
96
lit.llvm.llvm_config.use_default_substitutions()
107

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

@@ -55,13 +41,6 @@ def calculate_arch_features(arch_string):
5541
if lit.util.pythonize_bool(config.have_benchmarks):
5642
config.available_features.add("have-benchmarks")
5743

58-
# This is needed to avoid running a single test (system-include-extractor.test)
59-
# on a single buildbot (clangd-ubuntu-tsan) and likely should not be needed. We
60-
# are able to unconditionally assume a chmod binary exists for check-llvm.
61-
# TODO(boomanaiden154): Fix this after investigating the bot setup.
62-
if shutil.which("chmod"):
63-
config.available_features.add("chmod")
64-
6544
# It is not realistically possible to account for all options that could
6645
# possibly be present in system and user configuration files, so disable
6746
# default configs for the test runs.

clang-tools-extra/clangd/test/system-include-extractor.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# RUN: rm -rf %t.dir && mkdir -p %t.dir
22

33
# The mock driver below is a shell script:
4-
# REQUIRES: shell, chmod
4+
# REQUIRES: shell
55

66
# Create a bin directory to store the mock-driver and add it to the path
77
# RUN: mkdir -p %t.dir/bin

0 commit comments

Comments
 (0)