[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.158 1.159

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
CTest: Test process tree kill on timeout

We extend the CTestTestTimeout test to check that when a test times out
its children (grandchildren of ctest) are killed.  Instead of running
the timeout executable directly, we run it through a cmake script that
redirects the timeout executable output to a file.  A second test later
runs and verifies that the timeout executable was unable to complete and
write data to the log file.  Only if the first inner test times out and
the second inner test passes (log is empty) does the CTestTestTimeout
test pass.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.158
retrieving revision 1.159
diff -C 2 -d -r1.158 -r1.159
*** CMakeLists.txt	30 Nov 2009 16:16:13 -0000	1.158
--- CMakeLists.txt	30 Nov 2009 21:31:27 -0000	1.159
***************
*** 1232,1240 ****
      @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")
    
    CONFIGURE_FILE(
--- 1232,1241 ----
      @ONLY ESCAPE_QUOTES)
    ADD_TEST(CTestTestTimeout ${CMAKE_CTEST_COMMAND}
+     -C "\${CTEST_CONFIGURATION_TYPE}"
      -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 "TestTimeout *\\.+ *\\*\\*\\*Timeout.*CheckChild *\\.+ *Passed")
    
    CONFIGURE_FILE(