[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.116.2.3 1.116.2.4

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Nov 3 17:25:06 EST 2009


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

Modified Files:
      Tag: CMake-2-8
	CMakeLists.txt 
Log Message:
CMake 2.8.0-rc5


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.116.2.3
retrieving revision 1.116.2.4
diff -C 2 -d -r1.116.2.3 -r1.116.2.4
*** CMakeLists.txt	28 Oct 2009 16:15:43 -0000	1.116.2.3
--- CMakeLists.txt	3 Nov 2009 22:25:03 -0000	1.116.2.4
***************
*** 243,247 ****
      ADD_TEST(${name} /bin/sh ${_TEST_DIR}/nightly-cmake.sh)
      IF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
!       SET_TESTS_PROPERTIES (${name} PROPERTIES TIMEOUT 3500)
      ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
    ENDMACRO(ADD_NIGHTLY_BUILD_TEST)
--- 243,247 ----
      ADD_TEST(${name} /bin/sh ${_TEST_DIR}/nightly-cmake.sh)
      IF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
!       SET_TESTS_PROPERTIES (${name} PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
      ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
    ENDMACRO(ADD_NIGHTLY_BUILD_TEST)
***************
*** 1210,1224 ****
    
    CONFIGURE_FILE(
!     "${CMake_SOURCE_DIR}/Tests/CTestTestRunScript/test.cmake"
      "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/test.cmake"
      @ONLY ESCAPE_QUOTES)
    CONFIGURE_FILE(
!     "${CMake_SOURCE_DIR}/Tests/CTestTestRunScript/hello.cmake"
      "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/hello.cmake"
      @ONLY ESCAPE_QUOTES)
!   #ADD_TEST(CTestTestRunScript ${CMAKE_CTEST_COMMAND}
!   #  -S "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/test.cmake" -V
!   #  --output-log "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/testOutput.log"
!   #  )
    
    ADD_TEST(CTestTestShowOnly ${CMAKE_CTEST_COMMAND} -N)
--- 1210,1224 ----
    
    CONFIGURE_FILE(
!     "${CMake_SOURCE_DIR}/Tests/CTestTestRunScript/test.cmake.in"
      "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/test.cmake"
      @ONLY ESCAPE_QUOTES)
    CONFIGURE_FILE(
!     "${CMake_SOURCE_DIR}/Tests/CTestTestRunScript/hello.cmake.in"
      "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/hello.cmake"
      @ONLY ESCAPE_QUOTES)
!   ADD_TEST(CTestTestRunScript ${CMAKE_CTEST_COMMAND}
!     -S "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/test.cmake" -V
!     --output-log "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/testOutput.log"
!     )
    
    ADD_TEST(CTestTestShowOnly ${CMAKE_CTEST_COMMAND} -N)
***************
*** 1243,1248 ****
    set(regex "(Problems when submitting via S*CP")
    set(regex "${regex}|Error message was: ")
!   set(regex "${regex}(Couldn.t resolve host ")
!   set(regex "${regex}|couldn.t connect to host")
    set(regex "${regex}|libcurl was built with SSL disabled. https: not supported)")
    set(regex "${regex}|Submission method .xmlrpc. not compiled into CTest")
--- 1243,1248 ----
    set(regex "(Problems when submitting via S*CP")
    set(regex "${regex}|Error message was: ")
!   set(regex "${regex}([Cc]ould *n.t resolve host")
!   set(regex "${regex}|[Cc]ould *n.t connect to host")
    set(regex "${regex}|libcurl was built with SSL disabled. https: not supported)")
    set(regex "${regex}|Submission method .xmlrpc. not compiled into CTest")



More information about the Cmake-commits mailing list