RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

[CMake] Connecting check-all and test-depends targets correctly

Browse Source 
My previous attempt at this connected the sub-project check targets to the test-depends target instead of to the check-all target. That resulted in the tests running multiple times on bots that built "test-depends" and "check-all" in separate build invocations.

llvm-svn: 280392
This commit is contained in:
Chris Bieneman 2016-09-01 18:26:01 +00:00
parent dfa776bc20
commit e7ba91fa87
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -822,17 +822,22 @@ if( LLVM_INCLUDE_TESTS )
get_property(LLVM_LIT_PARAMS GLOBAL PROPERTY LLVM_LIT_PARAMS) get_property(LLVM_LIT_PARAMS GLOBAL PROPERTY LLVM_LIT_PARAMS)
get_property(LLVM_LIT_DEPENDS GLOBAL PROPERTY LLVM_LIT_DEPENDS) get_property(LLVM_LIT_DEPENDS GLOBAL PROPERTY LLVM_LIT_DEPENDS)
get_property(LLVM_LIT_EXTRA_ARGS GLOBAL PROPERTY LLVM_LIT_EXTRA_ARGS) get_property(LLVM_LIT_EXTRA_ARGS GLOBAL PROPERTY LLVM_LIT_EXTRA_ARGS)
get_property(LLVM_ADDITIONAL_TEST_TARGETS
GLOBAL PROPERTY LLVM_ADDITIONAL_TEST_TARGETS)
get_property(LLVM_ADDITIONAL_TEST_DEPENDS
GLOBAL PROPERTY LLVM_ADDITIONAL_TEST_DEPENDS)
add_lit_target(check-all add_lit_target(check-all
"Running all regression tests" "Running all regression tests"
${LLVM_LIT_TESTSUITES} ${LLVM_LIT_TESTSUITES}
PARAMS ${LLVM_LIT_PARAMS} PARAMS ${LLVM_LIT_PARAMS}
DEPENDS ${LLVM_LIT_DEPENDS} DEPENDS ${LLVM_LIT_DEPENDS} ${LLVM_ADDITIONAL_TEST_TARGETS}
ARGS ${LLVM_LIT_EXTRA_ARGS} ARGS ${LLVM_LIT_EXTRA_ARGS}
) )
if(TARGET check-runtimes) if(TARGET check-runtimes)
add_dependencies(check-all check-runtimes) add_dependencies(check-all check-runtimes)
endif() endif()
add_custom_target(test-depends DEPENDS ${LLVM_LIT_DEPENDS}) add_custom_target(test-depends
DEPENDS ${LLVM_LIT_DEPENDS} ${LLVM_ADDITIONAL_TEST_DEPENDS})
set_target_properties(test-depends PROPERTIES FOLDER "Tests") set_target_properties(test-depends PROPERTIES FOLDER "Tests")
endif() endif()

3
runtimes/CMakeLists.txt
View File

@ -194,7 +194,8 @@ else() # if this is included from LLVM's CMake
${SUB_INSTALL_TARGETS} ${SUB_INSTALL_TARGETS}
USE_TOOLCHAIN) USE_TOOLCHAIN)
if(LLVM_INCLUDE_TESTS) if(LLVM_INCLUDE_TESTS)
set_property(GLOBAL APPEND PROPERTY LLVM_LIT_DEPENDS runtimes-test-depends) set_property(GLOBAL APPEND PROPERTY LLVM_ADDITIONAL_TEST_DEPENDS runtimes-test-depends)
set_property(GLOBAL APPEND PROPERTY LLVM_ADDITIONAL_TEST_TARGETS check-runtimes)
endif() endif()
endif() endif()
endif() endif()