Skip to content

Commit 55ef9a1

Browse files
committed
Another attempt to fix "could not find clang-check" lit warning in analyzer-less builds
r359717 added clang-check as a dep of check-clang unconditionally because I had missed lit.local.cfg in test/Tooling. Instead, only add clang-check to the tools if the analyzer is enabled, since the build target only exists then, and since all tests using clang-check are skipped when the analyzer is disabled. Differential Revision: https://reviews.llvm.org/D61418 llvm-svn: 359820
1 parent a7c766b commit 55ef9a1

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

clang/test/lit.cfg.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@
6161
tool_dirs = [config.clang_tools_dir, config.llvm_tools_dir]
6262

6363
tools = [
64-
'c-index-test', 'clang-check', 'clang-diff', 'clang-format', 'clang-tblgen',
65-
'opt',
64+
'c-index-test', 'clang-diff', 'clang-format', 'clang-tblgen', 'opt',
6665
ToolSubst('%clang_extdef_map', command=FindTool(
6766
'clang-extdef-mapping'), unresolved='ignore'),
6867
]
@@ -71,6 +70,14 @@
7170
config.available_features.add('examples')
7271
tools.append('clang-interpreter')
7372

73+
if config.clang_staticanalyzer:
74+
config.available_features.add('staticanalyzer')
75+
tools.append('clang-check')
76+
77+
if config.clang_staticanalyzer_z3 == '1':
78+
config.available_features.add('z3')
79+
80+
7481
llvm_config.add_tool_substitutions(tools, tool_dirs)
7582

7683
config.substitutions.append(
@@ -92,13 +99,6 @@
9299
if config.clang_default_cxx_stdlib != '':
93100
config.available_features.add('default-cxx-stdlib-set')
94101

95-
# Enabled/disabled features
96-
if config.clang_staticanalyzer:
97-
config.available_features.add('staticanalyzer')
98-
99-
if config.clang_staticanalyzer_z3 == '1':
100-
config.available_features.add('z3')
101-
102102
# As of 2011.08, crash-recovery tests still do not pass on FreeBSD.
103103
if platform.system() not in ['FreeBSD']:
104104
config.available_features.add('crash-recovery')

0 commit comments

Comments
 (0)