aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2012-07-02 21:37:04 +0000
committerChandler Carruth <chandlerc@gmail.com>2012-07-02 21:37:04 +0000
commit1e537f442e256da49a457558ede3a1e7e409a22f (patch)
treeac95929e8b955b018e486c3faac61463b427f588
parentec956d82bceb1c471f4ae18541b78e431f7fbb20 (diff)
We support a mode where the Clang regression tests are run but not the
Clang unit tests. It's not clear why we support this mode in builds where LLVM is available (LLVM itself does not), but at least this makes us support it correctly. This also fixes a long-standing bug where we would pass the unit test param flag to lit in the standalone build even though the standalone build *never* has the unittests built and ready for testing. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@159594 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/CMakeLists.txt11
1 files changed, 8 insertions, 3 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f57343dcbf..272e1242ed 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -34,13 +34,19 @@ if( NOT CLANG_BUILT_STANDALONE )
clang-check
llvm-dis llc opt FileCheck count not
)
+ set(CLANG_TEST_PARAMS
+ clang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
+ )
+
if(LLVM_INCLUDE_TESTS)
list(APPEND CLANG_TEST_DEPS ClangUnitTests)
+ list(APPEND CLANG_TEST_PARAMS
+ clang_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
+ )
endif()
add_lit_testsuite(check-clang "Running the Clang regression tests"
${CMAKE_CURRENT_BINARY_DIR}
- PARAMS clang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
- clang_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
+ PARAMS ${CLANG_TEST_PARAMS}
DEPENDS ${CLANG_TEST_DEPS}
ARGS ${CLANG_TEST_EXTRA_ARGS}
)
@@ -67,7 +73,6 @@ else()
COMMAND ${PYTHON_EXECUTABLE}
${LIT}
--param clang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
- --param clang_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}