From 35b4b1a4e17c7c8ddab8a502e1ff36e445abf8de Mon Sep 17 00:00:00 2001 From: Justin Bogner Date: Wed, 25 Mar 2015 08:07:47 +0000 Subject: [PATCH] test: Fix the dependencies for the check-llvm-* targets In r233009 we gained specific check-llvm-* build targets for invoking specific parts of the test suite, but they were copying the dependencies for check-all, rather than just listing the dependencies for check-llvm. This moves the creation of these targets next to the check-llvm target, and uses that target's configuration rather than the check-all config. llvm-svn: 233174 --- llvm/CMakeLists.txt | 5 ----- llvm/test/CMakeLists.txt | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index ea3fda39c37d..bef66ec47748 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -631,11 +631,6 @@ if( LLVM_INCLUDE_TESTS ) DEPENDS ${LLVM_LIT_DEPENDS} ARGS ${LLVM_LIT_EXTRA_ARGS} ) - - add_lit_testsuites(LLVM ${CMAKE_SOURCE_DIR}/test - PARAMS ${LLVM_LIT_PARAMS} - DEPENDS ${LLVM_LIT_DEPENDS} - ARGS ${LLVM_LIT_EXTRA_ARGS}) endif() if (LLVM_INCLUDE_DOCS) diff --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt index cc151f720b48..4e36ec1bff2c 100644 --- a/llvm/test/CMakeLists.txt +++ b/llvm/test/CMakeLists.txt @@ -101,6 +101,12 @@ add_lit_testsuite(check-llvm "Running the LLVM regression tests" ) set_target_properties(check-llvm PROPERTIES FOLDER "Tests") +add_lit_testsuites(LLVM ${CMAKE_CURRENT_SOURCE_DIR} + PARAMS llvm_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg + llvm_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg + DEPENDS ${LLVM_TEST_DEPENDS} + ) + # 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)