diff options
author | jhendersonHDF <jhenderson@hdfgroup.org> | 2023-12-07 18:13:21 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-07 18:13:21 (GMT) |
commit | fb84c696a476c39db2c35e7d86b818138e089358 (patch) | |
tree | 56c0fec578e2e0d2eaee455cf3ae133dca541989 /tools | |
parent | dc8b455ac00e899b53127de0d270230f4d4e40a1 (diff) | |
download | hdf5-fb84c696a476c39db2c35e7d86b818138e089358.zip hdf5-fb84c696a476c39db2c35e7d86b818138e089358.tar.gz hdf5-fb84c696a476c39db2c35e7d86b818138e089358.tar.bz2 |
Sync 1.14 branch with develop (#3887)
* Preserve MPI-I/O file hints when fapl is closed (#3755)
* Fix for issue #3025: Save the MPI info in the file struct so H5Fget_access_plist() can retrieve it from there.
* Add compression tests for subfiling (#3769)
* Fix typo in comment (#3775)
* Fixed a file handle leak in the core VFD (#3779)
When opening a file with the core VFD and a file image, if the file
already exists, the file check would leak the POSIX file handle.
Fixes GitHub issue #635
* Fix a format string warning in the C++ examples (#3776)
* Cancel running GitHub workflows on push to same PR (#3772)
* Cancel running GitHub workflows on push to same PR
* Remove github.sha from workflow concurrency groups
* Print some messages in parallel tests on MPI rank 0 only (#3785)
Avoids overly verbose output from all processes emitting progress, etc. info.
* Avoid attempted use of NULL pointer in parallel compression code (#3786)
The parallel compression test code tests for the case where all MPI ranks have no selection in a dataset when writing to it. Add an early exit to the code to avoid attempting to use a NULL pointer due to there being no work to do.
* Don't install h5tools_test_utils test program on system (#3793)
* Add Doxygen to H5FDsplitter.h (#3794)
* H5FD_CURR_SPLITTER_VFD_CONFIG_VERSION
* H5FD_SPLITTER_PATH_MAX
* H5FD_SPLITTER_MAGIC
* H5FD_splitter_vfd_config_t
* H5Pset_fapl_splitter()
* H5Pget_fapl_splitter()
* Update Doxygen initializers & identifiers in VFDs (#3795)
* Add Doxygen for all H5FD_<VFD> initializers
* Add Doxygen for all H5FD_<VFD>_VALUE values
* Mark H5FD_<vfd>_init() calls private in Doxygen
* Fix memory corruption in 'MPI I/O FAPL preserve' test (#3806)
* Fix usage of h5_clean_files in t_pflush2.c (#3807)
* Fix parallel driver check in h5_fixname_real (#3808)
* Fix a couple usages of MPI_Info_get (#3809)
* Remove H5system.c warning on Windows oneAPI. (#3812)
* Add processing of NVHPC flags in linux-gnulibc1 file (#3804)
* Disable testing as tests are failing the same as in CMake
* Use the current toolchain for examples as default (#3810)
* Fix misc. warnings from GCC when compiling with -fsanitize=undefined (#3787)
* Set NVHPC maximum optimization level to -O1 for now (#3800)
* Set NVHPC maximum optimization level to -O1 for now
Compiling HDF5 with NVHPC 23.5 - 23.9 results in test failures in
4 different test files that need to be resolved. Since those tests
pass with an optimization level of -O1 (and -O0) and it is currently
unclear whether the test failures are due to issues in HDF5 or issues
in the 'nvc' compiler, set the maximum optimization level for NVHPC
to -O1 until the test failures are resolved.
* Disable nvhpc Java testing in CMake and amend known issues
* Re-enable testing of Autotools nvhpc
* Update some doxygen links to local refs (#3814)
* Rework MPI Info FAPL preserve PR to use VFD 'ctl' operations (#3782)
* Removed the use of C wrappers from H5P APIs. (#3824)
* fix seg fault on frontier/cray
* fix seg fault on frontier/cray
* fix seg fault on frontier/cray
* removed the use of h5pclose_c
* removed the use of h5pclose_c
* Fortran Wrappers H5VLnative_addr_to_token_f and H5VLnative_token_to_address_f (#3801)
* Added H5VLnative_addr_to_token_f and H5VLnative_token_to_address_f
* Added H5VLnative_addr_to_token_f and H5VLnative_token_to_address_f tests
* Create test for H5Pget_dxpl_mpio (#3825)
* Create test and add to testphdf5
* Renamed h5fuse.sh to h5fuse (#3834)
* provide an alternative to mapfile for older bash
* Disable FP exceptions in H5T init code (#3837)
The H5T floating-point datatype initialization code can raise exceptions when handling signaling NaNs. This change disables FE_INVALID exceptions during initialization.
Also removes the -ieee=full change for NAG Fortran as that shouldn't be necessary anymore.
Fixes #3831
* Add intel oneapi windows build to CI CMake (#3836)
* Remove printf format warning on Windows oneAPI. (#3838)
* Correct ENV variables (#3841)
* Remove Autotools sed hack (#3848)
configure.ac contains a sed line that cleans up incorrect library
flags which was added to paper over some bugs in earlier versions
of the Autotools. These issues are not a problem with the current
versions of the Autootols.
The sed line causes problems on MacOS, so it has been removed.
Fixes #3843
* Make filter unregister callbacks safe for VOL connectors (#3629)
* Make filter callbacks use top-level API functions
When using VOL connectors, H5I_iterate may not provide
valid object pointers to its callback. This change keeps
existing functionality in H5Zunregister() without using
potentially unsafe pointers.
* Filter callbacks use internal API
* Skip MPI work on non-native VOL
* Add extra space in comments for consistency (#3852)
* Add extra space in comments for consistency
* uncomment tfloatsattrs test
* Update Actions badges to link to relevant workflow (#3850)
* Add CMake long double cross-compile defaults (#3683)
HDF5 performs a couple of checks at build time to see if long double
values can be converted correctly (IBM's Power architecture uses a
special format for long doubles). These checks were performed using
TRY_RUN, which is a problem when cross-compiling.
These checks now use default values appropriate for most non-Power
systems when cross-compiling. The cache values can be pre-set if
necessary, which will preempt both the TRY_RUN and the default.
Affected values:
H5_LDOUBLE_TO_LONG_SPECIAL (default no)
H5_LONG_TO_LDOUBLE_SPECIAL (default no)
H5_LDOUBLE_TO_LLONG_ACCURATE (default yes)
H5_LLONG_TO_LDOUBLE_CORRECT (default yes)
H5_DISABLE_SOME_LDOUBLE_CONV (default no)
Fixes GitHub #3585
* Updates for building and testing VOL connectors
* Fix issue with HDF5_VOL_ALLOW_EXTERNAL CMake variable
* Initialize parallel testing with MPI_THREAD_MULTIPLE when testing API
* Add CMake variable to allow specifying a VOL connector's package name
* Remove call to MPI_Init in serial API tests
While previously necessary, it now interferes with VOL connectors that
may need to be initialized with MPI_THREAD_MULTIPLE
* Fixes for CI and presets (#3853)
* Change dest for doxygen (#3856)
* Implement selection vector I/O with collective chunk filling (#3826)
* Changes for ECP-344: Implement selection vector I/O with collective chunk filling.
Also fix a bug in H5FD__mpio_write_vector() to account for fixed size optimization
when computing max address.
* Fixes based on PR review comments:
For H5Dchunk.c: fix H5MM_xfree()
For H5FDmpio.c:
1) Revert the fix to H5FD__mpio_write_vector()
2) Apply the patch from Neil on the proper length of s_sizes reported by H5FD__mpio_vector_build_types()
* Put back the logic of dividing up the work among all the mpi ranks similar to the
original H5D__chunk_collective_fill() routine.
* Add a test to verify the fix for the illegal reference problem in H5FD__mpio_write_vector().
* Do not publish compression headers or docs (#3865)
* Fix typo: look -> loop (#3866)
* Moved the README to markdown and expanded its overview of the files, file generation, and other Fortran wrapper development practices as mentioned in the HDF5 architectural document. I added a new figure and included the SVG file and the original xfig file it was generated from. (#3862)
* Add HDF5_DISABLE_TESTS_REGEX option to skip tests (#3859)
* Fix typo in error message for `MPI_Type_dup`. (#3867)
* Complete the `if command line option` sentence. (#3868)
* Fix h5dump segmentation fault when --vfd-value option is used (#3873)
* Updated URL in funding.yml (#3882)
Using new shortened URL, might look better.
* Remove unused variable from unmerged changes
* Update src/H5Tinit_float.c
Diffstat (limited to 'tools')
23 files changed, 525 insertions, 64 deletions
diff --git a/tools/libtest/CMakeTests.cmake b/tools/libtest/CMakeTests.cmake index 79810c4..b8d63d3 100644 --- a/tools/libtest/CMakeTests.cmake +++ b/tools/libtest/CMakeTests.cmake @@ -28,6 +28,9 @@ if (NOT "${resultcode}" STREQUAL "0") set_tests_properties (H5LIBTEST-${resultfile} PROPERTIES WILL_FAIL "true") endif () + if ("H5LIBTEST-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5LIBTEST-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () ############################################################################## diff --git a/tools/libtest/Makefile.am b/tools/libtest/Makefile.am index 45b3f47..8a503d0 100644 --- a/tools/libtest/Makefile.am +++ b/tools/libtest/Makefile.am @@ -27,7 +27,7 @@ LDADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5) # main target -bin_PROGRAMS=h5tools_test_utils +noinst_PROGRAMS=h5tools_test_utils # check_PROGRAMS=$(TEST_PROG) diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index a1a6de0..8f2c406 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -1089,7 +1089,7 @@ parse_start: * for subsetting: "--start", "--stride", "--count", and "--block" * which can come in any order. If we run out of parameters (EOF) * or run into one which isn't a subsetting parameter (NOT s, S, - * c, or K), then we exit the do-while look, set the subset_info + * c, or K), then we exit the do-while loop, set the subset_info * to the structure we've been filling. If we've reached the end * of the options, we exit the parsing (goto parse_end) otherwise, * since we've "read" the next option, we need to parse it. So we @@ -1234,7 +1234,7 @@ end_collect: } /* If the file uses the onion VFD, get the revision number */ - if (vfd_info_g.u.name && !strcmp(vfd_info_g.u.name, "onion")) { + if (vfd_info_g.type == VFD_BY_NAME && vfd_info_g.u.name && !strcmp(vfd_info_g.u.name, "onion")) { if (vfd_info_g.info) { if (!strcmp(vfd_info_g.info, "revision_count")) @@ -1357,7 +1357,7 @@ main(int argc, char *argv[]) goto done; } - /* enable error reporting if command line option */ + /* Enable error reporting if --enable-error-stack command line option is specified */ h5tools_error_report(); /* Initialize indexing options */ diff --git a/tools/src/misc/h5repart.c b/tools/src/misc/h5repart.c index feb447f..12b2932 100644 --- a/tools/src/misc/h5repart.c +++ b/tools/src/misc/h5repart.c @@ -227,6 +227,10 @@ main(int argc, char *argv[]) if (argno >= argc) usage(prog_name); src_gen_name = argv[argno++]; + if (!src_gen_name) { + fprintf(stderr, "invalid source file name pointer"); + exit(EXIT_FAILURE); + } snprintf(src_name, NAMELEN, src_gen_name, src_membno); src_is_family = strcmp(src_name, src_gen_name); @@ -249,6 +253,10 @@ main(int argc, char *argv[]) if (argno >= argc) usage(prog_name); dst_gen_name = argv[argno++]; + if (!dst_gen_name) { + fprintf(stderr, "invalid destination file name pointer"); + exit(EXIT_FAILURE); + } snprintf(dst_name, NAMELEN, dst_gen_name, dst_membno); dst_is_family = strcmp(dst_name, dst_gen_name); diff --git a/tools/test/h5copy/CMakeTests.cmake b/tools/test/h5copy/CMakeTests.cmake index e443827..fb02d81 100644 --- a/tools/test/h5copy/CMakeTests.cmake +++ b/tools/test/h5copy/CMakeTests.cmake @@ -71,6 +71,9 @@ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_file_ext}> -f ${fparam} -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN} ) set_tests_properties (H5COPY_F-${testname} PROPERTIES DEPENDS H5COPY_F-${testname}-clear-objects) + if ("H5COPY_F-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_F-${testname} PROPERTIES DISABLED true) + endif () # resultcode=2 will cause the test to skip the diff test if (NOT "${resultcode}" STREQUAL "2") @@ -82,6 +85,9 @@ if ("${resultcode}" STREQUAL "1") set_tests_properties (H5COPY_F-${testname}-DIFF PROPERTIES WILL_FAIL "true") endif () + if ("H5COPY_F-${testname}-DIFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_F-${testname}-DIFF PROPERTIES DISABLED true) + endif () endif () add_test ( NAME H5COPY_F-${testname}-clean-objects @@ -106,6 +112,9 @@ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_file_ext}> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN} ) set_tests_properties (H5COPY-${testname} PROPERTIES DEPENDS H5COPY-${testname}-clear-objects) + if ("H5COPY-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY-${testname} PROPERTIES DISABLED true) + endif () # resultcode=2 will cause the test to skip the diff test if (NOT "${resultcode}" STREQUAL "2") @@ -117,6 +126,9 @@ if ("${resultcode}" STREQUAL "1") set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES WILL_FAIL "true") endif () + if ("H5COPY-${testname}-DIFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES DISABLED true) + endif () endif () add_test ( NAME H5COPY-${testname}-clean-objects @@ -135,7 +147,7 @@ NAME H5COPY-${testname}-${skipresultfile} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${testname}-${skipresultfile} ${ARGN}" ) - set_property(TEST H5COPY-${testname}-${skipresultfile} PROPERTY DISABLED) + set_property(TEST H5COPY-${testname}-${skipresultfile} PROPERTY DISABLED true) endif () endmacro () @@ -151,12 +163,18 @@ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_file_ext}> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 -v -s ${psparam} -d ${pdparam} ) set_tests_properties (H5COPY-${testname}-prefill PROPERTIES DEPENDS H5COPY-${testname}-clear-objects) + if ("" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties ( PROPERTIES DISABLED true) + endif () add_test ( NAME H5COPY-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_file_ext}> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN} ) set_tests_properties (H5COPY-${testname} PROPERTIES DEPENDS H5COPY-${testname}-prefill) + if ("H5COPY-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY-${testname} PROPERTIES DISABLED true) + endif () # resultcode=2 will cause the test to skip the diff test if (NOT "${resultcode}" STREQUAL "2") add_test ( @@ -167,6 +185,9 @@ if ("${resultcode}" STREQUAL "1") set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES WILL_FAIL "true") endif () + if ("H5COPY-${testname}-DIFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES DISABLED true) + endif () endif () add_test ( NAME H5COPY-${testname}-clean-objects @@ -191,12 +212,18 @@ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_file_ext}> -i ./testfiles/${pfile} -o ./testfiles/${testname}.out.h5 -v -s ${psparam} -d ${pdparam} ) set_tests_properties (H5COPY_SAME-${testname}-prefill PROPERTIES DEPENDS H5COPY_SAME-${testname}-clear-objects) + if ("H5COPY_SAME-${testname}-prefill" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_SAME-${testname}-prefill PROPERTIES DISABLED true) + endif () add_test ( NAME H5COPY_SAME-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_file_ext}> -i ./testfiles/${testname}.out.h5 -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN} ) set_tests_properties (H5COPY_SAME-${testname} PROPERTIES DEPENDS H5COPY_SAME-${testname}-prefill) + if ("H5COPY_SAME-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_SAME-${testname} PROPERTIES DISABLED true) + endif () # resultcode=2 will cause the test to skip the diff test if (NOT "${resultcode}" STREQUAL "2") add_test ( @@ -207,6 +234,9 @@ if ("${resultcode}" STREQUAL "1") set_tests_properties (H5COPY_SAME-${testname}-DIFF PROPERTIES WILL_FAIL "true") endif () + if ("H5COPY_SAME-${testname}-DIFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_SAME-${testname}-DIFF PROPERTIES DISABLED true) + endif () endif () add_test ( NAME H5COPY_SAME-${testname}-clean-objects @@ -235,7 +265,6 @@ if ("${resultcode}" STREQUAL "1") set_tests_properties (H5COPY-CMP-${testname} PROPERTIES WILL_FAIL "true") endif () - set_tests_properties (H5COPY-CMP-${testname} PROPERTIES DEPENDS H5COPY-CMP-${testname}-clear-objects) else () add_test ( NAME H5COPY-CMP-${testname} @@ -251,7 +280,10 @@ -D "TEST_MASK=true" -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) - set_tests_properties (H5COPY-CMP-${testname} PROPERTIES DEPENDS H5COPY-CMP-${testname}-clear-objects) + endif () + set_tests_properties (H5COPY-CMP-${testname} PROPERTIES DEPENDS H5COPY-CMP-${testname}-clear-objects) + if ("H5COPY-CMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY-CMP-${testname} PROPERTIES DISABLED true) endif () add_test ( NAME H5COPY-CMP-${testname}-clean-objects @@ -303,6 +335,9 @@ ) endif () set_tests_properties (H5COPY_UD-${testname} PROPERTIES DEPENDS H5COPY_UD-${testname}-clear-objects) + if ("H5COPY_UD-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_UD-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5COPY_UD-${testname}-DIFF COMMAND "${CMAKE_COMMAND}" @@ -320,6 +355,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (H5COPY_UD-${testname}-DIFF PROPERTIES DEPENDS H5COPY_UD-${testname}) + if ("H5COPY_UD-${testname}-DIFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_UD-${testname}-DIFF PROPERTIES DISABLED true) + endif () add_test ( NAME H5COPY_UD-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testname}.out.h5 @@ -373,6 +411,9 @@ ) endif () set_tests_properties (H5COPY_UD_ERR-${testname} PROPERTIES DEPENDS H5COPY_UD_ERR-${testname}-clear-objects) + if ("H5COPY_UD_ERR-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_UD_ERR-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5COPY_UD_ERR-${testname}-DIFF COMMAND "${CMAKE_COMMAND}" @@ -390,6 +431,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (H5COPY_UD_ERR-${testname}-DIFF PROPERTIES DEPENDS H5COPY_UD_ERR-${testname}) + if ("H5COPY_UD_ERR-${testname}-DIFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_UD_ERR-${testname}-DIFF PROPERTIES DISABLED true) + endif () add_test ( NAME H5COPY_UD_ERR-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testname}_ERR.out.h5 @@ -422,6 +466,9 @@ set_tests_properties (H5COPY-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}" ) + if ("H5COPY-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () ############################################################################## diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake index d89df46..f993f4b 100644 --- a/tools/test/h5diff/CMakeTests.cmake +++ b/tools/test/h5diff/CMakeTests.cmake @@ -437,6 +437,9 @@ set_tests_properties (H5DIFF-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) + if ("H5DIFF-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DIFF-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_PH5_TEST resultfile resultcode) @@ -469,6 +472,9 @@ set_tests_properties (MPI_TEST_H5DIFF-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/PAR/testfiles" ) + if ("MPI_TEST_H5DIFF-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (MPI_TEST_H5DIFF-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_UD_TEST testname resultcode resultfile) @@ -508,6 +514,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () + if ("H5DIFF_UD-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DIFF_UD-${testname} PROPERTIES DISABLED true) + endif () endif () endmacro () diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake index 7ed021f..e997aa8 100644 --- a/tools/test/h5dump/CMakeTests.cmake +++ b/tools/test/h5dump/CMakeTests.cmake @@ -460,6 +460,9 @@ set_tests_properties (H5DUMP-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${testname} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_SKIP_H5_TEST skipresultfile skipresultcode testtype) @@ -469,7 +472,7 @@ NAME H5DUMP-${skipresultfile} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${skipresultfile} ${ARGN}" ) - set_property(TEST H5DUMP-${skipresultfile} PROPERTY DISABLED) + set_property(TEST H5DUMP-${skipresultfile} PROPERTY DISABLED true) endif () else () ADD_H5_TEST (${skipresultfile} ${skipresultcode} ${ARGN}) @@ -503,6 +506,9 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_TEST_N resultfile resultcode) @@ -521,7 +527,6 @@ set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES WILL_FAIL "true") endif () set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES - DEPENDS H5DUMP-N-${resultfile}-clear-objects WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) else () @@ -541,6 +546,9 @@ set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES DEPENDS H5DUMP-N-${resultfile}-clear-objects ) + if ("H5DUMP-N-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5DUMP-N-${resultfile}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove @@ -568,7 +576,6 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true") endif () set_tests_properties (H5DUMP-${resultfile} PROPERTIES - DEPENDS H5DUMP-${resultfile}-clear-objects WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) else () @@ -587,6 +594,9 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS H5DUMP-${resultfile}-clear-objects ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5DUMP-${resultfile}-output-cmp COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp @@ -596,6 +606,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES DEPENDS H5DUMP-${resultfile}) + if ("H5DUMP-${resultfile}-output-cmp" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES DISABLED true) + endif () endif () add_test ( NAME H5DUMP-${resultfile}-clean-objects @@ -652,6 +665,9 @@ DEPENDS H5DUMP-${resultfile}-clear-objects WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5DUMP-${resultfile}-output-cmp COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp @@ -668,6 +684,9 @@ DEPENDS H5DUMP-${resultfile}-output-cmp WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-${resultfile}-output-cmp-ddl" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile}-output-cmp-ddl PROPERTIES DISABLED true) + endif () endif () add_test ( NAME H5DUMP-${resultfile}-clean-objects @@ -706,6 +725,9 @@ DEPENDS H5DUMP-output-${resultfile}-clear-objects WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-output-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-output-${resultfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5DUMP-output-cmp-${resultfile} COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp @@ -714,6 +736,9 @@ DEPENDS H5DUMP-output-${resultfile} WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-output-cmp-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-output-cmp-${resultfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5DUMP-output-${resultfile}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove @@ -744,6 +769,9 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -764,6 +792,9 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -785,6 +816,9 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -808,6 +842,9 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -836,6 +873,9 @@ set_tests_properties (H5DUMP-BIN_EXPORT-${conffile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-BIN_EXPORT-${conffile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-BIN_EXPORT-${conffile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5DUMP-BIN_EXPORT-${conffile}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove @@ -876,16 +916,25 @@ DEPENDS H5DUMP-IMPORT-${resultfile}-clear-objects WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-IMPORT-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-IMPORT-${resultfile} PROPERTIES DISABLED true) + endif () add_test (NAME H5DUMP-IMPORT-h5import-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5import${tgt_file_ext}> ${resultfile}.bin -c ${conffile}.out -o ${resultfile}.h5) set_tests_properties (H5DUMP-IMPORT-h5import-${resultfile} PROPERTIES DEPENDS H5DUMP-IMPORT-${resultfile} WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-IMPORT-h5import-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-IMPORT-h5import-${resultfile} PROPERTIES DISABLED true) + endif () add_test (NAME H5DUMP-IMPORT-h5diff-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> ${testfile} ${resultfile}.h5 /integer /integer) set_tests_properties (H5DUMP-IMPORT-h5diff-${resultfile} PROPERTIES DEPENDS H5DUMP-IMPORT-h5import-${resultfile} WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-IMPORT-h5diff-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-IMPORT-h5diff-${resultfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5DUMP-IMPORT-${resultfile}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove @@ -919,6 +968,9 @@ set_tests_properties (H5DUMP_UD-${testname}-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP_UD-${testname}-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP_UD-${testname}-${resultfile} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -1027,7 +1079,7 @@ ADD_H5_TEST (tbitnopaque_le 0 --enable-error-stack tbitnopaque.h5) endif () - #test for the nested compound type + # test for the nested compound type ADD_H5_TEST (tnestcomp-1 0 --enable-error-stack tnestedcomp.h5) ADD_H5_TEST (tnestedcmpddt 0 --enable-error-stack tnestedcmpddt.h5) @@ -1056,7 +1108,7 @@ ADD_H5_TEST (tvldtypes4 0 --enable-error-stack tvldtypes4.h5) ADD_H5_TEST (tvldtypes5 0 --enable-error-stack tvldtypes5.h5) - #test for file with variable length string data + # test for file with variable length string data ADD_H5_TEST (tvlstr 0 --enable-error-stack tvlstr.h5) ADD_H5_TEST (tvlenstr_array 0 --enable-error-stack tvlenstr_array.h5) diff --git a/tools/test/h5dump/CMakeTestsPBITS.cmake b/tools/test/h5dump/CMakeTestsPBITS.cmake index 118b314..3104846 100644 --- a/tools/test/h5dump/CMakeTestsPBITS.cmake +++ b/tools/test/h5dump/CMakeTestsPBITS.cmake @@ -139,6 +139,9 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/pbits" ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () ############################################################################## diff --git a/tools/test/h5dump/CMakeTestsVDS.cmake b/tools/test/h5dump/CMakeTestsVDS.cmake index c910acd..1589e70 100644 --- a/tools/test/h5dump/CMakeTestsVDS.cmake +++ b/tools/test/h5dump/CMakeTestsVDS.cmake @@ -130,6 +130,9 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds" ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_VDS_PREFIX_TEST resultfile resultcode) @@ -162,6 +165,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () + if ("H5DUMP_PREFIX-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP_PREFIX-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_VDS_LAYOUT resultfile resultcode) @@ -189,6 +195,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () ############################################################################## diff --git a/tools/test/h5dump/CMakeTestsXML.cmake b/tools/test/h5dump/CMakeTestsXML.cmake index d78e738..ae7cd8f 100644 --- a/tools/test/h5dump/CMakeTestsXML.cmake +++ b/tools/test/h5dump/CMakeTestsXML.cmake @@ -172,7 +172,7 @@ NAME H5DUMP_XML-${skipresultfile} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${skipresultfile}.xml --xml ${ARGN}" ) - set_property(TEST H5DUMP_XML-${skipresultfile} PROPERTY DISABLED) + set_property(TEST H5DUMP_XML-${skipresultfile} PROPERTY DISABLED true) endif () else () ADD_XML_H5_TEST (${skipresultfile} ${skipresultcode} ${ARGN}) @@ -202,6 +202,9 @@ set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/xml" ) + if ("H5DUMP_XML-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () ############################################################################## diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake index b303032..0118725 100644 --- a/tools/test/h5dump/CMakeVFDTests.cmake +++ b/tools/test/h5dump/CMakeVFDTests.cmake @@ -55,6 +55,9 @@ macro (ADD_VFD_H5DUMP_TEST vfdname resultfile resultcode) -P "${HDF_RESOURCES_DIR}/vfdTest.cmake" ) set_tests_properties (H5DUMP_VFD-${vfdname}-${resultfile}-h5dump PROPERTIES TIMEOUT ${CTEST_SHORT_TIMEOUT}) + if ("H5DUMP_VFD-${vfdname}-${resultfile}-h5dump" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP_VFD-${vfdname}-${resultfile}-h5dump PROPERTIES DISABLED true) + endif () endif () endmacro () diff --git a/tools/test/h5format_convert/CMakeTests.cmake b/tools/test/h5format_convert/CMakeTests.cmake index ab14a8c..ecf16bf 100644 --- a/tools/test/h5format_convert/CMakeTests.cmake +++ b/tools/test/h5format_convert/CMakeTests.cmake @@ -105,46 +105,52 @@ COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}-tmp.h5 ) if (${testfile}) - add_test ( - NAME H5FC-${testname}-${testfile}-tmpfile - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/${testname}-tmp.h5 - ) - set_tests_properties (H5FC-${testname}-${testfile}-tmpfile PROPERTIES - DEPENDS H5FC-${testname}-${testfile}-clear-objects - ) - add_test ( - NAME H5FC-${testname}-${testfile} - COMMAND "${CMAKE_COMMAND}" - -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert${tgt_file_ext}>" - -D "TEST_ARGS=${ARGN};${testname}-tmp.h5" - -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles" - -D "TEST_OUTPUT=${testname}-${testfile}.out" - -D "TEST_EXPECT=${resultcode}" - -D "TEST_REFERENCE=${resultfile}" - -D "TEST_ERRREF=${resultfile}.err" - -P "${HDF_RESOURCES_DIR}/runTest.cmake" - ) - set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES - DEPENDS H5FC-${testname}-${testfile}-tmpfile - ) - set (last_test "H5FC-${testname}-${testfile}") + add_test ( + NAME H5FC-${testname}-${testfile}-tmpfile + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/${testname}-tmp.h5 + ) + set_tests_properties (H5FC-${testname}-${testfile}-tmpfile PROPERTIES + DEPENDS H5FC-${testname}-${testfile}-clear-objects + ) + add_test ( + NAME H5FC-${testname}-${testfile} + COMMAND "${CMAKE_COMMAND}" + -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" + -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert${tgt_file_ext}>" + -D "TEST_ARGS=${ARGN};${testname}-tmp.h5" + -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles" + -D "TEST_OUTPUT=${testname}-${testfile}.out" + -D "TEST_EXPECT=${resultcode}" + -D "TEST_REFERENCE=${resultfile}" + -D "TEST_ERRREF=${resultfile}.err" + -P "${HDF_RESOURCES_DIR}/runTest.cmake" + ) + set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES + DEPENDS H5FC-${testname}-${testfile}-tmpfile + ) + if ("H5FC-${testname}-${testfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES DISABLED true) + endif () + set (last_test "H5FC-${testname}-${testfile}") else () - add_test ( - NAME H5FC-${testname}-${testfile}-NA - COMMAND "${CMAKE_COMMAND}" - -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert${tgt_file_ext}>" - -D "TEST_ARGS=${ARGN}" - -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles" - -D "TEST_OUTPUT=${testname}-${testfile}.out" - -D "TEST_EXPECT=${resultcode}" - -D "TEST_REFERENCE=${resultfile}" - -P "${HDF_RESOURCES_DIR}/runTest.cmake" - ) - set_tests_properties (H5FC-${testname}-${testfile}-NA PROPERTIES - DEPENDS H5FC-${testname}-${testfile}-tmpfile - ) + add_test ( + NAME H5FC-${testname}-${testfile}-NA + COMMAND "${CMAKE_COMMAND}" + -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" + -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert${tgt_file_ext}>" + -D "TEST_ARGS=${ARGN}" + -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles" + -D "TEST_OUTPUT=${testname}-${testfile}.out" + -D "TEST_EXPECT=${resultcode}" + -D "TEST_REFERENCE=${resultfile}" + -P "${HDF_RESOURCES_DIR}/runTest.cmake" + ) + set_tests_properties (H5FC-${testname}-${testfile}-NA PROPERTIES + DEPENDS H5FC-${testname}-${testfile}-tmpfile + ) + if ("H5FC-${testname}-${testfile}-NA" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC-${testname}-${testfile}-NA PROPERTIES DISABLED true) + endif () endif () add_test ( NAME H5FC-${testname}-${testfile}-clean-objects @@ -185,6 +191,9 @@ set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES DEPENDS H5FC-${testname}-${testfile}-tmpfile ) + if ("H5FC-${testname}-${testfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5FC-${testname}-${testfile}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}-tmp.h5 @@ -225,6 +234,9 @@ set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES DEPENDS H5FC-${testname}-${testfile}-tmpfile ) + if ("H5FC-${testname}-${testfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5FC-${testname}-${testfile}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}-tmp.h5 @@ -278,6 +290,9 @@ DEPENDS "H5FC-${testname}-tmpfile" FIXTURES_REQUIRED clear_H5FC-${testname} ) + if ("H5FC-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC-${testname} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -292,6 +307,9 @@ DEPENDS "H5FC-${dependtest}" FIXTURES_REQUIRED clear_H5FC-${dependtest} ) + if ("H5FC_CHECK_IDX-${dependtest}-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC_CHECK_IDX-${dependtest}-${testname} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -325,6 +343,9 @@ set_tests_properties (H5FC_TEST_CHECK_IDX-${testname} PROPERTIES DEPENDS "H5FC_TEST_CHECK_IDX-${testname}-tmpfile" ) + if ("H5FC_TEST_CHECK_IDX-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC_TEST_CHECK_IDX-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5FC_TEST_CHECK_IDX-${testname}-check COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5fc_chk_idx> ./testfiles/${testname}-tmp.h5 ${ARGN} @@ -332,6 +353,9 @@ set_tests_properties (H5FC_TEST_CHECK_IDX-${testname}-check PROPERTIES DEPENDS "H5FC_TEST_CHECK_IDX-${testname}" ) + if ("H5FC_TEST_CHECK_IDX-${testname}-check" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC_TEST_CHECK_IDX-${testname}-check PROPERTIES DISABLED true) + endif () add_test ( NAME H5FC_TEST_CHECK_IDX-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove @@ -373,6 +397,9 @@ set_tests_properties (H5FC_H5DUMP_CHECK-${testname} PROPERTIES DEPENDS "H5FC_H5DUMP_CHECK-${testname}-tmpfile" ) + if ("H5FC_H5DUMP_CHECK-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC_H5DUMP_CHECK-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5FC_H5DUMP_CHECK-${testname}-dump COMMAND "${CMAKE_COMMAND}" @@ -388,6 +415,9 @@ set_tests_properties (H5FC_H5DUMP_CHECK-${testname}-dump PROPERTIES DEPENDS "H5FC_H5DUMP_CHECK-${testname}" ) + if ("H5FC_H5DUMP_CHECK-${testname}-dump" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC_H5DUMP_CHECK-${testname}-dump PROPERTIES DISABLED true) + endif () add_test ( NAME H5FC_H5DUMP_CHECK-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove diff --git a/tools/test/h5import/CMakeTests.cmake b/tools/test/h5import/CMakeTests.cmake index c3bbd79..71c0421 100644 --- a/tools/test/h5import/CMakeTests.cmake +++ b/tools/test/h5import/CMakeTests.cmake @@ -118,6 +118,9 @@ DEPENDS H5IMPORT-${testname}-clear-objects FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT-${testname} PROPERTIES DISABLED true) + endif () # If using memchecker skip macro based tests if (NOT HDF5_ENABLE_USING_MEMCHECKER) add_test ( @@ -138,6 +141,9 @@ DEPENDS H5IMPORT-${testname} FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT-${testname}-H5DMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT-${testname}-H5DMP PROPERTIES DISABLED true) + endif () add_test ( NAME H5IMPORT-${testname}-H5DMP_CMP COMMAND "${CMAKE_COMMAND}" @@ -155,6 +161,9 @@ DEPENDS H5IMPORT-${testname}-H5DMP FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT-${testname}-H5DMP_CMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT-${testname}-H5DMP_CMP PROPERTIES DISABLED true) + endif () endif () add_test ( @@ -217,6 +226,9 @@ DEPENDS "H5IMPORT-DUMP-${testname}-clear-objects" FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT-DUMP-${testname}-H5DMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT-DUMP-${testname}-H5DMP PROPERTIES DISABLED true) + endif () add_test ( NAME H5IMPORT-DUMP-${testname} @@ -234,6 +246,9 @@ DEPENDS "H5IMPORT-DUMP-${testname}-H5DMP" FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT-DUMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT-DUMP-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5IMPORT-DUMP-${testname}-H5DFF @@ -252,6 +267,9 @@ DEPENDS "H5IMPORT-DUMP-${testname}" FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT-DUMP-${testname}-H5DFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT-DUMP-${testname}-H5DFF PROPERTIES DISABLED true) + endif () endif () add_test ( @@ -298,6 +316,9 @@ DEPENDS "H5IMPORT_SUB-DUMP-${testname}-clear-objects" FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT_SUB-DUMP-${testname}-H5DMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-H5DMP PROPERTIES DISABLED true) + endif () add_test ( NAME H5IMPORT_SUB-DUMP-${testname}-H5IMP @@ -315,6 +336,9 @@ DEPENDS "H5IMPORT_SUB-DUMP-${testname}-H5DMP" FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT_SUB-DUMP-${testname}-H5IMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-H5IMP PROPERTIES DISABLED true) + endif () add_test ( NAME H5IMPORT_SUB-DUMP-${testname}-CMP COMMAND "${CMAKE_COMMAND}" @@ -331,6 +355,9 @@ DEPENDS "H5IMPORT_SUB-DUMP-${testname}-H5IMP" FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT_SUB-DUMP-${testname}-CMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-CMP PROPERTIES DISABLED true) + endif () endif () add_test ( @@ -352,7 +379,7 @@ NAME H5IMPORT-DUMP-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${testname} ${datasetname} ${testfile} --- DEFLATE filter not available" ) - set_property(TEST H5IMPORT-DUMP-${testname} PROPERTY DISABLED) + set_property(TEST H5IMPORT-DUMP-${testname} PROPERTY DISABLED true) endif () endmacro () diff --git a/tools/test/h5jam/CMakeTests.cmake b/tools/test/h5jam/CMakeTests.cmake index eb6070e..d87899a 100644 --- a/tools/test/h5jam/CMakeTests.cmake +++ b/tools/test/h5jam/CMakeTests.cmake @@ -74,6 +74,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () + if ("H5JAM-${expectfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${expectfile} PROPERTIES DISABLED true) + endif () endmacro () # ============================================================ @@ -101,6 +104,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () + if ("H5JAM-UNJAM-${expectfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-UNJAM-${expectfile} PROPERTIES DISABLED true) + endif () endmacro () macro (CHECKFILE testname testdepends expected actual) @@ -119,6 +125,9 @@ -D "TEST_SKIP_COMPARE=TRUE" -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) + if ("H5JAM-${testname}-CHECKFILE-H5DMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP PROPERTIES DISABLED true) + endif () set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP PROPERTIES DEPENDS ${testdepends}) add_test ( NAME H5JAM-${testname}-CHECKFILE-H5DMP_CMP @@ -133,6 +142,9 @@ -D "TEST_REFERENCE=${actual}.new" -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) + if ("H5JAM-${testname}-CHECKFILE-H5DMP_CMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP_CMP PROPERTIES DISABLED true) + endif () set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP_CMP PROPERTIES DEPENDS H5JAM-${testname}-CHECKFILE-H5DMP) endif () endmacro() @@ -184,6 +196,9 @@ set (compare_test "") endif () endif () + if ("H5JAM-${testname}-UNJAM" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}-UNJAM PROPERTIES DISABLED true) + endif () if (${compare_test}) add_test ( NAME H5JAM-${testname}-UNJAM-CHECK_UB_1-clear-objects @@ -208,6 +223,9 @@ -P "${HDF_RESOURCES_DIR}/userblockTest.cmake" ) set_tests_properties (H5JAM-${testname}-UNJAM-CHECK_UB_1 PROPERTIES DEPENDS H5JAM-${testname}-UNJAM-CHECK_UB_1-clear-objects) + if ("H5JAM-${testname}-UNJAM-CHECK_UB_1" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}-UNJAM-CHECK_UB_1 PROPERTIES DISABLED true) + endif () endif () add_test ( @@ -229,6 +247,9 @@ else () set_tests_properties (H5JAM-${testname}-UNJAM-CHECK_NOUB PROPERTIES DEPENDS H5JAM-${testname}-UNJAM) endif () + if ("H5JAM-${testname}-UNJAM-CHECK_NOUB" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}-UNJAM-CHECK_NOUB PROPERTIES DISABLED true) + endif () CHECKFILE (${testname} "H5JAM-${testname}-UNJAM-CHECK_NOUB" ${chkfile} ${outfile}) endif () @@ -242,6 +263,9 @@ ) endif () add_test (NAME H5JAM-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5jam${tgt_file_ext}> -u testfiles/${jamfile} -i testfiles/${infile} -o ${outfile} ${ARGN}) + if ("H5JAM-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname} PROPERTIES DISABLED true) + endif () if (NOT HDF5_ENABLE_USING_MEMCHECKER) set_tests_properties (H5JAM-${testname} PROPERTIES DEPENDS H5JAM-${testname}-clear-objects) set (compare_test ${outfile}) @@ -273,6 +297,9 @@ -P "${HDF_RESOURCES_DIR}/userblockTest.cmake" ) set_tests_properties (H5JAM-${testname}-CHECK_UB_1 PROPERTIES DEPENDS H5JAM-${testname}-CHECK_UB_1-clear-objects) + if ("H5JAM-${testname}-CHECK_UB_1" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}-CHECK_UB_1 PROPERTIES DISABLED true) + endif () CHECKFILE (${testname} "H5JAM-${testname}-CHECK_UB_1" ${chkfile} ${outfile}) endif () endmacro () @@ -295,9 +322,15 @@ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${chkfile} ${chkfile}.cpy.h5 ) set_tests_properties (H5JAM-${testname}_NONE_COPY PROPERTIES DEPENDS H5JAM-${testname}_NONE-SETUP) + if ("H5JAM-${testname}_NONE_COPY" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}_NONE_COPY PROPERTIES DISABLED true) + endif () add_test (NAME H5JAM-${testname}_NONE COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5jam${tgt_file_ext}> -u testfiles/${jamfile} -i ${chkfile} ${ARGN}) set_tests_properties (H5JAM-${testname}_NONE PROPERTIES DEPENDS H5JAM-${testname}_NONE_COPY) + if ("H5JAM-${testname}_NONE" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}_NONE PROPERTIES DISABLED true) + endif () set (compare_test ${chkfile}) set (compare_orig ${chkfile}.cpy.h5) @@ -328,6 +361,9 @@ -P "${HDF_RESOURCES_DIR}/userblockTest.cmake" ) set_tests_properties (H5JAM-${testname}_NONE-CHECK_UB_1 PROPERTIES DEPENDS H5JAM-${testname}_NONE-CHECK_UB_1-clear-objects) + if ("H5JAM-${testname}_NONE-CHECK_UB_1" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}_NONE-CHECK_UB_1 PROPERTIES DISABLED true) + endif () CHECKFILE (${testname} "H5JAM-${testname}_NONE-CHECK_UB_1" ${infile} ${chkfile}) endif () endmacro () diff --git a/tools/test/h5ls/CMakeTests.cmake b/tools/test/h5ls/CMakeTests.cmake index 14a7e5d..629f324 100644 --- a/tools/test/h5ls/CMakeTests.cmake +++ b/tools/test/h5ls/CMakeTests.cmake @@ -169,6 +169,9 @@ set_tests_properties (H5LS-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) + if ("H5LS-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5LS-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_ERR_TEST resultfile resultcode) @@ -197,6 +200,9 @@ set_tests_properties (H5LS-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) + if ("H5LS-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5LS-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_UD_TEST testname resultcode resultfile) @@ -219,6 +225,9 @@ set_tests_properties (H5LS_UD-${testname}-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) + if ("H5LS_UD-${testname}-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5LS_UD-${testname}-${resultfile} PROPERTIES DISABLED true) + endif () endif () endmacro () diff --git a/tools/test/h5ls/CMakeTestsVDS.cmake b/tools/test/h5ls/CMakeTestsVDS.cmake index 3718f64..9bf4042 100644 --- a/tools/test/h5ls/CMakeTestsVDS.cmake +++ b/tools/test/h5ls/CMakeTestsVDS.cmake @@ -103,6 +103,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () + if ("H5LS-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5LS-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_VDS_PREFIX_TEST resultfile resultcode) @@ -132,6 +135,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () + if ("H5LS_PREFIX-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5LS_PREFIX-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () ############################################################################## diff --git a/tools/test/h5repack/CMakeTests.cmake b/tools/test/h5repack/CMakeTests.cmake index 5c41254..3fb5d56 100644 --- a/tools/test/h5repack/CMakeTests.cmake +++ b/tools/test/h5repack/CMakeTests.cmake @@ -267,6 +267,9 @@ set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) + if ("H5REPACK-h5repack-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_TEST_OLD testname testtype testfile) @@ -276,7 +279,7 @@ NAME H5REPACK_OLD-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} -i ${PROJECT_BINARY_DIR}/testfiles/${testfile} -o ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}" ) - set_property(TEST H5REPACK_OLD-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_OLD-${testname} PROPERTY DISABLED true) else () add_test ( NAME H5REPACK_OLD-${testname}-clear-objects @@ -289,6 +292,9 @@ set_tests_properties (H5REPACK_OLD-${testname} PROPERTIES DEPENDS H5REPACK_OLD-${testname}-clear-objects ) + if ("H5REPACK_OLD-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_OLD-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_OLD-${testname}_DFF COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile} @@ -296,6 +302,9 @@ set_tests_properties (H5REPACK_OLD-${testname}_DFF PROPERTIES DEPENDS H5REPACK_OLD-${testname} ) + if ("H5REPACK_OLD-${testname}_DFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_OLD-${testname}_DFF PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_OLD-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile} @@ -314,7 +323,7 @@ NAME H5REPACK-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}" ) - set_property(TEST H5REPACK-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK-${testname} PROPERTY DISABLED true) endif () else () add_test ( @@ -328,6 +337,9 @@ set_tests_properties (H5REPACK-${testname} PROPERTIES DEPENDS H5REPACK-${testname}-clear-objects ) + if ("H5REPACK-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK-${testname}_DFF COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> --enable-error-stack ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile} @@ -335,6 +347,9 @@ set_tests_properties (H5REPACK-${testname}_DFF PROPERTIES DEPENDS H5REPACK-${testname} ) + if ("H5REPACK-${testname}_DFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK-${testname}_DFF PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile} @@ -352,7 +367,7 @@ NAME H5REPACK_CMP-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}" ) - set_property(TEST H5REPACK_CMP-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_CMP-${testname} PROPERTY DISABLED true) endif () else () add_test ( @@ -385,6 +400,9 @@ set_tests_properties (H5REPACK_CMP-${testname} PROPERTIES DEPENDS H5REPACK_CMP-${testname}-clear-objects ) + if ("H5REPACK_CMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_CMP-${testname} PROPERTIES DISABLED true) + endif () endif () add_test ( NAME H5REPACK_CMP-${testname}-clean-objects @@ -403,7 +421,7 @@ NAME H5REPACK_MASK-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}" ) - set_property(TEST H5REPACK_MASK-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_MASK-${testname} PROPERTY DISABLED true) endif () else () add_test ( @@ -435,6 +453,9 @@ set_tests_properties (H5REPACK_MASK-${testname} PROPERTIES DEPENDS H5REPACK_MASK-${testname}-clear-objects ) + if ("H5REPACK_MASK-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_MASK-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_MASK-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile} @@ -452,7 +473,7 @@ NAME H5REPACK_DMP-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}" ) - set_property(TEST H5REPACK_DMP-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_DMP-${testname} PROPERTY DISABLED true) endif () else () add_test ( @@ -466,6 +487,9 @@ set_tests_properties (H5REPACK_DMP-${testname} PROPERTIES DEPENDS H5REPACK_DMP-${testname}-clear-objects ) + 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) add_test ( NAME H5REPACK_DMP-h5dump-${testname} @@ -482,6 +506,9 @@ set_tests_properties (H5REPACK_DMP-h5dump-${testname} PROPERTIES DEPENDS H5REPACK_DMP-${testname} ) + if ("H5REPACK_DMP-h5dump-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_DMP-h5dump-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_DMP-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile} @@ -508,7 +535,7 @@ NAME H5REPACK_DMP-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}" ) - set_property(TEST H5REPACK_DMP-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_DMP-${testname} PROPERTY DISABLED true) endif () else () add_test ( @@ -525,6 +552,9 @@ set_tests_properties (H5REPACK_DMP-${testname} PROPERTIES DEPENDS H5REPACK_DMP-${testname}-clear-objects ) + 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) add_test ( NAME H5REPACK_DMP-h5dump-${testname} @@ -541,6 +571,9 @@ set_tests_properties (H5REPACK_DMP-h5dump-${testname} PROPERTIES DEPENDS "H5REPACK_DMP-${testname}" ) + if ("H5REPACK_DMP-h5dump-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_DMP-h5dump-${testname} PROPERTIES DISABLED true) + endif () endif () endif () endmacro () @@ -552,7 +585,7 @@ NAME H5REPACK_DIFF-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}" ) - set_property(TEST H5REPACK_DIFF-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_DIFF-${testname} PROPERTY DISABLED true) endif () else () add_test ( @@ -566,6 +599,9 @@ set_tests_properties (H5REPACK_DIFF-${testname} PROPERTIES DEPENDS H5REPACK_DIFF-${testname}-clear-objects ) + if ("H5REPACK_DIFF-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_DIFF-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_DIFF-${testname}_DFF COMMAND "${CMAKE_COMMAND}" @@ -581,6 +617,9 @@ set_tests_properties (H5REPACK_DIFF-${testname}_DFF PROPERTIES DEPENDS H5REPACK_DIFF-${testname} ) + if ("H5REPACK_DIFF-${testname}_DFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_DIFF-${testname}_DFF PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_DIFF-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile} @@ -598,7 +637,7 @@ NAME H5REPACK_STAT-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${statarg}.${resultfile}" ) - set_property(TEST H5REPACK_STAT-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_STAT-${testname} PROPERTY DISABLED true) endif () else () add_test ( @@ -612,6 +651,9 @@ set_tests_properties (H5REPACK_STAT-${testname} PROPERTIES DEPENDS H5REPACK_STAT-${testname}-clear-objects ) + 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) add_test ( NAME H5REPACK_STAT-h5stat-${testname} @@ -628,6 +670,9 @@ set_tests_properties (H5REPACK_STAT-h5stat-${testname} PROPERTIES DEPENDS H5REPACK_STAT-${testname} ) + if ("H5REPACK_STAT-h5stat-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_STAT-h5stat-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_STAT-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${statarg}.${resultfile} @@ -654,7 +699,7 @@ NAME H5REPACK_VERIFY_LAYOUT-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP -d ${testdset} -pH ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}" ) - set_property(TEST H5REPACK_VERIFY_LAYOUT-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_VERIFY_LAYOUT-${testname} PROPERTY DISABLED true) endif () else () if (NOT HDF5_ENABLE_USING_MEMCHECKER) @@ -669,6 +714,9 @@ set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}-clear-objects ) + if ("H5REPACK_VERIFY_LAYOUT-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_VERIFY_LAYOUT-${testname}_DFF COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile} @@ -676,6 +724,9 @@ set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DFF PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname} ) + if ("H5REPACK_VERIFY_LAYOUT-${testname}_DFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DFF PROPERTIES DISABLED true) + endif () if (NOT ${resultcode}) add_test ( NAME H5REPACK_VERIFY_LAYOUT-${testname}_DMP @@ -720,6 +771,9 @@ DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}_DFF ) endif () + if ("H5REPACK_VERIFY_LAYOUT-${testname}_DMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DMP PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_VERIFY_LAYOUT-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile} @@ -738,7 +792,7 @@ NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP -d ${testdset} -pH ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}" ) - set_property(TEST H5REPACK_VERIFY_LAYOUT_VDS-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_VERIFY_LAYOUT_VDS-${testname} PROPERTY DISABLED true) endif () else () if (NOT HDF5_ENABLE_USING_MEMCHECKER) @@ -755,6 +809,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_VERIFY_LAYOUT_VDS-${testname}-clear-objects ) + if ("H5REPACK_VERIFY_LAYOUT_VDS-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP COMMAND "${CMAKE_COMMAND}" @@ -771,6 +828,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_VERIFY_LAYOUT_VDS-${testname} ) + if ("H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile} @@ -796,6 +856,9 @@ set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname} PROPERTIES DEPENDS H5REPACK_VERIFY_SUPERBLOCK-${testname}-clear-objects ) + if ("H5REPACK_VERIFY_SUPERBLOCK-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_VERIFY_SUPERBLOCK-${testname}_DMP COMMAND "${CMAKE_COMMAND}" @@ -812,6 +875,9 @@ set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname}_DMP PROPERTIES DEPENDS H5REPACK_VERIFY_SUPERBLOCK-${testname} ) + if ("H5REPACK_VERIFY_SUPERBLOCK-${testname}_DMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname}_DMP PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_VERIFY_SUPERBLOCK-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile} @@ -835,6 +901,9 @@ DEPENDS ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}-clear-objects WILL_FAIL "true" ) + if ("ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile} @@ -859,6 +928,9 @@ set_tests_properties (H5REPACK_META-${testname}_N PROPERTIES DEPENDS H5REPACK_META-${testname}-clear-objects ) + if ("H5REPACK_META-${testname}_N" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_META-${testname}_N PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_META-${testname}_N_DFF COMMAND "${CMAKE_COMMAND}" @@ -874,6 +946,9 @@ set_tests_properties (H5REPACK_META-${testname}_N_DFF PROPERTIES DEPENDS H5REPACK_META-${testname}_N ) + if ("H5REPACK_META-${testname}_N_DFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_META-${testname}_N_DFF PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_META-${testname}_M COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_file_ext}> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_M.${testname}.h5 @@ -881,6 +956,9 @@ set_tests_properties (H5REPACK_META-${testname}_M PROPERTIES DEPENDS H5REPACK_META-${testname}_N_DFF ) + if ("H5REPACK_META-${testname}_M" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_META-${testname}_M PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_META-${testname}_M_DFF COMMAND "${CMAKE_COMMAND}" @@ -896,6 +974,9 @@ set_tests_properties (H5REPACK_META-${testname}_M_DFF PROPERTIES DEPENDS H5REPACK_META-${testname}_M ) + if ("H5REPACK_META-${testname}_M_DFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_META-${testname}_M_DFF PROPERTIES DISABLED true) + endif () add_test (NAME H5REPACK_META-${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles" @@ -907,6 +988,9 @@ set_tests_properties (H5REPACK_META-${testname} PROPERTIES DEPENDS H5REPACK_META-${testname}_M_DFF ) + if ("H5REPACK_META-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_META-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_META-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove @@ -944,6 +1028,9 @@ set_tests_properties (H5REPACK_UD-${testname} PROPERTIES DEPENDS H5REPACK_UD-${testname}-clear-objects ) + if ("H5REPACK_UD-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_UD-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_UD-${testname}-h5dump COMMAND "${CMAKE_COMMAND}" @@ -962,6 +1049,9 @@ set_tests_properties (H5REPACK_UD-${testname}-h5dump PROPERTIES DEPENDS H5REPACK_UD-${testname} ) + if ("H5REPACK_UD-${testname}-h5dump" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_UD-${testname}-h5dump PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_UD-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile} @@ -983,7 +1073,7 @@ NAME H5REPACK_EXTERNAL-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}" ) - set_property(TEST H5REPACK_EXTERNAL-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_EXTERNAL-${testname} PROPERTY DISABLED true) else () add_test ( NAME H5REPACK_EXTERNAL-${testname}-clear-objects @@ -1002,6 +1092,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_EXTERNAL-${testname}-clear-objects ) + if ("H5REPACK_EXTERNAL-${testname}_CPY" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_EXTERNAL-${testname}_CPY PROPERTIES DISABLED true) + endif () # comparison of known files add_test ( NAME H5REPACK_EXTERNAL-${testname}_DFF1 @@ -1011,6 +1104,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_EXTERNAL-${testname}_CPY ) + if ("H5REPACK_EXTERNAL-${testname}_DFF1" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_EXTERNAL-${testname}_DFF1 PROPERTIES DISABLED true) + endif () # repack the external file to the repacked file add_test ( NAME H5REPACK_EXTERNAL-${testname} @@ -1020,6 +1116,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_EXTERNAL-${testname}_DFF1 ) + if ("H5REPACK_EXTERNAL-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_EXTERNAL-${testname} PROPERTIES DISABLED true) + endif () # comparison of repacked file to known files add_test ( NAME H5REPACK_EXTERNAL-${testname}_DFF2 @@ -1029,6 +1128,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_EXTERNAL-${testname} ) + if ("H5REPACK_EXTERNAL-${testname}_DFF2" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_EXTERNAL-${testname}_DFF2 PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_EXTERNAL-${testname}_DFF3 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> --enable-error-stack ${PROJECT_BINARY_DIR}/testfiles/h5repack_${testfile}_rp.h5 ${PROJECT_BINARY_DIR}/testfiles/h5repack_${testfile}_ex.h5 @@ -1037,6 +1139,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_EXTERNAL-${testname}_DFF2 ) + if ("H5REPACK_EXTERNAL-${testname}_DFF3" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_EXTERNAL-${testname}_DFF3 PROPERTIES DISABLED true) + endif () # invalidate external file by removing its first data file add_test ( NAME H5REPACK_EXTERNAL-${testname}_DATA_RMV @@ -1046,6 +1151,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_EXTERNAL-${testname}_DFF3 ) + if ("H5REPACK_EXTERNAL-${testname}_DATA_RMV" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_EXTERNAL-${testname}_DATA_RMV PROPERTIES DISABLED true) + endif () # verify comparison of repacked file to known file add_test ( NAME H5REPACK_EXTERNAL-${testname}_DFF4 @@ -1055,6 +1163,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_EXTERNAL-${testname}_DATA_RMV ) + if ("H5REPACK_EXTERNAL-${testname}_DFF4" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_EXTERNAL-${testname}_DFF4 PROPERTIES DISABLED true) + endif () # verify comparison of repacked file to known external file fails add_test ( NAME H5REPACK_EXTERNAL-${testname}_DFF_FAIL @@ -1065,6 +1176,9 @@ DEPENDS H5REPACK_EXTERNAL-${testname}_DFF4 WILL_FAIL "true" ) + if ("H5REPACK_EXTERNAL-${testname}_DFF_FAIL" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_EXTERNAL-${testname}_DFF_FAIL PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_EXTERNAL-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove h5repack_${testfile}_rp.h5 diff --git a/tools/test/h5repack/CMakeVFDTests.cmake b/tools/test/h5repack/CMakeVFDTests.cmake index b746d88..e992029 100644 --- a/tools/test/h5repack/CMakeVFDTests.cmake +++ b/tools/test/h5repack/CMakeVFDTests.cmake @@ -83,6 +83,9 @@ macro (ADD_VFD_TEST vfdname resultcode) DEPENDS H5REPACK_VFD-${vfdname}-h5repacktest-clear-objects TIMEOUT ${CTEST_SHORT_TIMEOUT} ) + if ("H5REPACK_VFD-${vfdname}-h5repacktest" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_VFD-${vfdname}-h5repacktest PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_VFD-${vfdname}-h5repacktest-clean-objects COMMAND ${CMAKE_COMMAND} -E remove diff --git a/tools/test/h5stat/CMakeTests.cmake b/tools/test/h5stat/CMakeTests.cmake index 9035eaf..2b47cd0 100644 --- a/tools/test/h5stat/CMakeTests.cmake +++ b/tools/test/h5stat/CMakeTests.cmake @@ -117,6 +117,9 @@ set_tests_properties (H5STAT-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}" ) + if ("H5STAT-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5STAT-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_ERR_TEST resultfile resultcode) @@ -144,6 +147,9 @@ set_tests_properties (H5STAT-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}" ) + if ("H5STAT-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5STAT-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () ############################################################################## diff --git a/tools/test/misc/CMakeTestsClear.cmake b/tools/test/misc/CMakeTestsClear.cmake index 2f3c62f..cfe237d 100644 --- a/tools/test/misc/CMakeTestsClear.cmake +++ b/tools/test/misc/CMakeTestsClear.cmake @@ -102,6 +102,9 @@ -D "TEST_REFERENCE=${resultfile}.ddl" -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) + if ("H5CLEAR_CMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DISABLED true) + endif () if (last_test) set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS ${last_test}) endif () @@ -124,6 +127,9 @@ -D "TEST_ERRREF=${resultfile}.err" -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) + if ("H5CLEAR_CMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DISABLED true) + endif () if (last_test) set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS ${last_test}) endif () @@ -160,6 +166,9 @@ set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS H5CLEAR_CMP-copy_${testname} ) + if ("H5CLEAR_CMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -193,6 +202,9 @@ set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS H5CLEAR_CMP-copy_${testname} ) + if ("H5CLEAR_CMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -206,6 +218,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" WILL_FAIL "${resultcode}" ) + if ("H5CLEAR_RET-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_RET-${testname} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -238,6 +253,9 @@ set_tests_properties (H5CLEAR_FILESIZE_CMP-${testname}_before_size PROPERTIES DEPENDS H5CLEAR_FILESIZE_TEST-copy_${testname} ) + if ("H5CLEAR_FILESIZE_CMP-${testname}_before_size" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_FILESIZE_CMP-${testname}_before_size PROPERTIES DISABLED true) + endif () if (NOT ${incr_size} MATCHES "NONE") add_test ( NAME H5CLEAR_FILESIZE_INCR-${testname} @@ -254,6 +272,9 @@ WILL_FAIL "${resultcode}" DEPENDS H5CLEAR_FILESIZE_CMP-${testname}_before_size ) + if ("H5CLEAR_FILESIZE_INCR-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_FILESIZE_INCR-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5CLEAR_FILESIZE_CMP-${testname}_after_size COMMAND "${CMAKE_COMMAND}" @@ -269,6 +290,9 @@ set_tests_properties (H5CLEAR_FILESIZE_CMP-${testname}_after_size PROPERTIES DEPENDS H5CLEAR_FILESIZE_INCR-${testname} ) + if ("H5CLEAR_FILESIZE_CMP-${testname}_after_size" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_FILESIZE_CMP-${testname}_after_size PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -286,6 +310,9 @@ set_tests_properties (H5CLEAR_FILESIZE_FAIL_TEST-copy_${testname} PROPERTIES DEPENDS H5CLEAR_FILESIZE_FAIL_TEST-${testname}-clear-objects ) + if ("H5CLEAR_FILESIZE_FAIL_TEST-copy_${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_FILESIZE_FAIL_TEST-copy_${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5CLEAR_FILESIZE_FAIL_CMP-${testname}_before_size COMMAND "${CMAKE_COMMAND}" @@ -301,6 +328,9 @@ set_tests_properties (H5CLEAR_FILESIZE_FAIL_CMP-${testname}_before_size PROPERTIES DEPENDS H5CLEAR_FILESIZE_FAIL_TEST-copy_${testname} ) + if ("H5CLEAR_FILESIZE_FAIL_CMP-${testname}_before_size" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_FILESIZE_FAIL_CMP-${testname}_before_size PROPERTIES DISABLED true) + endif () if (NOT ${incr_size} MATCHES "NONE") add_test ( NAME H5CLEAR_FILESIZE_FAIL_INCR-${testname} @@ -316,6 +346,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5CLEAR_FILESIZE_FAIL_CMP-${testname}_before_size ) + if ("H5CLEAR_FILESIZE_FAIL_INCR-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_FILESIZE_FAIL_INCR-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5CLEAR_FILESIZE_FAIL_CMP-${testname}_after_size COMMAND "${CMAKE_COMMAND}" @@ -331,6 +364,9 @@ set_tests_properties (H5CLEAR_FILESIZE_FAIL_CMP-${testname}_after_size PROPERTIES DEPENDS H5CLEAR_FILESIZE_FAIL_INCR-${testname} ) + if ("H5CLEAR_FILESIZE_FAIL_CMP-${testname}_after_size" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_FILESIZE_FAIL_CMP-${testname}_after_size PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -353,6 +389,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5CLEAR-clr_open_chk-copy_${testname}.h5 ) + if ("H5CLEAR-clr_open_chk-${testname}_${resultcode}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR-clr_open_chk-${testname}_${resultcode} PROPERTIES DISABLED true) + endif () # After "h5clear" the file, the subsequent file open succeeds add_test ( @@ -363,6 +402,9 @@ DEPENDS H5CLEAR-clr_open_chk-${testname}_${resultcode} WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) + if ("H5CLEAR-h5clr-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR-h5clr-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5CLEAR-clr_open_chk-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:clear_open_chk> ${testfile}.h5 @@ -371,6 +413,9 @@ DEPENDS H5CLEAR-h5clr-${testname} WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) + if ("H5CLEAR-clr_open_chk-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR-clr_open_chk-${testname} PROPERTIES DISABLED true) + endif () endif () endmacro () diff --git a/tools/test/misc/CMakeTestsMkgrp.cmake b/tools/test/misc/CMakeTestsMkgrp.cmake index 9e4f739..e583b7f 100644 --- a/tools/test/misc/CMakeTestsMkgrp.cmake +++ b/tools/test/misc/CMakeTestsMkgrp.cmake @@ -60,6 +60,9 @@ NAME H5MKGRP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5mkgrp${tgt_file_ext}> ${resultoption} ${resultfile}.h5 ${ARGN} ) + if ("H5MKGRP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5MKGRP-${resultfile} PROPERTIES DISABLED true) + endif () else () add_test ( NAME H5MKGRP-${resultfile}-clear-objects @@ -76,6 +79,9 @@ DEPENDS H5MKGRP-${resultfile}-clear-objects WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) + if ("H5MKGRP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5MKGRP-${resultfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5MKGRP-${resultfile}-h5ls COMMAND "${CMAKE_COMMAND}" @@ -90,6 +96,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (H5MKGRP-${resultfile}-h5ls PROPERTIES DEPENDS H5MKGRP-${resultfile}) + if ("H5MKGRP-${resultfile}-h5ls" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5MKGRP-${resultfile}-h5ls PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -119,6 +128,9 @@ set_tests_properties (H5MKGRP_CMP-${resultfile} PROPERTIES DEPENDS H5MKGRP_CMP-${resultfile}-clear-objects ) + if ("H5MKGRP_CMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5MKGRP_CMP-${resultfile} PROPERTIES DISABLED true) + endif () endif () endmacro () diff --git a/tools/test/misc/CMakeTestsRepart.cmake b/tools/test/misc/CMakeTestsRepart.cmake index 764778e..81e8cc6 100644 --- a/tools/test/misc/CMakeTestsRepart.cmake +++ b/tools/test/misc/CMakeTestsRepart.cmake @@ -94,6 +94,9 @@ set_tests_properties (H5REPART-h5repart_20K PROPERTIES FIXTURES_REQUIRED clear_testrepart ) + if ("H5REPART-h5repart_20K" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPART-h5repart_20K PROPERTIES DISABLED true) + endif () # repartition family member size to 5 KB. add_test ( @@ -103,6 +106,9 @@ set_tests_properties (H5REPART-h5repart_5K PROPERTIES FIXTURES_REQUIRED clear_testrepart ) + if ("H5REPART-h5repart_5K" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPART-h5repart_5K PROPERTIES DISABLED true) + endif () # convert family file to sec2 file of 20,000 bytes add_test ( @@ -112,6 +118,9 @@ set_tests_properties (H5REPART-h5repart_single PROPERTIES FIXTURES_REQUIRED clear_testrepart ) + if ("H5REPART-h5repart_single" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPART-h5repart_single PROPERTIES DISABLED true) + endif () # convert family file to sec2 file of 20,000 bytes (old argument) add_test ( @@ -121,6 +130,9 @@ set_tests_properties (H5REPART-h5repart_sec2 PROPERTIES FIXTURES_REQUIRED clear_testrepart ) + if ("H5REPART-h5repart_sec2" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPART-h5repart_sec2 PROPERTIES DISABLED true) + endif () # test the output files repartitioned above. add_test ( @@ -131,6 +143,9 @@ DEPENDS "H5REPART-h5repart_20K;H5REPART-h5repart_5K;H5REPART-h5repart_single;H5REPART-h5repart_sec2" FIXTURES_REQUIRED clear_testrepart ) + if ("H5REPART-h5repart_test" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPART-h5repart_test PROPERTIES DISABLED true) + endif () set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5repart_test diff --git a/tools/test/perform/CMakeTests.cmake b/tools/test/perform/CMakeTests.cmake index 2dea619..714713e 100644 --- a/tools/test/perform/CMakeTests.cmake +++ b/tools/test/perform/CMakeTests.cmake @@ -69,6 +69,9 @@ if (HDF5_TEST_SERIAL) TIMEOUT ${CTEST_VERY_LONG_TIMEOUT} FIXTURES_REQUIRED clear_perform ) + if ("PERFORM_h5perf_serial" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (PERFORM_h5perf_serial PROPERTIES DISABLED true) + endif () if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME PERFORM_chunk COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:chunk>) @@ -88,6 +91,9 @@ if (HDF5_TEST_SERIAL) set_tests_properties (PERFORM_chunk PROPERTIES FIXTURES_REQUIRED clear_perform ) + if ("PERFORM_chunk" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (PERFORM_chunk PROPERTIES DISABLED true) + endif () if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME PERFORM_iopipe COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:iopipe>) @@ -107,6 +113,9 @@ if (HDF5_TEST_SERIAL) set_tests_properties (PERFORM_iopipe PROPERTIES FIXTURES_REQUIRED clear_perform ) + if ("PERFORM_iopipe" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (PERFORM_iopipe PROPERTIES DISABLED true) + endif () if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME PERFORM_overhead COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:overhead>) @@ -126,6 +135,9 @@ if (HDF5_TEST_SERIAL) set_tests_properties (PERFORM_overhead PROPERTIES FIXTURES_REQUIRED clear_perform ) + if ("PERFORM_overhead" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (PERFORM_overhead PROPERTIES DISABLED true) + endif () if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME PERFORM_perf_meta COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:perf_meta>) @@ -145,6 +157,9 @@ if (HDF5_TEST_SERIAL) set_tests_properties (PERFORM_perf_meta PROPERTIES FIXTURES_REQUIRED clear_perform ) + if ("PERFORM_perf_meta" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (PERFORM_perf_meta PROPERTIES DISABLED true) + endif () if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME PERFORM_zip_perf_help COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:zip_perf> "-h") @@ -164,6 +179,9 @@ if (HDF5_TEST_SERIAL) set_tests_properties (PERFORM_zip_perf_help PROPERTIES FIXTURES_REQUIRED clear_perform ) + if ("PERFORM_zip_perf_help" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (PERFORM_zip_perf_help PROPERTIES DISABLED true) + endif () if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME PERFORM_zip_perf COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:zip_perf> tfilters.h5) @@ -184,6 +202,9 @@ if (HDF5_TEST_SERIAL) DEPENDS "PERFORM_zip_perf_help" FIXTURES_REQUIRED clear_perform ) + if ("PERFORM_zip_perf" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (PERFORM_zip_perf PROPERTIES DISABLED true) + endif () endif () if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL) |