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

[dealii.demon at gmail.com]

Revision 1959

Restrict of output files to compare to those that start with a letter
or digit, but in particular excluding '.svn' directories.

U   trunk/aspect/tests/CMakeLists.txt


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

Diff:
Modified: trunk/aspect/tests/CMakeLists.txt
===================================================================
--- trunk/aspect/tests/CMakeLists.txt	2013-10-15 14:15:09 UTC (rev 1958)
+++ trunk/aspect/tests/CMakeLists.txt	2013-10-15 18:05:39 UTC (rev 1959)
@@ -17,7 +17,7 @@
 
 FILE(GLOB _tests *.prm)
 FOREACH(_test ${_tests})
-  GET_FILENAME_COMPONENT(_test ${_test} NAME_WE) 
+  GET_FILENAME_COMPONENT(_test ${_test} NAME_WE)
   MESSAGE(STATUS "Adding test ${_test}")
 
   IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_test}.cc)
@@ -30,7 +30,7 @@
 
   FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/output-${_test})
   ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output
-    COMMAND aspect ${CMAKE_CURRENT_SOURCE_DIR}/${_test}.prm 
+    COMMAND aspect ${CMAKE_CURRENT_SOURCE_DIR}/${_test}.prm
             > ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output
     COMMAND ${PERL_EXECUTABLE} -pi
               ${CMAKE_CURRENT_SOURCE_DIR}/normalize.pl
@@ -38,7 +38,7 @@
     DEPENDS aspect ${CMAKE_CURRENT_SOURCE_DIR}/${_test}.prm ${_testdepends}
     )
 
-  ADD_CUSTOM_TARGET(${_test}.run 
+  ADD_CUSTOM_TARGET(${_test}.run
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output
     )
 
@@ -50,15 +50,15 @@
   # this test, create targets that
   # - create a 'output.notime' file
   # - diff this file with the saved one and save the result
-  FILE(GLOB _outputs ${CMAKE_CURRENT_SOURCE_DIR}/${_test}/*)
+  FILE(GLOB _outputs ${CMAKE_CURRENT_SOURCE_DIR}/${_test}/[a-zA-Z0-9]*)
   FOREACH(_output ${_outputs})
-    GET_FILENAME_COMPONENT(_output ${_output} NAME) 
+    GET_FILENAME_COMPONENT(_output ${_output} NAME)
 
     # create the output.notime target
     ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/${_output}.notime
       COMMAND
 	cat ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/${_output}
-        | egrep -v '^\|' 
+        | egrep -v '^\|'
         > ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/${_output}.notime
       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output
     )
@@ -80,10 +80,10 @@
     )
 
     # add the target for this output file to the dependencies of this test
-    ADD_CUSTOM_TARGET(${_test}.${_output}.diff 
+    ADD_CUSTOM_TARGET(${_test}.${_output}.diff
       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/${_output}.diff
       )
-    ADD_DEPENDENCIES(tests.${_test} 
+    ADD_DEPENDENCIES(tests.${_test}
                      ${_test}.${_output}.diff)
   ENDFOREACH()