Commit adb6bf82 authored by Brad King's avatar Brad King

ENH: Improve 'testing' test to actually test

The 'testing' CMake test builds a project that uses add_test.  This
strengthens the test to actually run CTest on the project build tree
after building it.
parent 4c725d1e
......@@ -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")
......
......@@ -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
......
......@@ -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)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment