From: Chandler Carruth Date: Wed, 27 Jun 2012 09:44:16 +0000 (+0000) Subject: Clean up the 'check' CMake build rule a bit, notable renaming it to X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=b05b4603305f8f5bf09f27824d8adb29a9b51100 Clean up the 'check' CMake build rule a bit, notable renaming it to 'check-llvm'. Don't worry! 'check' still works! =] To rationalize the names of targets used to run tests, the vague plan is the following: make check-llvm # run LLVM reg/unit tests (currently 'check') make check-clang # run Clang reg/unit tests (currently 'clang-test') make check-rt # run CompilerRT reg/unit tests make check-asan # run ASan reg/unit tests (subset of -rt) make check-tsan # run TSan reg/unit tests (subset of -rt) make check-all # run as much of the above as is available The last one respects what projects are checked out and built for a given tree. Personally, I would like to eventually make 'check' be an alias for 'check-all'. For now however, it is an alias for 'check-llvm', and thus no behavior has changed. While this patch and my plan only really apply to CMake, I think it might be good to similarly rationalize the naming scheme for the Make builds. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159258 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ebea47d6916..9ec7f580c34 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -61,24 +61,33 @@ configure_file( ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg @ONLY) -add_custom_target(check +# Setup the basic dependencies for running LLVM's regression and unit test +# suites. +add_custom_target(check-llvm.deps + DEPENDS UnitTests + BugpointPasses LLVMHello + llc lli llvm-ar llvm-as llvm-dis llvm-extract llvm-dwarfdump + llvm-link llvm-mc llvm-nm llvm-objdump llvm-readobj + macho-dump opt + FileCheck count not + ) +set_target_properties(check-llvm.deps PROPERTIES FOLDER "Tests") + +# This is the primary action target to check the LLVM regression and unit test +# suite. +add_custom_target(check-llvm COMMAND ${PYTHON_EXECUTABLE} - ${LLVM_SOURCE_DIR}/utils/lit/lit.py - --param llvm_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg - --param llvm_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg - --param build_config=${CMAKE_CFG_INTDIR} - --param build_mode=${RUNTIME_BUILD_MODE} - ${LIT_ARGS} - ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Running LLVM regression tests") + ${LLVM_SOURCE_DIR}/utils/lit/lit.py + --param llvm_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg + --param llvm_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg + --param build_config=${CMAKE_CFG_INTDIR} + --param build_mode=${RUNTIME_BUILD_MODE} + ${LIT_ARGS} + ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "Running LLVM regression tests" + DEPENDS check-llvm.deps + ) -add_custom_target(check.deps) -add_dependencies(check check.deps) -add_dependencies(check.deps - UnitTests - BugpointPasses LLVMHello - llc lli llvm-ar llvm-as llvm-dis llvm-extract llvm-dwarfdump - llvm-link llvm-mc llvm-nm llvm-objdump llvm-readobj - macho-dump opt - FileCheck count not) -set_target_properties(check.deps PROPERTIES FOLDER "Tests") +# Setup a legacy alias for 'check-llvm'. This will likely change to be an +# alias for 'check-all' at some point in the future. +add_custom_target(check DEPENDS check-llvm)