]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Use numdiff with -s ' \n\t' per default. The problem with the overquotation
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 16 Sep 2013 23:03:02 +0000 (23:03 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 16 Sep 2013 23:03:02 +0000 (23:03 +0000)
still has to be resolved :-/

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30752 0785d39b-7218-0410-832d-ea1e28bc413d

tests/cmake/setup_testsuite.cmake

index 81852d09dc305362b29dd30858c980d64b29c6c8..50b735334ebc4af396d1b1331820a5483078e7bd 100644 (file)
@@ -93,22 +93,18 @@ IF( NUMDIFF_EXECUTABLE MATCHES "-NOTFOUND"
     )
 ENDIF()
 
-# TODO: we really want numdiff -a 1e-6 -q -s ' \t\n'
-# but quotings will break
-IF(NOT NUMDIFF_EXECUTABLE MATCHES "-NOTFOUND")
-  SET_IF_EMPTY(TEST_DIFF "${NUMDIFF_EXECUTABLE} -a 1e-6 -q")
+IF("${TEST_DIFF}" STREQUAL "")
+  IF(NOT NUMDIFF_EXECUTABLE MATCHES "-NOTFOUND")
+      SET(TEST_DIFF ${NUMDIFF_EXECUTABLE} -a 1e-6 -q -s ' \\t\\n')
+  ELSE()
+      SET(TEST_DIFF ${DIFF_EXECUTABLE})
+  ENDIF()
 ELSE()
-  SET_IF_EMPTY(TEST_DIFF "${DIFF_EXECUTABLE}")
+  # TODO: I have no idea how to prepare a custom string comming possibly
+  # through two layers of command line into a list...
+  SEPARATE_ARGUMENTS(TEST_DIFF UNIX_COMMAND ${TEST_DIFF})
 ENDIF()
 
-#
-# "Son, we have to talk about quotings". Avoid overquoting. Due to the fact
-# that TEST_DIFF might be passed to the command line as a string, we have
-# to set it up this way :-/
-#
-
-SEPARATE_ARGUMENTS(TEST_DIFF UNIX_COMMAND ${TEST_DIFF})
-
 #
 # Set a default time limit of 180 seconds:
 #

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.