Skip to content

Commit

Permalink
Rename incorrectly named option (HDFGroup#4067)
Browse files Browse the repository at this point in the history
* Rename incorrectly named option

* Restore the correct uses of USING_MEMCHECKER

* Update release note
  • Loading branch information
byrnHDF authored Mar 5, 2024
1 parent 42c7e1d commit 0be8925
Show file tree
Hide file tree
Showing 37 changed files with 144 additions and 134 deletions.
4 changes: 2 additions & 2 deletions c++/examples/CMakeTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ set_tests_properties (CPP_ex-clean-objects PROPERTIES
)

foreach (example ${examples})
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME CPP_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cpp_ex_${example}>)
else ()
add_test (NAME CPP_ex_${example} COMMAND "${CMAKE_COMMAND}"
Expand Down Expand Up @@ -95,7 +95,7 @@ set_tests_properties (CPP_ex_tutr-clean-objects PROPERTIES
)

foreach (example ${tutr_examples})
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME CPP_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cpp_ex_${example}>)
else ()
add_test (NAME CPP_ex_${example} COMMAND "${CMAKE_COMMAND}"
Expand Down
2 changes: 1 addition & 1 deletion c++/test/CMakeTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ add_custom_target(cpp_testhdf5_files ALL COMMENT "Copying files needed by cpp_te
### T E S T I N G ###
##############################################################################
##############################################################################
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME CPP_testhdf5 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cpp_testhdf5>)
else ()
add_test (NAME CPP_testhdf5 COMMAND "${CMAKE_COMMAND}"
Expand Down
2 changes: 1 addition & 1 deletion c++/test/CMakeVFDTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ H5_CREATE_VFD_DIR()
##############################################################################
##############################################################################
macro (ADD_VFD_TEST vfdname resultcode)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME CPP_VFD-${vfdname}-cpp_testhdf5
COMMAND "${CMAKE_COMMAND}"
Expand Down
2 changes: 1 addition & 1 deletion config/cmake/mccacheinit.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ set (HDF5_ENABLE_SZIP_ENCODING OFF CACHE BOOL "Use SZip Encoding" FORCE)

set (MPIEXEC_MAX_NUMPROCS "4" CACHE STRING "Minimum number of processes for HDF parallel tests" FORCE)

set (HDF5_ENABLE_USING_MEMCHECKER ON CACHE BOOL "Indicate that a memory checker is used" FORCE)
set (HDF5_USING_ANALYSIS_TOOL ON CACHE BOOL "Indicate that an analysis checker is used" FORCE)

set (HDF5_NO_PACKAGES ON CACHE BOOL "CPACK - Disable packaging" FORCE)

Expand Down
2 changes: 1 addition & 1 deletion examples/CMakeTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ if (HDF5_TEST_SERIAL)
)

foreach (example ${examples})
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME EXAMPLES-${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:${example}>)
else ()
add_test (NAME EXAMPLES-${example} COMMAND "${CMAKE_COMMAND}"
Expand Down
4 changes: 2 additions & 2 deletions fortran/examples/CMakeTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ if (HDF5_TEST_SERIAL)
)

foreach (example ${examples})
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME f90_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:f90_ex_${example}>)
else ()
add_test (NAME f90_ex_${example} COMMAND "${CMAKE_COMMAND}"
Expand All @@ -77,7 +77,7 @@ if (HDF5_TEST_SERIAL)
endforeach ()

foreach (example ${F2003_examples})
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME f03_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:f03_ex_${example}>)
else ()
add_test (NAME f03_ex_${example} COMMAND "${CMAKE_COMMAND}"
Expand Down
8 changes: 4 additions & 4 deletions fortran/test/CMakeTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ set_tests_properties (FORTRAN_testhdf5-clean-objects PROPERTIES
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)

if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME FORTRAN_testhdf5_fortran COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:testhdf5_fortran>)
else ()
add_test (NAME FORTRAN_testhdf5_fortran COMMAND "${CMAKE_COMMAND}"
Expand All @@ -99,7 +99,7 @@ if ("FORTRAN_testhdf5_fortran" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
endif ()

#-- Adding test for testhdf5_fortran_1_8
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME FORTRAN_testhdf5_fortran_1_8 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:testhdf5_fortran_1_8>)
else ()
add_test (NAME FORTRAN_testhdf5_fortran_1_8 COMMAND "${CMAKE_COMMAND}"
Expand All @@ -126,7 +126,7 @@ if ("FORTRAN_testhdf5_fortran_1_8" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
endif ()

#-- Adding test for fortranlib_test_F03
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME FORTRAN_fortranlib_test_F03 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:fortranlib_test_F03>)
else ()
add_test (NAME FORTRAN_fortranlib_test_F03 COMMAND "${CMAKE_COMMAND}"
Expand All @@ -153,7 +153,7 @@ if ("FORTRAN_fortranlib_test_F03" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
endif ()

#-- Adding test for vol_connector
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME FORTRAN_vol_connector COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:vol_connector>)
else ()
add_test (NAME FORTRAN_vol_connector COMMAND "${CMAKE_COMMAND}"
Expand Down
2 changes: 1 addition & 1 deletion hl/c++/examples/CMakeTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ set_tests_properties (HL_CPP_ex_ptExampleFL-clear-objects PROPERTIES
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)

if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME HL_CPP_ex_ptExampleFL COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:ptExampleFL>)
else ()
add_test (NAME HL_CPP_ex_ptExampleFL COMMAND "${CMAKE_COMMAND}"
Expand Down
2 changes: 1 addition & 1 deletion hl/c++/test/CMakeTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ set_tests_properties (HL_CPP_ptableTest-clear-objects PROPERTIES
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)

if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME HL_CPP_ptableTest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_ptableTest>)
else ()
add_test (NAME HL_CPP_ptableTest COMMAND "${CMAKE_COMMAND}"
Expand Down
2 changes: 1 addition & 1 deletion hl/examples/CMakeTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ set_tests_properties (HL_ex-clean-objects PROPERTIES
)

foreach (example ${examples})
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME HL_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_ex_${example}>)
else ()
add_test (NAME HL_ex_${example} COMMAND "${CMAKE_COMMAND}"
Expand Down
2 changes: 1 addition & 1 deletion hl/fortran/examples/CMakeTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ set_tests_properties (HL_FORTRAN_f90_ex-clean-objects PROPERTIES
)

foreach (example ${examples})
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME HL_FORTRAN_f90_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_f90_ex_${example}>)
else ()
add_test (NAME HL_FORTRAN_f90_ex_${example} COMMAND "${CMAKE_COMMAND}"
Expand Down
2 changes: 1 addition & 1 deletion hl/fortran/test/CMakeTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ set_tests_properties (HL_FORTRAN_test-clean-objects PROPERTIES
)

macro (ADD_H5_FORTRAN_TEST file)
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME HL_FORTRAN_f90_${file} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_f90_${file}>)
else ()
add_test (NAME HL_FORTRAN_f90_${file} COMMAND "${CMAKE_COMMAND}"
Expand Down
2 changes: 1 addition & 1 deletion hl/test/CMakeTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ set_tests_properties (HL_test-clean-objects PROPERTIES
# Macro used to add a unit test
# --------------------------------------------------------------------
macro (HL_ADD_TEST hl_name)
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME HL_${hl_name} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_${hl_name}>)
else ()
add_test (NAME HL_${hl_name} COMMAND "${CMAKE_COMMAND}"
Expand Down
6 changes: 3 additions & 3 deletions hl/tools/h5watch/CMakeTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes
##############################################################################

macro (ADD_H5_TEST resultfile resultcode)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5WATCH_ARGS-h5watch-${resultfile}
COMMAND "${CMAKE_COMMAND}"
Expand All @@ -94,7 +94,7 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes
endmacro ()

macro (ADD_H5_ERR_TEST resultfile resultcode)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5WATCH_ARGS-h5watch-${resultfile}
COMMAND "${CMAKE_COMMAND}"
Expand All @@ -121,7 +121,7 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes
endmacro ()

macro (ADD_H5_WATCH resultfile resultcode)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5WATCH-${resultfile}
COMMAND "${CMAKE_COMMAND}"
Expand Down
2 changes: 1 addition & 1 deletion release_docs/INSTALL_CMake.txt
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@ if (BUILD_TESTING)
HDF5_TEST_FHEAP_VFD "Execute fheap test with different VFDs" ON
TEST_SHELL_SCRIPTS "Enable shell script tests" ON
HDF5_DISABLE_TESTS_REGEX "Regex pattern to set execution of specific tests to DISABLED" ""

HDF5_USING_ANALYSIS_TOOL "Indicate that an analysis checker is used" ON
---------------- External Library Options ---------------------
HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building (NO GIT TGZ)" "NO"
HDF5_ENABLE_PLUGIN_SUPPORT "Enable PLUGIN Filters" OFF
Expand Down
10 changes: 10 additions & 0 deletions release_docs/RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,16 @@ New Features

Configuration:
-------------
- Renamed HDF5_ENABLE_USING_MEMCHECKER to HDF5_USING_ANALYSIS_TOOL

The HDF5_USING_ANALYSIS_TOOL is used to indicate to test macros that
an analysis tool is being used and that the tests should not use
the runTest.cmake macros and it's variations. The analysis tools,
like valgrind, test the macro code instead of the program under test.

HDF5_ENABLE_USING_MEMCHECKER is still used for controlling the HDF5
define, H5_USING_MEMCHECKER.

- New option for building and naming tools in CMake

The following option has been added:
Expand Down
14 changes: 7 additions & 7 deletions test/CMakeTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ set (H5TEST_SEPARATE_TESTS
)
foreach (h5_test ${H5_TESTS})
if (NOT h5_test IN_LIST H5TEST_SEPARATE_TESTS)
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5TEST-${h5_test} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:${h5_test}>)
set_tests_properties (H5TEST-${h5_test} PROPERTIES
FIXTURES_REQUIRED clear_H5TEST
Expand Down Expand Up @@ -403,7 +403,7 @@ if (NOT CYGWIN)
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-cache-clean-objects PROPERTIES FIXTURES_CLEANUP clear_cache)
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5TEST-cache COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cache>)
else ()
add_test (NAME H5TEST-cache COMMAND "${CMAKE_COMMAND}"
Expand Down Expand Up @@ -477,7 +477,7 @@ add_test (
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-external_env-clean-objects PROPERTIES FIXTURES_CLEANUP clear_external_env)
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5TEST-external_env COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:external_env>)
else ()
add_test (NAME H5TEST-external_env COMMAND "${CMAKE_COMMAND}"
Expand Down Expand Up @@ -512,7 +512,7 @@ add_test (
${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-vds_env-clean-objects PROPERTIES FIXTURES_CLEANUP clear_vds_env)
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5TEST-vds_env COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:vds_env>)
else ()
add_test (NAME H5TEST-vds_env COMMAND "${CMAKE_COMMAND}"
Expand Down Expand Up @@ -559,7 +559,7 @@ add_test (NAME H5TEST-flush-clean-objects
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-flush-clean-objects PROPERTIES FIXTURES_CLEANUP clear_flush)
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5TEST-flush1 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:flush1>)
else ()
add_test (NAME H5TEST-flush1 COMMAND "${CMAKE_COMMAND}"
Expand All @@ -581,7 +581,7 @@ set_tests_properties (H5TEST-flush1 PROPERTIES
if ("H5TEST-flush1" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
set_tests_properties (H5TEST-flush1 PROPERTIES DISABLED true)
endif ()
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5TEST-flush2 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:flush2>)
else ()
add_test (NAME H5TEST-flush2 COMMAND "${CMAKE_COMMAND}"
Expand Down Expand Up @@ -815,7 +815,7 @@ add_test (NAME H5TEST-links_env-clean-objects
${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-links_env-clean-objects PROPERTIES FIXTURES_CLEANUP clear_links_env)
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5TEST-links_env COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:links_env>)
else ()
add_test (NAME H5TEST-links_env COMMAND "${CMAKE_COMMAND}"
Expand Down
2 changes: 1 addition & 1 deletion testpar/CMakeVFDTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ set (H5P_VFD_subfiling_TESTS_SKIP
)

macro (ADD_VFD_TEST vfdname resultcode)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
if (NOT HDF5_USING_ANALYSIS_TOOL)
foreach (h5_test ${H5P_VFD_TESTS})
if (NOT "${h5_test}" IN_LIST H5P_VFD_${vfdname}_TESTS_SKIP)
add_test (
Expand Down
12 changes: 6 additions & 6 deletions tools/test/h5copy/CMakeTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
endmacro ()

macro (ADD_SKIP_H5_TEST testname skipresultfile)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5COPY-${testname}-${skipresultfile}
COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${testname}-${skipresultfile} ${ARGN}"
Expand Down Expand Up @@ -260,7 +260,7 @@
COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}.out.h5
)
# If using memchecker add tests without using scripts
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5COPY-CMP-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN})
if ("${resultcode}" STREQUAL "1")
set_tests_properties (H5COPY-CMP-${testname} PROPERTIES WILL_FAIL "true")
Expand Down Expand Up @@ -293,7 +293,7 @@
endmacro ()

macro (ADD_H5_UD_TEST testname resultcode infile sparam srcname dparam dstname cmpfile)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
if (NOT HDF5_USING_ANALYSIS_TOOL)
# Remove any output file left over from previous test run
add_test (
NAME H5COPY_UD-${testname}-clear-objects
Expand Down Expand Up @@ -367,7 +367,7 @@
endmacro ()

macro (ADD_H5_UD_ERR_TEST testname resultcode infile sparam srcname dparam dstname cmpfile)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
if (NOT HDF5_USING_ANALYSIS_TOOL)
# Remove any output file left over from previous test run
add_test (
NAME H5COPY_UD_ERR-${testname}-clear-objects
Expand Down Expand Up @@ -444,12 +444,12 @@

macro (ADD_SIMPLE_TEST resultfile resultcode)
# If using memchecker add tests without using scripts
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5COPY-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy> ${ARGN})
if (${resultcode})
set_tests_properties (H5COPY-${resultfile} PROPERTIES WILL_FAIL "true")
endif ()
else (HDF5_ENABLE_USING_MEMCHECKER)
else (HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5COPY-${resultfile}
COMMAND "${CMAKE_COMMAND}"
Expand Down
6 changes: 3 additions & 3 deletions tools/test/h5diff/CMakeTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@

macro (ADD_SH5_TEST resultfile resultcode)
# If using memchecker add tests without using scripts
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5DIFF-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff> ${ARGN})
if (${resultcode})
set_tests_properties (H5DIFF-${resultfile} PROPERTIES WILL_FAIL "true")
Expand Down Expand Up @@ -444,7 +444,7 @@

macro (ADD_PH5_TEST resultfile resultcode)
# If using memchecker add tests without using scripts
if (HDF5_ENABLE_USING_MEMCHECKER)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME MPI_TEST_H5DIFF-${resultfile} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:ph5diff> ${MPIEXEC_POSTFLAGS} ${ARGN})
set_tests_properties (MPI_TEST_H5DIFF-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/PAR/testfiles")
if (${resultcode})
Expand Down Expand Up @@ -478,7 +478,7 @@
endmacro ()

macro (ADD_H5_UD_TEST testname resultcode resultfile)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
if (NOT HDF5_USING_ANALYSIS_TOOL)
if ("${resultcode}" STREQUAL "2")
add_test (
NAME H5DIFF_UD-${testname}
Expand Down
Loading

0 comments on commit 0be8925

Please sign in to comment.