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

[dealii.demon at gmail.com]

Revision 2348

Apply the same changes to Aspire that were just needed for Aspect.

U   trunk/aspire/tests/CMakeLists.txt


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

Diff:
Modified: trunk/aspire/tests/CMakeLists.txt
===================================================================
--- trunk/aspire/tests/CMakeLists.txt	2014-03-26 11:39:26 UTC (rev 2347)
+++ trunk/aspire/tests/CMakeLists.txt	2014-03-26 11:41:38 UTC (rev 2348)
@@ -88,14 +88,21 @@
   # files. Before running aspire, delete prior content of the directory to
   # make sure no dead files are left there (this is one way to trip up the
   # 'terminate_user_request' test of Aspire which terminates the program when
-  # a certain file appears)
+  # a certain file appears). we have to take care of not deleting those
+  # files that have been placed there on purpose, however, which are all
+  # of the .cmp.notime files.
   #
   # the actual run command is a bit complicated because we have to figure out
   # whether we want the test to run in parallel using MPI or not
   GET_MPI_COUNT(${CMAKE_CURRENT_SOURCE_DIR}/${_test}.prm)
   IF("${_mpi_count}" STREQUAL "1")
     ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output
-      COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/*
+      COMMAND
+	for i in ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/* \; do
+	  if echo \$i | grep -q -v .cmp.notime \; then
+	    rm -f \$i \;
+	  fi \;
+	done
       COMMAND aspire ${CMAKE_CURRENT_BINARY_DIR}/${_test}.x.prm
               > ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output 2>&1
       COMMAND ${PERL_EXECUTABLE} -pi
@@ -106,7 +113,12 @@
   ELSE()
     MESSAGE(STATUS "    MPI status: ${_mpi_count} processes")
     ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output
-      COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/*
+      COMMAND
+	for i in ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/* \; do
+	  if echo \$i | grep -q -v .cmp.notime \; then
+	    rm -f \$i \;
+	  fi \;
+	done
       COMMAND mpirun -np ${_mpi_count} ${CMAKE_CURRENT_BINARY_DIR}/../aspire ${CMAKE_CURRENT_BINARY_DIR}/${_test}.x.prm
               > ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output 2>&1
       COMMAND ${PERL_EXECUTABLE} -pi