Commit a6393ad6 authored by Brad King's avatar Brad King
Browse files

Do not reference VTK_(SOURCE|BINARY)_DIR from module tests

The module Testing directories may not refer to VTK_SOURCE_DIR or
VTK_BINARY_DIR directly since they need to build under the
Testing/External project outside of VTK.  Since commit 13e19ed9 (Define
VTK_TEST_OUTPUT_DIR to name Testing/Temporary directory, 2012-04-10) all
module Testing directories must use VTK_TEST_OUTPUT_DIR to reference
Testing/Temporary.  Reference the CompareFileMD5.cmake script using a
relative path within the VTK source tree.

Change-Id: Ia84e16ff246c5b6b0a05ae1e7e0467a0197e241a
parent 01bac397
......@@ -55,16 +55,16 @@ if(CMAKE_HAS_FILE_MD5_SUBCOMMAND AND GL2PSTests AND VTK_DATA_ROOT)
get_filename_component(TName ${test} NAME_WE)
add_test(NAME ${vtk-module}Cxx-${TName}-CheckMD5sum
COMMAND ${CMAKE_COMMAND}
-DTESTFILE=${VTK_BINARY_DIR}/Testing/Temporary/${TName}.ps
-DTESTFILE=${VTK_TEST_OUTPUT_DIR}/${TName}.ps
-DGLOBEXP=${VTK_DATA_ROOT}/Baseline/Hybrid/${TName}*.ps
-DCLEANTESTFILE=1
-P ${VTK_SOURCE_DIR}/CMake/CompareFileMD5.cmake
-P ${CMAKE_CURRENT_SOURCE_DIR}/../../../../CMake/CompareFileMD5.cmake
)
set_tests_properties("${vtk-module}Cxx-${TName}-CheckMD5sum"
PROPERTIES
DEPENDS "${vtk-module}Cxx-${TName}"
REQUIRED_FILES
"${VTK_DATA_ROOT}/Baseline/Hybrid/${TName}.ps;${VTK_BINARY_DIR}/Testing/Temporary/${TName}.ps"
"${VTK_DATA_ROOT}/Baseline/Hybrid/${TName}.ps;${VTK_TEST_OUTPUT_DIR}/${TName}.ps"
FAIL_REGULAR_EXPRESSION "MATCH_FAIL"
)
endforeach()
......
......@@ -7,7 +7,7 @@ if(VTK_DATA_ROOT)
COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS}
$<TARGET_FILE:ParallelIsoTest>
-D ${VTK_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-T ${VTK_TEST_OUTPUT_DIR}
-V Baseline/Parallel/ParallelIso.cxx.png
${VTK_MPI_POSTFLAGS})
endif()
......
......@@ -57,16 +57,16 @@ if(CMAKE_HAS_FILE_MD5_SUBCOMMAND AND GL2PSTests AND VTK_DATA_ROOT)
get_filename_component(TName ${test} NAME_WE)
add_test(NAME ${vtk-module}Cxx-${TName}-CheckMD5sum
COMMAND ${CMAKE_COMMAND}
-DTESTFILE=${VTK_BINARY_DIR}/Testing/Temporary/${TName}.ps
-DTESTFILE=${VTK_TEST_OUTPUT_DIR}/${TName}.ps
-DGLOBEXP=${VTK_DATA_ROOT}/Baseline/Rendering/${TName}*.ps
-DCLEANTESTFILE=1
-P ${VTK_SOURCE_DIR}/CMake/CompareFileMD5.cmake
-P ${CMAKE_CURRENT_SOURCE_DIR}/../../../../CMake/CompareFileMD5.cmake
)
set_tests_properties("${vtk-module}Cxx-${TName}-CheckMD5sum"
PROPERTIES
DEPENDS "${vtk-module}Cxx-${TName}"
REQUIRED_FILES
"${VTK_DATA_ROOT}/Baseline/Rendering/${TName}.ps;${VTK_BINARY_DIR}/Testing/Temporary/${TName}.ps"
"${VTK_DATA_ROOT}/Baseline/Rendering/${TName}.ps;${VTK_TEST_OUTPUT_DIR}/${TName}.ps"
FAIL_REGULAR_EXPRESSION "MATCH_FAIL"
)
endforeach()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment