[cig-commits] commit 2379 by heister to /var/svn/dealii/aspect

dealii.demon at gmail.com dealii.demon at gmail.com
Mon Mar 31 06:22:53 PDT 2014


Revision 2379

do not suppress std:cerr output in tests, write to temporary screen-output file so that executable will be rerun if it fails

U   trunk/aspect/tests/CMakeLists.txt


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

Diff:
Modified: trunk/aspect/tests/CMakeLists.txt
===================================================================
--- trunk/aspect/tests/CMakeLists.txt	2014-03-29 12:20:27 UTC (rev 2378)
+++ trunk/aspect/tests/CMakeLists.txt	2014-03-31 13:22:49 UTC (rev 2379)
@@ -104,7 +104,9 @@
 	  fi \;
 	done
       COMMAND aspect ${CMAKE_CURRENT_BINARY_DIR}/${_test}.x.prm
-              > ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output 2>&1
+              > ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output.tmp
+      COMMAND mv ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output.tmp
+	${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output
       COMMAND ${PERL_EXECUTABLE} -pi
                 ${CMAKE_CURRENT_SOURCE_DIR}/normalize.pl
                 ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/*
@@ -120,7 +122,9 @@
 	  fi \;
 	done
       COMMAND mpirun -np ${_mpi_count} ${CMAKE_CURRENT_BINARY_DIR}/../aspect ${CMAKE_CURRENT_BINARY_DIR}/${_test}.x.prm
-              > ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output 2>&1
+              > ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output.tmp
+      COMMAND mv ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output.tmp
+	${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output
       COMMAND ${PERL_EXECUTABLE} -pi
                 ${CMAKE_CURRENT_SOURCE_DIR}/normalize.pl
                 ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/*


More information about the CIG-COMMITS mailing list