[cig-commits] commit 1988 by bangerth to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 1988

Take over last few changes from aspect: set a reasonable timeout; also pipe
stderr output to output file.

U   trunk/aspire/tests/CMakeLists.txt


http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=1988&peg=1988

Diff:
Modified: trunk/aspire/tests/CMakeLists.txt
===================================================================
--- trunk/aspire/tests/CMakeLists.txt	2013-10-21 02:41:27 UTC (rev 1987)
+++ trunk/aspire/tests/CMakeLists.txt	2013-10-21 02:43:11 UTC (rev 1988)
@@ -7,6 +7,11 @@
   ENDIF()
 ENDMACRO()
 
+# set a time limit of 10 minutes per test. this should be long
+# enough even for long-running tests, and short enough to not
+# get into trouble should we have an infinite loop.
+SET_IF_EMPTY(TEST_TIME_LIMIT 600)
+
 ############################3
 
 ADD_CUSTOM_TARGET(tests)
@@ -31,7 +36,7 @@
   FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/output-${_test})
   ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output
     COMMAND aspire ${CMAKE_CURRENT_SOURCE_DIR}/${_test}.prm
-            > ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output
+            > ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output 2>&1
     COMMAND ${PERL_EXECUTABLE} -pi
               ${CMAKE_CURRENT_SOURCE_DIR}/normalize.pl
               ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/*
@@ -103,5 +108,8 @@
           -P ${CMAKE_SOURCE_DIR}/tests/run_test.cmake
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     )
+  SET_TESTS_PROPERTIES(${_test} PROPERTIES
+	TIMEOUT ${TEST_TIME_LIMIT}
+    )
 ENDFOREACH()