diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-14 15:56:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-11-14 15:56:37 (GMT) |
| commit | 2531c0aa09522c7f6c07bcdc33d0dc8e778a219d (patch) | |
| tree | 4f6c355b2c9c72724d2ca7d08eb31ed0046ab7ea /Tests | |
| parent | 0700f2ef1918a4bf9de197e1b25f1e2a00eb82f5 (diff) | |
| parent | 0854d45bbbf2e0ddfb80fc9856a3b7b7c189e175 (diff) | |
| download | CMake-2531c0aa09522c7f6c07bcdc33d0dc8e778a219d.zip CMake-2531c0aa09522c7f6c07bcdc33d0dc8e778a219d.tar.gz CMake-2531c0aa09522c7f6c07bcdc33d0dc8e778a219d.tar.bz2 | |
Merge topic 'fix-config-dependent-tests'
0854d45b Tests: Build config-dependent tests in the same config they run
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index ab83d41..3e29683 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -690,7 +690,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release FAIL_REGULAR_EXPRESSION "Unexpected: ") list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ArgumentExpansion") - add_test(GeneratorExpression ${CMAKE_CTEST_COMMAND} + add_test(GeneratorExpression + ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE} --build-and-test "${CMake_SOURCE_DIR}/Tests/GeneratorExpression" "${CMake_BINARY_DIR}/Tests/GeneratorExpression" @@ -950,7 +951,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release set(CPackRun_CPackGen "-DCPackGen=${CPackGen}") foreach(CPackComponentWay ${CWAYLST}) set(CPackRun_CPackComponentWay "-DCPackComponentWay=${CPackComponentWay}") - add_test(CPackComponentsForAll-${CPackGen}-${CPackComponentWay} ${CMAKE_CTEST_COMMAND} + add_test(CPackComponentsForAll-${CPackGen}-${CPackComponentWay} + ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE} --build-and-test "${CMake_SOURCE_DIR}/Tests/CPackComponentsForAll" "${CMake_BINARY_DIR}/Tests/CPackComponentsForAll/build${CPackGen}-${CPackComponentWay}" @@ -2041,7 +2043,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release PASS_REGULAR_EXPRESSION "uninitialized variable 'USED_VARIABLE'") list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WarnUninitialized") - add_test(TestsWorkingDirectory ${CMAKE_CTEST_COMMAND} + add_test(TestsWorkingDirectory + ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE} --build-and-test "${CMake_SOURCE_DIR}/Tests/TestsWorkingDirectory" "${CMake_BINARY_DIR}/Tests/TestsWorkingDirectory" |