|
1 | | -import os |
2 | | -import shutil |
3 | | - |
4 | 1 | import lit.llvm |
5 | 2 | import lit.util |
6 | 3 |
|
7 | 4 | lit.llvm.initialize(lit_config, config) |
8 | 5 | lit.llvm.llvm_config.clang_setup() |
9 | 6 | lit.llvm.llvm_config.use_default_substitutions() |
10 | 7 |
|
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 | | - |
22 | 8 | config.name = "Clangd" |
23 | 9 | config.suffixes = [".test"] |
24 | 10 | 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) |
26 | 12 | config.test_source_root = config.clangd_source_dir + "/test" |
27 | 13 | config.test_exec_root = config.clangd_binary_dir + "/test" |
28 | 14 |
|
@@ -55,13 +41,6 @@ def calculate_arch_features(arch_string): |
55 | 41 | if lit.util.pythonize_bool(config.have_benchmarks): |
56 | 42 | config.available_features.add("have-benchmarks") |
57 | 43 |
|
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 | | - |
65 | 44 | # It is not realistically possible to account for all options that could |
66 | 45 | # possibly be present in system and user configuration files, so disable |
67 | 46 | # default configs for the test runs. |
|
0 commit comments