kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2008-12-18 12:28:05 -05:00
parent 4c725d1e0e
commit adb6bf82b0
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tests/CMakeLists.txt
View File

@ -537,15 +537,14 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
ENDFOREACH(STP) ENDFOREACH(STP)
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Tutorial") 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 --build-and-test
"${CMake_SOURCE_DIR}/Tests/Testing" "${CMake_SOURCE_DIR}/Tests/Testing"
"${CMake_BINARY_DIR}/Tests/Testing" "${CMake_BINARY_DIR}/Tests/Testing"
--build-generator ${CMAKE_TEST_GENERATOR} --build-generator ${CMAKE_TEST_GENERATOR}
--build-project Testing --build-project Testing
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Testing/bin" --test-command ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE}
--test-command testing
) )
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Testing") LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Testing")

2
Tests/Testing/CMakeLists.txt
View File

@ -46,7 +46,7 @@ ENABLE_TESTING()
# Add test # Add test
# #
ADD_EXECUTABLE(testing testing.cxx) 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 # skip level test

2
Tests/Testing/Sub/Sub2/CMakeLists.txt
View File

@ -2,4 +2,4 @@
# Add test # Add test
# #
ADD_EXECUTABLE(testing2 testing2.cxx) ADD_EXECUTABLE(testing2 testing2.cxx)
ADD_TEST(testing2 ${Testing_BINARY_DIR}/bin/testing2) ADD_TEST(testing.2 ${Testing_BINARY_DIR}/bin/testing2)