summaryrefslogtreecommitdiffstats
path: root/tools/test/h5dump
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/h5dump
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/h5dump')
-rw-r--r--tools/test/h5dump/CMakeTests.cmake36
-rw-r--r--tools/test/h5dump/CMakeTestsPBITS.cmake2
-rw-r--r--tools/test/h5dump/CMakeTestsVDS.cmake6
-rw-r--r--tools/test/h5dump/CMakeTestsXML.cmake4
-rw-r--r--tools/test/h5dump/CMakeVFDTests.cmake2
5 files changed, 25 insertions, 25 deletions
diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index 323e5dc..d7f39e1 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@@ -441,7 +441,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 H5DUMP-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump> ${ARGN})
else ()
add_test (
@@ -467,7 +467,7 @@
macro (ADD_SKIP_H5_TEST skipresultfile skipresultcode testtype)
if ("${testtype}" STREQUAL "SKIP")
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5DUMP-${skipresultfile}
COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${skipresultfile} ${ARGN}"
@@ -481,7 +481,7 @@
macro (ADD_H5_TEST resultfile resultcode)
# If using memchecker add tests without using scripts
- if (HDF5_ENABLE_USING_MEMCHECKER)
+ if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump> ${ARGN})
if (${resultcode})
set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true")
@@ -521,7 +521,7 @@
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
)
# If using memchecker add tests without using scripts
- if (HDF5_ENABLE_USING_MEMCHECKER)
+ if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5DUMP-N-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump> ${ARGN})
if (${resultcode})
set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES WILL_FAIL "true")
@@ -570,7 +570,7 @@
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
)
# If using memchecker add tests without using scripts
- if (HDF5_ENABLE_USING_MEMCHECKER)
+ if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump> ${ARGN} ${resultfile}.txt ${targetfile})
if (${resultcode})
set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true")
@@ -615,7 +615,7 @@
COMMAND ${CMAKE_COMMAND} -E remove
${resultfile}.txt
)
- if (HDF5_ENABLE_USING_MEMCHECKER)
+ if (HDF5_USING_ANALYSIS_TOOL)
set_tests_properties (H5DUMP-${resultfile}-clean-objects PROPERTIES
DEPENDS H5DUMP-${resultfile}
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
@@ -639,7 +639,7 @@
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
)
# If using memchecker add tests without using scripts
- if (HDF5_ENABLE_USING_MEMCHECKER)
+ if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump> --ddl=${ddlfile}.txt ${ARGN} ${resultfile}.txt ${targetfile})
if (${resultcode})
set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true")
@@ -694,7 +694,7 @@
${ddlfile}.txt
${resultfile}.txt
)
- if (HDF5_ENABLE_USING_MEMCHECKER)
+ if (HDF5_USING_ANALYSIS_TOOL)
set_tests_properties (H5DUMP-${resultfile}-clean-objects PROPERTIES
DEPENDS H5DUMP-${resultfile}
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
@@ -708,7 +708,7 @@
endmacro ()
macro (ADD_H5_EXPORT_TEST resultfile targetfile resultcode)
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5DUMP-output-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove
@@ -752,7 +752,7 @@
endmacro ()
macro (ADD_H5_MASK_TEST resultfile resultcode)
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5DUMP-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@@ -776,7 +776,7 @@
endmacro ()
macro (ADD_H5_GREP_TEST resultfile resultcode result_check)
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5DUMP-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@@ -799,7 +799,7 @@
endmacro ()
macro (ADD_H5ERR_MASK_TEST resultfile resultcode result_errcheck)
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5DUMP-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@@ -823,7 +823,7 @@
endmacro ()
macro (ADD_H5ERR_MASK_ENV_TEST resultfile resultcode result_errcheck envvar envval)
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5DUMP-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@@ -849,7 +849,7 @@
endmacro ()
macro (ADD_H5_BIN_EXPORT conffile resultcode testfile)
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5DUMP-BIN_EXPORT-${conffile}-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove
@@ -890,7 +890,7 @@
macro (ADD_H5_TEST_IMPORT conffile resultfile testfile resultcode)
# If using memchecker add tests without using scripts
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5DUMP-IMPORT-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove
@@ -949,7 +949,7 @@
endmacro ()
macro (ADD_H5_UD_TEST testname resultcode resultfile)
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5DUMP_UD-${testname}-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@@ -1315,14 +1315,14 @@
# NATIVE default. the NATIVE test can be validated with h5import/h5diff
# ADD_H5_TEST_IMPORT (tbin1 out1D tbinary.h5 0 --enable-error-stack -d integer -b)
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
ADD_H5_BIN_EXPORT (tbin2 0 tbinary.h5 --enable-error-stack -b BE -d float)
endif ()
# the NATIVE test can be validated with h5import/h5diff
# ADD_H5_TEST_IMPORT (tbin3 out3D tbinary.h5 0 --enable-error-stack -d integer -b NATIVE)
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
ADD_H5_BIN_EXPORT (tbin4 0 tbinary.h5 --enable-error-stack -d double -b FILE)
endif ()
diff --git a/tools/test/h5dump/CMakeTestsPBITS.cmake b/tools/test/h5dump/CMakeTestsPBITS.cmake
index 8f479f3..4ae6884 100644
--- a/tools/test/h5dump/CMakeTestsPBITS.cmake
+++ b/tools/test/h5dump/CMakeTestsPBITS.cmake
@@ -117,7 +117,7 @@
macro (ADD_H5_PBITS_TEST resultfile resultcode)
# If using memchecker add tests without using scripts
- if (HDF5_ENABLE_USING_MEMCHECKER)
+ if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump> ${ARGN})
if (${resultcode})
set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true")
diff --git a/tools/test/h5dump/CMakeTestsVDS.cmake b/tools/test/h5dump/CMakeTestsVDS.cmake
index e3cb9e3..d1dc541 100644
--- a/tools/test/h5dump/CMakeTestsVDS.cmake
+++ b/tools/test/h5dump/CMakeTestsVDS.cmake
@@ -108,7 +108,7 @@
macro (ADD_H5_VDS_TEST resultfile resultcode)
# If using memchecker add tests without using scripts
- if (HDF5_ENABLE_USING_MEMCHECKER)
+ if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump> ${ARGN})
if (${resultcode})
set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true")
@@ -137,7 +137,7 @@
macro (ADD_H5_VDS_PREFIX_TEST resultfile resultcode)
# If using memchecker add tests without using scripts
- if (HDF5_ENABLE_USING_MEMCHECKER)
+ if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5DUMP_PREFIX-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump> ${ARGN})
set_tests_properties (H5DUMP_PREFIX-${resultfile} PROPERTIES
ENVIRONMENT "HDF5_VDS_PREFIX=${PROJECT_BINARY_DIR}/testfiles/vds/"
@@ -172,7 +172,7 @@
macro (ADD_H5_VDS_LAYOUT resultfile resultcode)
# If using memchecker add tests without using scripts
- if (HDF5_ENABLE_USING_MEMCHECKER)
+ if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump> -p ${ARGN})
set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
if (${resultcode})
diff --git a/tools/test/h5dump/CMakeTestsXML.cmake b/tools/test/h5dump/CMakeTestsXML.cmake
index 43e77ee..b322d76 100644
--- a/tools/test/h5dump/CMakeTestsXML.cmake
+++ b/tools/test/h5dump/CMakeTestsXML.cmake
@@ -167,7 +167,7 @@
macro (ADD_XML_SKIP_H5_TEST skipresultfile skipresultcode testtype)
if ("${testtype}" STREQUAL "SKIP")
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5DUMP_XML-${skipresultfile}
COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${skipresultfile}.xml --xml ${ARGN}"
@@ -180,7 +180,7 @@
endmacro ()
macro (ADD_XML_H5_TEST resultfile resultcode)
- if (HDF5_ENABLE_USING_MEMCHECKER)
+ if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5DUMP_XML-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump> --xml ${ARGN})
if (${resultcode})
set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES WILL_FAIL "true")
diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake
index 6f89d4c..aabcb6d 100644
--- a/tools/test/h5dump/CMakeVFDTests.cmake
+++ b/tools/test/h5dump/CMakeVFDTests.cmake
@@ -77,7 +77,7 @@ add_custom_target(HDF5_SF2_VFD_H5DUMP_files ALL COMMENT "Copying files needed by
##############################################################################
macro (ADD_VFD_H5DUMP_TEST vfdname resultfile resultcode)
- if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+ if (NOT HDF5_USING_ANALYSIS_TOOL)
add_test (
NAME H5DUMP_VFD-${vfdname}-${resultfile}-h5dump
COMMAND "${CMAKE_COMMAND}"