فهرست منبع

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.
Brad King 17 سال پیش
والد
کامیت
adb6bf82b0
3فایلهای تغییر یافته به همراه4 افزوده شده و 5 حذف شده
  1. 2 3
      Tests/CMakeLists.txt
  2. 1 1
      Tests/Testing/CMakeLists.txt
  3. 1 1
      Tests/Testing/Sub/Sub2/CMakeLists.txt

+ 2 - 3
Tests/CMakeLists.txt

@@ -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 testing
+    --test-command ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE}
     )
     )
   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Testing")
   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Testing")
 
 

+ 1 - 1
Tests/Testing/CMakeLists.txt

@@ -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

+ 1 - 1
Tests/Testing/Sub/Sub2/CMakeLists.txt

@@ -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)