[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.116 1.116.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-8
	CMakeLists.txt 
Log Message:
Merge in changes to CMake-2-8 RC 2


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.116
retrieving revision 1.116.2.1
diff -C 2 -d -r1.116 -r1.116.2.1
*** CMakeLists.txt	24 Sep 2009 18:14:23 -0000	1.116
--- CMakeLists.txt	1 Oct 2009 21:21:22 -0000	1.116.2.1
***************
*** 125,128 ****
--- 125,131 ----
    ADD_TEST_MACRO(Unset Unset)
    ADD_TEST_MACRO(PolicyScope PolicyScope)
+   IF("${CMAKE_TEST_GENERATOR}" MATCHES "Make")
+     ADD_TEST_MACRO(Policy0002 Policy0002)
+   ENDIF("${CMAKE_TEST_GENERATOR}" MATCHES "Make")
  
    SET(CMAKE_BUILD_TEST_SOURCE_DIR "${CMake_SOURCE_DIR}/Tests/COnly")
***************
*** 844,847 ****
--- 847,851 ----
    IF(CMAKE_TEST_MSVC)
      ADD_TEST_MACRO(PrecompiledHeader foo)
+     ADD_TEST_MACRO(ModuleDefinition example_exe)
    ENDIF(CMAKE_TEST_MSVC)
  
***************
*** 1089,1095 ****
      --output-log "${CMake_BINARY_DIR}/Tests/CTestTestParallel/testOutput.log"
      )
!   ADD_TEST(CTestTestShowOnly ${CMAKE_CTEST_COMMAND}
!     -N
      )
    IF (CTEST_TEST_CTEST AND CMAKE_RUN_LONG_TESTS)
      CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestTest/test.cmake.in"
--- 1093,1110 ----
      --output-log "${CMake_BINARY_DIR}/Tests/CTestTestParallel/testOutput.log"
      )
!   
!   CONFIGURE_FILE(
!     "${CMake_SOURCE_DIR}/Tests/CTestTestTimeout/test.cmake.in"
!     "${CMake_BINARY_DIR}/Tests/CTestTestTimeout/test.cmake"
!     @ONLY ESCAPE_QUOTES)
!   ADD_TEST(CTestTestTimeout ${CMAKE_CTEST_COMMAND}
!     -S "${CMake_BINARY_DIR}/Tests/CTestTestTimeout/test.cmake" -V
!     --output-log "${CMake_BINARY_DIR}/Tests/CTestTestTimeout/testOutput.log"
      )
+   SET_TESTS_PROPERTIES(CTestTestTimeout PROPERTIES
+     PASS_REGULAR_EXPRESSION "\\*\\*\\*Timeout")
+   
+   ADD_TEST(CTestTestShowOnly ${CMAKE_CTEST_COMMAND} -N)
+   
    IF (CTEST_TEST_CTEST AND CMAKE_RUN_LONG_TESTS)
      CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestTest/test.cmake.in"