[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.75 1.76

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Dec 18 12:28:06 EST 2008


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

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


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.75
retrieving revision 1.76
diff -C 2 -d -r1.75 -r1.76
*** CMakeLists.txt	11 Dec 2008 19:35:57 -0000	1.75
--- CMakeLists.txt	18 Dec 2008 17:28:04 -0000	1.76
***************
*** 538,542 ****
    LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Tutorial")
  
!   ADD_TEST(testing ${CMAKE_CTEST_COMMAND}
      --build-and-test
      "${CMake_SOURCE_DIR}/Tests/Testing"
--- 538,542 ----
    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"
***************
*** 545,550 ****
      --build-project Testing
      --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
!     --build-exe-dir "${CMake_BINARY_DIR}/Tests/Testing/bin"
!     --test-command testing
      )
    LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Testing")
--- 545,549 ----
      --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")



More information about the Cmake-commits mailing list