From 20d606d5c885f548dde1b48114b163570ac18023 Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 16 Sep 2013 23:03:02 +0000 Subject: [PATCH] Use numdiff with -s ' \n\t' per default. The problem with the overquotation 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 | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/tests/cmake/setup_testsuite.cmake b/tests/cmake/setup_testsuite.cmake index 81852d09dc..50b735334e 100644 --- a/tests/cmake/setup_testsuite.cmake +++ b/tests/cmake/setup_testsuite.cmake @@ -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: # -- 2.39.5