Skip to content
Snippets Groups Projects
Commit b4f7dc51 authored by Dmitri Naumov's avatar Dmitri Naumov Committed by Lars Bilke
Browse files

Remove unused numdiff dependency.

parent 91b13f50
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,6 @@ mark_as_advanced( ...@@ -23,7 +23,6 @@ mark_as_advanced(
METIS_LIBRARY METIS_LIBRARY
MPIRUN_TOOL_PATH MPIRUN_TOOL_PATH
NUM_PROCESSORS NUM_PROCESSORS
NUMDIFF_TOOL_PATH
ParaView_DIR ParaView_DIR
ProcessorCount_cmd_sysctl ProcessorCount_cmd_sysctl
REALPATH_TOOL_PATH REALPATH_TOOL_PATH
......
...@@ -24,10 +24,6 @@ ...@@ -24,10 +24,6 @@
# - DIFF_DATA <list of files to diff> # - DIFF_DATA <list of files to diff>
# # the given file is compared to a file with the same name from Tests/Data # # the given file is compared to a file with the same name from Tests/Data
# #
# numdiff-tester
# - DIFF_DATA <list of files to numdiff>
# # the given file is compared to a file with the same name from Tests/Data
#
# vtkdiff-tester # vtkdiff-tester
# - DIFF_DATA <vtk file> <data array a name> <data array b name> # - DIFF_DATA <vtk file> <data array a name> <data array b name>
# # the given data arrays in the vtk file are compared # # the given data arrays in the vtk file are compared
...@@ -106,9 +102,6 @@ function (AddTest) ...@@ -106,9 +102,6 @@ function (AddTest)
if(AddTest_TESTER STREQUAL "diff" AND NOT DIFF_TOOL_PATH) if(AddTest_TESTER STREQUAL "diff" AND NOT DIFF_TOOL_PATH)
return() return()
endif() endif()
if(AddTest_TESTER STREQUAL "numdiff" AND NOT NUMDIFF_TOOL_PATH)
return()
endif()
if(AddTest_TESTER STREQUAL "vtkdiff" AND NOT TARGET vtkdiff) if(AddTest_TESTER STREQUAL "vtkdiff" AND NOT TARGET vtkdiff)
return() return()
endif() endif()
...@@ -116,22 +109,19 @@ function (AddTest) ...@@ -116,22 +109,19 @@ function (AddTest)
return() return()
endif() endif()
if((AddTest_TESTER STREQUAL "diff" OR AddTest_TESTER STREQUAL "numdiff" OR AddTest_TESTER STREQUAL "vtkdiff") AND NOT AddTest_DIFF_DATA) if((AddTest_TESTER STREQUAL "diff" OR AddTest_TESTER STREQUAL "vtkdiff") AND NOT AddTest_DIFF_DATA)
message(FATAL_ERROR "AddTest(): ${AddTest_NAME} - no DIFF_DATA given!") message(FATAL_ERROR "AddTest(): ${AddTest_NAME} - no DIFF_DATA given!")
endif() endif()
if(AddTest_TESTER STREQUAL "diff") if(AddTest_TESTER STREQUAL "diff")
set(SELECTED_DIFF_TOOL_PATH ${DIFF_TOOL_PATH}) set(SELECTED_DIFF_TOOL_PATH ${DIFF_TOOL_PATH})
set(TESTER_ARGS "-sbB") set(TESTER_ARGS "-sbB")
elseif(AddTest_TESTER STREQUAL "numdiff")
set(SELECTED_DIFF_TOOL_PATH ${NUMDIFF_TOOL_PATH})
set(TESTER_ARGS "--statistics --absolute-tolerance=${AddTest_ABSTOL} --relative-tolerance=${AddTest_RELTOL}")
elseif(AddTest_TESTER STREQUAL "vtkdiff") elseif(AddTest_TESTER STREQUAL "vtkdiff")
set(SELECTED_DIFF_TOOL_PATH $<TARGET_FILE:vtkdiff>) set(SELECTED_DIFF_TOOL_PATH $<TARGET_FILE:vtkdiff>)
set(TESTER_ARGS "--abs ${AddTest_ABSTOL} --rel ${AddTest_RELTOL}") set(TESTER_ARGS "--abs ${AddTest_ABSTOL} --rel ${AddTest_RELTOL}")
endif() endif()
if(AddTest_TESTER STREQUAL "diff" OR AddTest_TESTER STREQUAL "numdiff") if(AddTest_TESTER STREQUAL "diff")
foreach(FILE ${AddTest_DIFF_DATA}) foreach(FILE ${AddTest_DIFF_DATA})
get_filename_component(FILE_EXPECTED ${FILE} NAME) get_filename_component(FILE_EXPECTED ${FILE} NAME)
list(APPEND TESTER_COMMAND "${SELECTED_DIFF_TOOL_PATH} \ list(APPEND TESTER_COMMAND "${SELECTED_DIFF_TOOL_PATH} \
......
# Find tools and data # Find tools and data
find_program(DIFF_TOOL_PATH diff) find_program(DIFF_TOOL_PATH diff)
find_program(NUMDIFF_TOOL_PATH numdiff)
find_program(TIME_TOOL_PATH time) find_program(TIME_TOOL_PATH time)
find_program(GREP_TOOL_PATH grep) find_program(GREP_TOOL_PATH grep)
find_program(BASH_TOOL_PATH bash) find_program(BASH_TOOL_PATH bash)
...@@ -22,9 +21,6 @@ endif() ...@@ -22,9 +21,6 @@ endif()
if(NOT DIFF_TOOL_PATH) if(NOT DIFF_TOOL_PATH)
message(STATUS "diff-command is required for diff tester but was not found! All corresponding tests are disabled.") message(STATUS "diff-command is required for diff tester but was not found! All corresponding tests are disabled.")
endif() endif()
if(NOT NUMDIFF_TOOL_PATH)
message(STATUS "numdiff-command is required for numdiff tester but was not found! All corresponding tests are disabled.")
endif()
if(NOT GREP_TOOL_PATH) if(NOT GREP_TOOL_PATH)
message(STATUS "grep-command is required for memcheck tester but was not found! All corresponding tests are disabled.") message(STATUS "grep-command is required for memcheck tester but was not found! All corresponding tests are disabled.")
endif() endif()
......
...@@ -11,6 +11,5 @@ module load eigen/3.2.9-1-cmake ...@@ -11,6 +11,5 @@ module load eigen/3.2.9-1-cmake
module load vtk/7.1.0_openmpi-1.8.4-1 module load vtk/7.1.0_openmpi-1.8.4-1
# Tools # Tools
module load numdiff/5.8.1-1
module load coreutils/8.21-1 module load coreutils/8.21-1
module load ccache/3.3.3 module load ccache/3.3.3
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment