Răsfoiți Sursa

BUG: Disable new 'testing' test mode for now

The new 'testing' test behavior of actually running the tests generated
by the project still fails when the test script guesses the Debug
configuration but the CMake build tree was only built Release.  The
inner ctest needs to find the ctest executable but is given the wrong
configuration.
Brad King 17 ani în urmă
părinte
comite
fb4f016299
1 a modificat fișierele cu 7 adăugiri și 5 ștergeri
  1. 7 5
      Tests/CMakeLists.txt

+ 7 - 5
Tests/CMakeLists.txt

@@ -14,9 +14,9 @@ MACRO(ADD_TEST_MACRO NAME COMMAND)
 ENDMACRO(ADD_TEST_MACRO)
 ENDMACRO(ADD_TEST_MACRO)
 
 
 # Make sure the 'testing' test gets a proper configuration.
 # Make sure the 'testing' test gets a proper configuration.
-SET_DIRECTORY_PROPERTIES(PROPERTIES
-  TEST_INCLUDE_FILE "${CMake_SOURCE_DIR}/Tests/EnforceConfig.cmake"
-  )
+#SET_DIRECTORY_PROPERTIES(PROPERTIES
+#  TEST_INCLUDE_FILE "${CMake_SOURCE_DIR}/Tests/EnforceConfig.cmake"
+#  )
 
 
 # Testing
 # Testing
 IF(BUILD_TESTING)
 IF(BUILD_TESTING)
@@ -542,14 +542,16 @@ ${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} -C \${CTEST_CONFIGURATION_TYPE}
+  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}
-    --test-command ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE}
+    #--test-command ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE}
+    --build-exe-dir "${CMake_BINARY_DIR}/Tests/Testing/bin"
+    --test-command testing
     )
     )
   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Testing")
   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Testing")