[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.77 1.78

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv25585/Tests

Modified Files:
	CMakeLists.txt 
Log Message:
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.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.77
retrieving revision 1.78
diff -C 2 -d -r1.77 -r1.78
*** CMakeLists.txt	18 Dec 2008 19:26:20 -0000	1.77
--- CMakeLists.txt	18 Dec 2008 22:15:58 -0000	1.78
***************
*** 15,21 ****
  
  # Make sure the 'testing' test gets a proper configuration.
! SET_DIRECTORY_PROPERTIES(PROPERTIES
!   TEST_INCLUDE_FILE "${CMake_SOURCE_DIR}/Tests/EnforceConfig.cmake"
!   )
  
  # Testing
--- 15,21 ----
  
  # Make sure the 'testing' test gets a proper configuration.
! #SET_DIRECTORY_PROPERTIES(PROPERTIES
! #  TEST_INCLUDE_FILE "${CMake_SOURCE_DIR}/Tests/EnforceConfig.cmake"
! #  )
  
  # Testing
***************
*** 543,547 ****
    LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Tutorial")
  
!   ADD_TEST(testing ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE}
      --build-and-test
      "${CMake_SOURCE_DIR}/Tests/Testing"
--- 543,547 ----
    LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Tutorial")
  
!   ADD_TEST(testing ${CMAKE_CTEST_COMMAND} # -C \${CTEST_CONFIGURATION_TYPE}
      --build-and-test
      "${CMake_SOURCE_DIR}/Tests/Testing"
***************
*** 550,554 ****
      --build-project Testing
      --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
!     --test-command ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE}
      )
    LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Testing")
--- 550,556 ----
      --build-project Testing
      --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
!     #--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")