diff options
| -rw-r--r-- | Tests/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/Testing/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/Testing/Sub/Sub2/CMakeLists.txt | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 5596663..8ae3041 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -537,15 +537,14 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel ENDFOREACH(STP) LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Tutorial") - ADD_TEST(testing ${CMAKE_CTEST_COMMAND} + ADD_TEST(testing ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE} --build-and-test "${CMake_SOURCE_DIR}/Tests/Testing" "${CMake_BINARY_DIR}/Tests/Testing" --build-generator ${CMAKE_TEST_GENERATOR} --build-project Testing --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} - --build-exe-dir "${CMake_BINARY_DIR}/Tests/Testing/bin" - --test-command testing + --test-command ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE} ) LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Testing") diff --git a/Tests/Testing/CMakeLists.txt b/Tests/Testing/CMakeLists.txt index c4459bb..5a15f11 100644 --- a/Tests/Testing/CMakeLists.txt +++ b/Tests/Testing/CMakeLists.txt @@ -46,7 +46,7 @@ ENABLE_TESTING() # Add test # ADD_EXECUTABLE(testing testing.cxx) -ADD_TEST(testing ${Testing_BINARY_DIR}/bin/testing) +ADD_TEST(testing.1 ${Testing_BINARY_DIR}/bin/testing) # # skip level test diff --git a/Tests/Testing/Sub/Sub2/CMakeLists.txt b/Tests/Testing/Sub/Sub2/CMakeLists.txt index 864c1b7..3a7295d 100644 --- a/Tests/Testing/Sub/Sub2/CMakeLists.txt +++ b/Tests/Testing/Sub/Sub2/CMakeLists.txt @@ -2,4 +2,4 @@ # Add test # ADD_EXECUTABLE(testing2 testing2.cxx) -ADD_TEST(testing2 ${Testing_BINARY_DIR}/bin/testing2) +ADD_TEST(testing.2 ${Testing_BINARY_DIR}/bin/testing2) |