File tree 8 files changed +10
-38
lines changed 8 files changed +10
-38
lines changed Original file line number Diff line number Diff line change @@ -35,5 +35,8 @@ configure_lit_site_cfg(
35
35
)
36
36
37
37
add_lit_testsuite(check-clangd "Running the Clangd regression tests"
38
+ # clangd doesn't put unittest configs in test/unit like every other project.
39
+ # Because of that, this needs to pass two folders here, while every other
40
+ # project only needs to pass CMAKE_CURRENT_BINARY_DIR.
38
41
${CMAKE_CURRENT_BINARY_DIR} /../unittests;${CMAKE_CURRENT_BINARY_DIR}
39
42
DEPENDS ${CLANGD_TEST_DEPS} )
Original file line number Diff line number Diff line change @@ -106,16 +106,9 @@ if (CLANG_BUILD_EXAMPLES)
106
106
endif ()
107
107
108
108
set (CLANG_TEST_PARAMS
109
- clang_site_config=${CMAKE_CURRENT_BINARY_DIR} /lit.site.cfg
110
109
USE_Z3_SOLVER=0
111
110
)
112
111
113
- set (ANALYZER_TEST_PARAMS
114
- USE_Z3_SOLVER=0)
115
-
116
- set (ANALYZER_TEST_PARAMS_Z3
117
- USE_Z3_SOLVER=1)
118
-
119
112
if ( NOT CLANG_BUILT_STANDALONE )
120
113
list (APPEND CLANG_TEST_DEPS
121
114
llvm-config
Original file line number Diff line number Diff line change @@ -44,23 +44,15 @@ if (LLVM_INCLUDE_TESTS)
44
44
list (APPEND LLD_TEST_DEPS LLDUnitTests)
45
45
endif ()
46
46
47
- set (LLD_TEST_PARAMS
48
- lld_site_config=${CMAKE_CURRENT_BINARY_DIR} /lit.site.cfg
49
- )
50
-
51
47
add_lit_testsuite(check-lld "Running lld test suite"
52
48
${CMAKE_CURRENT_BINARY_DIR}
53
- PARAMS lld_site_config=${CMAKE_CURRENT_BINARY_DIR} /lit.site.cfg
54
- lld_unit_site_config=${CMAKE_CURRENT_BINARY_DIR} /Unit/lit.site.cfg
55
49
DEPENDS ${LLD_TEST_DEPS}
56
50
)
57
51
58
52
add_custom_target (lld-test -depends DEPENDS ${LLD_TEST_DEPS} )
59
53
set_target_properties (lld-test -depends PROPERTIES FOLDER "lld tests" )
60
54
61
55
add_lit_testsuites(LLD ${CMAKE_CURRENT_SOURCE_DIR}
62
- PARAMS lld_site_config=${CMAKE_CURRENT_BINARY_DIR} /lit.site.cfg
63
- lld_unit_site_config=${CMAKE_CURRENT_BINARY_DIR} /Unit/lit.site.cfg
64
56
DEPENDS ${LLD_TEST_DEPS}
65
57
)
66
58
Original file line number Diff line number Diff line change @@ -21,8 +21,9 @@ write_lit_config("lit_site_cfg") {
21
21
output = clangd_lit_site_cfg_file
22
22
23
23
extra_values = [
24
- " CMAKE_CURRENT_BINARY_DIR=" + rebase_path (
25
- get_label_info (" //clang-tools-extra/clangd/test" , " target_out_dir" )),
24
+ " CMAKE_CURRENT_BINARY_DIR=" +
25
+ rebase_path (get_label_info (" //clang-tools-extra/clangd/test" ,
26
+ " target_out_dir" )),
26
27
" CMAKE_CURRENT_SOURCE_DIR=" +
27
28
rebase_path (" //clang-tools-extra/clangd/test" ),
28
29
@@ -91,6 +92,10 @@ action("check-clangd") {
91
92
}
92
93
args = [
93
94
" -sv" ,
95
+
96
+ # clangd doesn't put unittest configs in test/unit like every other project.
97
+ # Because of that, this needs to pass two folders here, while every other
98
+ # project only needs to pass CMAKE_CURRENT_BINARY_DIR.
94
99
rebase_path (get_path_info (clangd_lit_site_cfg_file , " dir" ), root_out_dir ),
95
100
rebase_path (get_path_info (clangd_lit_unit_site_cfg_file , " dir" ),
96
101
root_out_dir ),
Original file line number Diff line number Diff line change @@ -90,12 +90,6 @@ action("check-clang-tools") {
90
90
}
91
91
args = [
92
92
" -sv" ,
93
- " --param" ,
94
- " clang_site_config=" +
95
- rebase_path (clang_tools_extra_lit_site_cfg_file , root_out_dir ),
96
- " --param" ,
97
- " clang_unit_site_config=" +
98
- rebase_path (clang_tools_extra_lit_unit_site_cfg_file , root_out_dir ),
99
93
rebase_path (" ." , root_out_dir ),
100
94
]
101
95
outputs = [ " $target_gen_dir /run-lit" ] # Non-existing, so that ninja runs it
Original file line number Diff line number Diff line change @@ -189,11 +189,6 @@ action("check-clang") {
189
189
}
190
190
args = [
191
191
" -sv" ,
192
- " --param" ,
193
- " clang_site_config=" + rebase_path (clang_lit_site_cfg_file , root_out_dir ),
194
- " --param" ,
195
- " clang_unit_site_config=" +
196
- rebase_path (clang_lit_unit_site_cfg_file , root_out_dir ),
197
192
rebase_path (" ." , root_out_dir ),
198
193
]
199
194
outputs = [ " $target_gen_dir /run-lit" ] # Non-existing, so that ninja runs it
Original file line number Diff line number Diff line change @@ -110,11 +110,6 @@ action("check-lld") {
110
110
}
111
111
args = [
112
112
" -sv" ,
113
- " --param" ,
114
- " lld_site_config=" + rebase_path (lld_lit_site_cfg_file , root_out_dir ),
115
- " --param" ,
116
- " lld_unit_site_config=" +
117
- rebase_path (lld_lit_unit_site_cfg_file , root_out_dir ),
118
113
rebase_path (" ." , root_out_dir ),
119
114
]
120
115
outputs = [ " $target_gen_dir /run-lit" ] # Non-existing, so that ninja runs it
Original file line number Diff line number Diff line change @@ -289,11 +289,6 @@ action("check-llvm") {
289
289
}
290
290
args = [
291
291
" -sv" ,
292
- " --param" ,
293
- " llvm_site_config=" + rebase_path (llvm_lit_site_cfg_file , root_out_dir ),
294
- " --param" ,
295
- " llvm_unit_site_config=" +
296
- rebase_path (llvm_lit_unit_site_cfg_file , root_out_dir ),
297
292
rebase_path (" ." , root_out_dir ),
298
293
]
299
294
outputs = [ " $target_gen_dir /run-lit" ] # Non-existing, so that ninja runs it
You can’t perform that action at this time.
0 commit comments