diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2018-09-24 22:52:56 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2018-09-24 22:52:56 (GMT) |
| commit | 8a4695ed590809754794864d0473d15f8c1c69e3 (patch) | |
| tree | dabb3f92c983faad52a0e41eb22d2a005be18c48 /tools/test/h5dump | |
| parent | 2874af2cacda72baf34bbbb523ac191cbb3ef3d2 (diff) | |
| parent | 2618dc314b9e4875e6ece7ee8696846ac2d02183 (diff) | |
| download | hdf5-8a4695ed590809754794864d0473d15f8c1c69e3.zip hdf5-8a4695ed590809754794864d0473d15f8c1c69e3.tar.gz hdf5-8a4695ed590809754794864d0473d15f8c1c69e3.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '2618dc314b9e4875e6ece7ee8696846ac2d02183':
Remove extra unneeded
Remove libsettings from pregenerated block
CMake changes for SKIPPED and flush tests
Correct $withval usage in configure
HDFFV-10332 Adjust checks and generation of files
HDFFV-10332 Use pre-generated files
Diffstat (limited to 'tools/test/h5dump')
| -rw-r--r-- | tools/test/h5dump/CMakeTests.cmake | 3 | ||||
| -rw-r--r-- | tools/test/h5dump/CMakeTestsXML.cmake | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake index 24588e9..eedb432 100644 --- a/tools/test/h5dump/CMakeTests.cmake +++ b/tools/test/h5dump/CMakeTests.cmake @@ -441,9 +441,10 @@ if ("${testtype}" STREQUAL "SKIP") if (NOT HDF5_ENABLE_USING_MEMCHECKER) add_test ( - NAME H5DUMP-${skipresultfile}-SKIPPED + NAME H5DUMP-${skipresultfile} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${skipresultfile} ${ARGN}" ) + set_property(TEST H5DUMP-${skipresultfile} PROPERTY DISABLED) endif () else () ADD_H5_TEST (${skipresultfile} ${skipresultcode} ${ARGN}) diff --git a/tools/test/h5dump/CMakeTestsXML.cmake b/tools/test/h5dump/CMakeTestsXML.cmake index 9c68e5f..de87d2f 100644 --- a/tools/test/h5dump/CMakeTestsXML.cmake +++ b/tools/test/h5dump/CMakeTestsXML.cmake @@ -164,9 +164,10 @@ if ("${testtype}" STREQUAL "SKIP") if (NOT HDF5_ENABLE_USING_MEMCHECKER) add_test ( - NAME H5DUMP_XML-${skipresultfile}-SKIPPED + NAME H5DUMP_XML-${skipresultfile} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${skipresultfile}.xml --xml ${ARGN}" ) + set_property(TEST H5DUMP_XML-${skipresultfile} PROPERTY DISABLED) endif () else () ADD_XML_H5_TEST (${skipresultfile} ${skipresultcode} ${ARGN}) |