[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.48 1.48.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt 
Log Message:
ENH: merge in from main tree


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.48
retrieving revision 1.48.2.1
diff -C 2 -d -r1.48 -r1.48.2.1
*** CMakeLists.txt	6 Feb 2008 19:52:12 -0000	1.48
--- CMakeLists.txt	21 Apr 2008 19:21:57 -0000	1.48.2.1
***************
*** 28,31 ****
--- 28,41 ----
    ENDIF (CMAKE_RUN_LONG_TESTS)
  
+   # Use 1500 or CTEST_TEST_TIMEOUT for long test timeout value,
+   # whichever is greater.
+   SET(CMAKE_LONG_TEST_TIMEOUT 1500)
+   IF(CTEST_TEST_TIMEOUT)
+     SET(CMAKE_LONG_TEST_TIMEOUT ${CTEST_TEST_TIMEOUT})
+   ENDIF(CTEST_TEST_TIMEOUT)
+   IF(CMAKE_LONG_TEST_TIMEOUT LESS 1500)
+     SET(CMAKE_LONG_TEST_TIMEOUT 1500)
+   ENDIF(CMAKE_LONG_TEST_TIMEOUT LESS 1500)
+ 
    # add a bunch of standard build-and-test style tests
    ADD_TEST_MACRO(CommandLineTest CommandLineTest)
***************
*** 656,670 ****
        GET_TEST_PROPERTY(CTestTest TIMEOUT PREVIOUS_TIMEOUT)
        IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!         SET_TESTS_PROPERTIES ( CTestTest PROPERTIES TIMEOUT 1500)
        ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
  
        GET_TEST_PROPERTY(CTestTest2 TIMEOUT PREVIOUS_TIMEOUT)
        IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!         SET_TESTS_PROPERTIES ( CTestTest2 PROPERTIES TIMEOUT 1500)
        ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
  
        GET_TEST_PROPERTY(CTestTest3 TIMEOUT PREVIOUS_TIMEOUT)
        IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!         SET_TESTS_PROPERTIES ( CTestTest3 PROPERTIES TIMEOUT 1500)
        ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
      ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
--- 666,683 ----
        GET_TEST_PROPERTY(CTestTest TIMEOUT PREVIOUS_TIMEOUT)
        IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!         SET_TESTS_PROPERTIES ( CTestTest
!           PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
        ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
  
        GET_TEST_PROPERTY(CTestTest2 TIMEOUT PREVIOUS_TIMEOUT)
        IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!         SET_TESTS_PROPERTIES ( CTestTest2
!           PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
        ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
  
        GET_TEST_PROPERTY(CTestTest3 TIMEOUT PREVIOUS_TIMEOUT)
        IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!         SET_TESTS_PROPERTIES ( CTestTest3
!           PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
        ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
      ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
***************
*** 696,700 ****
        GET_TEST_PROPERTY(BootstrapTest TIMEOUT PREVIOUS_TIMEOUT)
        IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!         SET_TESTS_PROPERTIES ( BootstrapTest PROPERTIES TIMEOUT 1500)
        ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
      ENDIF (COMMAND GET_TEST_PROPERTY)
--- 709,714 ----
        GET_TEST_PROPERTY(BootstrapTest TIMEOUT PREVIOUS_TIMEOUT)
        IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
!         SET_TESTS_PROPERTIES ( BootstrapTest
!           PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
        ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
      ENDIF (COMMAND GET_TEST_PROPERTY)