summaryrefslogtreecommitdiffstats
path: root/tools/test/h5repack
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2024-03-13 12:35:04 (GMT)
committerGitHub <noreply@github.com>2024-03-13 12:35:04 (GMT)
commit5b7be284bc3a29f3d1b50857f7908f487210212d (patch)
tree612eef5ed54de717b50c5495df10471d01ca67f7 /tools/test/h5repack
parent7741170bdd225da130f3ab98c454c118b5511b14 (diff)
downloadhdf5-5b7be284bc3a29f3d1b50857f7908f487210212d.zip
hdf5-5b7be284bc3a29f3d1b50857f7908f487210212d.tar.gz
hdf5-5b7be284bc3a29f3d1b50857f7908f487210212d.tar.bz2
Sync develop branch changes March 4 - 6 to hdf5_1_14 branch (#4121)
* Do not enable szip for sanitizer runs (#4057) * Add note to H5Tset_fields about needing to set datatype precision first (#4059) * Offset of a floating-point type also needs to be accounted for * Clarify ordering of H5Tset_precision and H5Tset_fields * Fix issue where H5Tset_fields does not account for datatype offsets (#4061) H5Tset_fields did not account for any offset in a floating-point datatype, causing it to fail when a datatype's precision is correctly set such that it doesn't include the offset bits. * Ignore UserPresets and Use only C compiler for sanitizers (#4066) * Remove user presets file * Only use C compiler for sanitzers * Rename incorrectly named option (#4067) * Rename incorrectly named option * Restore the correct uses of USING_MEMCHECKER * Update release note * Fix a memory leak in the cmpd_dset test (#4071) This was due to not freeing a test buffer. It was not a core library memory leak. * Fix uninitialized bytes in cmpd_dset test (#4072) Compound fill values were set to the integer -1, causing valgrind to flag 'uninitialized bytes' errors. This is just a problem with the cmpd_dset test and not a core library problem. * Update INSTALL files (#4052) * Add NEWSLETTER and merge abi reports and add sha256sums (#4055) * Fix uninitialized bytes in selection I/O test (#4073) This was due to a complex type fill value being set to -1 instead of a proper complex value. This was a test problem and not a core library issue. * fix path for S3 build path in CI (#4076) * Correct paths for 1.14 and add lines missing from release_docs/INSTALL_CMake.txt. --------- Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com> Co-authored-by: jhendersonHDF <jhenderson@hdfgroup.org> Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Diffstat (limited to 'tools/test/h5repack')
-rw-r--r--tools/test/h5repack/CMakeTests.cmake44
-rw-r--r--tools/test/h5repack/CMakeVFDTests.cmake2
2 files changed, 23 insertions, 23 deletions
diff --git a/tools/test/h5repack/CMakeTests.cmake b/tools/test/h5repack/CMakeTests.cmake
index 83c1e73..b4a92e7 100644
--- a/tools/test/h5repack/CMakeTests.cmake
+++ b/tools/test/h5repack/CMakeTests.cmake
@@ -248,7 +248,7 @@
macro (ADD_HELP_TEST testname resultcode)
# If using memchecker add tests without using scripts
- if (HDF5_ENABLE_USING_MEMCHECKER)
+ if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5REPACK-h5repack-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack> ${ARGN})
else ()
add_test (
@@ -273,7 +273,7 @@
endmacro ()
macro (ADD_H5_TEST_OLD testname testtype testfile)
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
if ("${testtype}" STREQUAL "SKIP")
add_test (
NAME H5REPACK_OLD-${testname}
@@ -318,7 +318,7 @@
macro (ADD_H5_TEST testname testtype testfile)
if ("${testtype}" STREQUAL "SKIP")
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK-${testname}
COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}"
@@ -362,7 +362,7 @@
macro (ADD_H5_FILTER_TEST testname testfilter testtype resultcode resultfile)
if ("${testtype}" STREQUAL "SKIP")
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK_CMP-${testname}
COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}"
@@ -375,7 +375,7 @@
COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile}
)
# If using memchecker add tests without using scripts
- if (HDF5_ENABLE_USING_MEMCHECKER)
+ if (HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK_CMP-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}
@@ -416,7 +416,7 @@
macro (ADD_H5_MASK_TEST testname testtype resultcode result_errcheck resultfile)
if ("${testtype}" STREQUAL "SKIP")
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK_MASK-${testname}
COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}"
@@ -429,12 +429,12 @@
COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile}
)
# If using memchecker add tests without using scripts
- if (HDF5_ENABLE_USING_MEMCHECKER)
+ if (HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK_MASK-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}
)
- else (HDF5_ENABLE_USING_MEMCHECKER)
+ else (HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK_MASK-${testname}
COMMAND "${CMAKE_COMMAND}"
@@ -468,7 +468,7 @@
macro (ADD_H5_DMP_TEST testname testtype resultcode resultfile)
if ("${testtype}" STREQUAL "SKIP")
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK_DMP-${testname}
COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}"
@@ -490,7 +490,7 @@
if ("H5REPACK_DMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
set_tests_properties (H5REPACK_DMP-${testname} PROPERTIES DISABLED true)
endif ()
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK_DMP-h5dump-${testname}
COMMAND "${CMAKE_COMMAND}"
@@ -530,7 +530,7 @@
macro (ADD_H5_DMP_NO_OPT_TEST testname testtype resultcode resultfile)
if ("${testtype}" STREQUAL "SKIP")
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK_DMP-${testname}
COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}"
@@ -555,7 +555,7 @@
if ("H5REPACK_DMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
set_tests_properties (H5REPACK_DMP-${testname} PROPERTIES DISABLED true)
endif ()
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK_DMP-h5dump-${testname}
COMMAND "${CMAKE_COMMAND}"
@@ -580,7 +580,7 @@
macro (ADD_H5_DIFF_TEST testname testtype resultcode testfile)
if ("${testtype}" STREQUAL "SKIP")
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK_DIFF-${testname}
COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}"
@@ -632,7 +632,7 @@
macro (ADD_H5_STAT_TEST testname testtype resultcode statarg resultfile)
if ("${testtype}" STREQUAL "SKIP")
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK_STAT-${testname}
COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${statarg}.${resultfile}"
@@ -654,7 +654,7 @@
if ("H5REPACK_STAT-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
set_tests_properties (H5REPACK_STAT-${testname} PROPERTIES DISABLED true)
endif ()
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK_STAT-h5stat-${testname}
COMMAND "${CMAKE_COMMAND}"
@@ -694,7 +694,7 @@
macro (ADD_H5_VERIFY_TEST testname testtype resultcode testfile testdset testfilter)
if ("${testtype}" STREQUAL "SKIP")
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK_VERIFY_LAYOUT-${testname}
COMMAND ${CMAKE_COMMAND} -E echo "SKIP -d ${testdset} -pH ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}"
@@ -702,7 +702,7 @@
set_property(TEST H5REPACK_VERIFY_LAYOUT-${testname} PROPERTY DISABLED true)
endif ()
else ()
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK_VERIFY_LAYOUT-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile}
@@ -787,7 +787,7 @@
macro (ADD_H5_VERIFY_VDS testname testtype resultcode testfile testdset testfilter)
if ("${testtype}" STREQUAL "SKIP")
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname}
COMMAND ${CMAKE_COMMAND} -E echo "SKIP -d ${testdset} -pH ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}"
@@ -795,7 +795,7 @@
set_property(TEST H5REPACK_VERIFY_LAYOUT_VDS-${testname} PROPERTY DISABLED true)
endif ()
else ()
- 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 H5REPACK_VERIFY_LAYOUT_VDS-${testname}-clear-objects
@@ -844,7 +844,7 @@
# VERIFY_SUPERBLOCK
macro (ADD_H5_VERIFY_SUPERBLOCK testname testfile lowbound highbound superblock)
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK_VERIFY_SUPERBLOCK-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile}
@@ -1003,7 +1003,7 @@
endmacro ()
macro (ADD_H5_UD_TEST testname resultcode resultfile)
- 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 H5REPACK_UD-${testname}-clear-objects
@@ -1063,7 +1063,7 @@
endmacro ()
macro (ADD_H5_EXTERNAL_TEST testname testtype testfile)
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
# canonical file = h5repack_${testfile}.h5 - preexist
# external file = h5repack_${testfile}_ex.h5 - preexist
# repacked file = h5repack_${testfile}_rp.h5 - created
diff --git a/tools/test/h5repack/CMakeVFDTests.cmake b/tools/test/h5repack/CMakeVFDTests.cmake
index e992029..3e2ef60 100644
--- a/tools/test/h5repack/CMakeVFDTests.cmake
+++ b/tools/test/h5repack/CMakeVFDTests.cmake
@@ -60,7 +60,7 @@ set (H5REPACK_CLEANFILES
h5repack_paged_persist.h5
)
macro (ADD_VFD_TEST vfdname resultcode)
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5REPACK-${vfdname}-h5repacktest-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove ${H5REPACK_CLEANFILES}