File tree Expand file tree Collapse file tree 8 files changed +10
-38
lines changed Expand file tree Collapse file tree 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(
3535 )
3636
3737add_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.
3841 ${CMAKE_CURRENT_BINARY_DIR} /../unittests;${CMAKE_CURRENT_BINARY_DIR}
3942 DEPENDS ${CLANGD_TEST_DEPS} )
Original file line number Diff line number Diff line change @@ -106,16 +106,9 @@ if (CLANG_BUILD_EXAMPLES)
106106endif ()
107107
108108set (CLANG_TEST_PARAMS
109- clang_site_config=${CMAKE_CURRENT_BINARY_DIR} /lit.site.cfg
110109 USE_Z3_SOLVER=0
111110 )
112111
113- set (ANALYZER_TEST_PARAMS
114- USE_Z3_SOLVER=0)
115-
116- set (ANALYZER_TEST_PARAMS_Z3
117- USE_Z3_SOLVER=1)
118-
119112if ( NOT CLANG_BUILT_STANDALONE )
120113 list (APPEND CLANG_TEST_DEPS
121114 llvm-config
Original file line number Diff line number Diff line change @@ -44,23 +44,15 @@ if (LLVM_INCLUDE_TESTS)
4444 list (APPEND LLD_TEST_DEPS LLDUnitTests)
4545endif ()
4646
47- set (LLD_TEST_PARAMS
48- lld_site_config=${CMAKE_CURRENT_BINARY_DIR} /lit.site.cfg
49- )
50-
5147add_lit_testsuite(check-lld "Running lld test suite"
5248 ${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
5549 DEPENDS ${LLD_TEST_DEPS}
5650 )
5751
5852add_custom_target (lld-test -depends DEPENDS ${LLD_TEST_DEPS} )
5953set_target_properties (lld-test -depends PROPERTIES FOLDER "lld tests" )
6054
6155add_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
6456 DEPENDS ${LLD_TEST_DEPS}
6557 )
6658
Original file line number Diff line number Diff line change @@ -21,8 +21,9 @@ write_lit_config("lit_site_cfg") {
2121 output = clangd_lit_site_cfg_file
2222
2323 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" )),
2627 " CMAKE_CURRENT_SOURCE_DIR=" +
2728 rebase_path (" //clang-tools-extra/clangd/test" ),
2829
@@ -91,6 +92,10 @@ action("check-clangd") {
9192 }
9293 args = [
9394 " -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.
9499 rebase_path (get_path_info (clangd_lit_site_cfg_file , " dir" ), root_out_dir ),
95100 rebase_path (get_path_info (clangd_lit_unit_site_cfg_file , " dir" ),
96101 root_out_dir ),
Original file line number Diff line number Diff line change @@ -90,12 +90,6 @@ action("check-clang-tools") {
9090 }
9191 args = [
9292 " -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 ),
9993 rebase_path (" ." , root_out_dir ),
10094 ]
10195 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") {
189189 }
190190 args = [
191191 " -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 ),
197192 rebase_path (" ." , root_out_dir ),
198193 ]
199194 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") {
110110 }
111111 args = [
112112 " -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 ),
118113 rebase_path (" ." , root_out_dir ),
119114 ]
120115 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") {
289289 }
290290 args = [
291291 " -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 ),
297292 rebase_path (" ." , root_out_dir ),
298293 ]
299294 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