From 00525f8b593652c6a3dc1ddb6f947379c0a539d9 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 20 Nov 2014 06:49:37 +0100
Subject: [PATCH] Use the right diff tool.
---
scripts/cmake/test/AddTest.cmake | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index 6be7638bbfe..e84158d8315 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -101,8 +101,10 @@ function (AddTest)
endif()
if(AddTest_TESTER STREQUAL "diff")
+ set(SELECTED_DIFF_TOOL_PATH ${DIFF_TOOL_PATH})
set(TESTER_ARGS "-sbB")
elseif(AddTest_TESTER STREQUAL "numdiff")
+ set(SELECTED_DIFF_TOOL_PATH ${NUMDIFF_TOOL_PATH})
set(TESTER_ARGS "--statistics --absolute-tolerance=1e-5 --relative-tolerance=1e-4")
endif()
@@ -111,7 +113,7 @@ function (AddTest)
get_filename_component(FILE_NAME ${FILE} NAME_WE)
get_filename_component(FILE_EXT ${FILE} EXT)
set(FILE_EXPECTED ${FILE_NAME}_expected${FILE_EXT})
- set(TESTER_COMMAND ${TESTER_COMMAND} "${NUMDIFF_TOOL_PATH} ${TESTER_ARGS} DATA{${AddTest_SOURCE_PATH}/${FILE_EXPECTED}} ${AddTest_BINARY_PATH}/${FILE}")
+ set(TESTER_COMMAND ${TESTER_COMMAND} "${SELECTED_DIFF_TOOL_PATH} ${TESTER_ARGS} DATA{${AddTest_SOURCE_PATH}/${FILE_EXPECTED}} ${AddTest_BINARY_PATH}/${FILE}")
if(AddTest_DIFF_DATA_PARSED)
set(AddTest_DIFF_DATA_PARSED "${AddTest_DIFF_DATA_PARSED},${FILE_EXPECTED}")
else()
--
GitLab