HDFFV-10529 Update CMake tests to use test fixtures

This commit is contained in:
Allen Byrne 2019-07-23 16:24:56 -05:00
parent d3fdcd8a68
commit 6a932198aa
39 changed files with 896 additions and 2597 deletions

View File

@ -16,84 +16,79 @@
##############################################################################
##############################################################################
# Remove any output file left over from previous test run
add_test (
NAME CPP_ex-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
Group.h5
SDS.h5
SDScompound.h5
SDSextendible.h5
Select.h5
)
set_tests_properties (CPP_ex-clear-objects PROPERTIES FIXTURES_SETUP clear_cppex)
if (last_test)
set_tests_properties (CPP_ex-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "CPP_ex-clear-objects")
add_test (
NAME CPP_ex-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
Group.h5
SDS.h5
SDScompound.h5
SDSextendible.h5
Select.h5
)
set_tests_properties (CPP_ex-clear-objects PROPERTIES FIXTURES_SETUP clear_cppex)
foreach (example ${examples})
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME CPP_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cpp_ex_${example}>)
else ()
add_test (NAME CPP_ex_${example} COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-D "TEST_PROGRAM=$<TARGET_FILE:cpp_ex_${example}>"
-D "TEST_ARGS:STRING="
-D "TEST_EXPECT=0"
-D "TEST_SKIP_COMPARE=TRUE"
-D "TEST_OUTPUT=cpp_ex_${example}.txt"
#-D "TEST_REFERENCE=cpp_ex_${example}.out"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
if (last_test)
set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "CPP_ex_${example}")
endforeach ()
foreach (example ${examples})
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME CPP_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cpp_ex_${example}>)
else ()
add_test (NAME CPP_ex_${example} COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-D "TEST_PROGRAM=$<TARGET_FILE:cpp_ex_${example}>"
-D "TEST_ARGS:STRING="
-D "TEST_EXPECT=0"
-D "TEST_SKIP_COMPARE=TRUE"
-D "TEST_OUTPUT=cpp_ex_${example}.txt"
#-D "TEST_REFERENCE=cpp_ex_${example}.out"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (CPP_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_cppex)
if (last_test)
set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "CPP_ex_${example}")
endforeach ()
#the following dependencies are handled by the order of the files
# SET_TESTS_PROPERTIES(CPP_ex_readdata PROPERTIES DEPENDS CPP_ex_create)
# SET_TESTS_PROPERTIES(CPP_ex_chunks PROPERTIES DEPENDS CPP_ex_extend_ds)
add_test (
NAME CPP_ex_tutr-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
h5tutr_cmprss.h5
h5tutr_dset.h5
h5tutr_extend.h5
h5tutr_group.h5
h5tutr_groups.h5
h5tutr_subset.h5
)
if (last_test)
set_tests_properties (CPP_ex_tutr-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "CPP_ex_tutr-clear-objects")
add_test (
NAME CPP_ex_tutr-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
h5tutr_cmprss.h5
h5tutr_dset.h5
h5tutr_extend.h5
h5tutr_group.h5
h5tutr_groups.h5
h5tutr_subset.h5
)
set_tests_properties (CPP_ex_tutr-clear-objects PROPERTIES FIXTURES_SETUP clear_cppex_tutr)
foreach (example ${tutr_examples})
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME CPP_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cpp_ex_${example}>)
else ()
add_test (NAME CPP_ex_${example} COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-D "TEST_PROGRAM=$<TARGET_FILE:cpp_ex_${example}>"
-D "TEST_ARGS:STRING="
-D "TEST_EXPECT=0"
-D "TEST_SKIP_COMPARE=TRUE"
-D "TEST_OUTPUT=cpp_ex_${example}.txt"
#-D "TEST_REFERENCE=cpp_ex_${example}.out"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
if (last_test)
set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "CPP_ex_${example}")
endforeach ()
foreach (example ${tutr_examples})
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME CPP_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cpp_ex_${example}>)
else ()
add_test (NAME CPP_ex_${example} COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-D "TEST_PROGRAM=$<TARGET_FILE:cpp_ex_${example}>"
-D "TEST_ARGS:STRING="
-D "TEST_EXPECT=0"
-D "TEST_SKIP_COMPARE=TRUE"
-D "TEST_OUTPUT=cpp_ex_${example}.txt"
#-D "TEST_REFERENCE=cpp_ex_${example}.out"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (CPP_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_cppex_tutr)
if (last_test)
set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "CPP_ex_${example}")
endforeach ()
#the following dependencies are handled by the order of the files
# SET_TESTS_PROPERTIES(CPP_ex_h5tutr_crtatt PROPERTIES DEPENDS CPP_ex_h5tutr_crtdat)
# SET_TESTS_PROPERTIES(CPP_ex_h5tutr_rdwt PROPERTIES DEPENDS CPP_ex_h5tutr_crtdat)

View File

@ -42,6 +42,7 @@
tattr_scalar.h5
tfattrs.h5
titerate.h5
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${vfdname}
)
add_test (
NAME CPP_VFD-${vfdname}-cpp_testhdf5
@ -51,7 +52,7 @@
-D "TEST_ARGS:STRING="
-D "TEST_VFD:STRING=${vfdname}"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_OUTPUT=cpp_testhdf5"
-D "TEST_OUTPUT=${vfdname}-cpp_testhdf5.out"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}/${vfdname}"
-P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
)

View File

@ -42,25 +42,31 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
H5TEST-testlibinfo #uses grepTest.cmake
#########
H5TEST-clear-objects
H5TEST-clear-cache-objects
H5TEST-clear-cache_api-objects
H5TEST-clear-cache_image-objects
H5TEST-clear-cache_tagging-objects
H5TEST-clear-del_many_dense_attrs-objects
H5TEST-clear-err_compat-objects
H5TEST-clear-error_test-objects
H5TEST-clear-filenotclosed-objects
H5TEST-clear-flush-objects
H5TEST-clear-links_env-objects
H5TEST-clear-testflushrefresh-objects
H5TEST-clear-testhdf5-objects
H5TEST-clear-ttsafe-objects
H5TEST-cache-clear-objects
H5TEST-cache_image-clear-objects
H5TEST-del_many_dense_attrs-clear-objects
H5TEST-external_env-clear-objects
H5TEST-filenotclosed-clear-objects
H5TEST-flush-clear-objects
H5TEST-links_env-clear-objects
H5TEST-testflushrefresh-clear-objects
H5TEST-testhdf5-clear-objects
H5TEST-vds_env-clear-objects
PERFORM_h5perform-clear-objects
HL_TOOLS-clear-objects
HL_test-clear-objects
HL_FORTRAN_test-clear-objects
FORTRAN_testhdf5-clear-objects
FORTRAN_flush1-clear-objects
CPP_testhdf5-clear-objects
######### examples #########
EXAMPLES-clear-objects
CPP_ex-clear-objects
CPP_ex_tutr-clear-objects
HL_ex-clear-objects
f90_ex-clear-objects
HL_CPP_ptableTest-clear-objects
HL_CPP_ex_ptExampleFL-clear-objects
HL_FORTRAN_f90_ex-clear-objects
######### tools/h5clear #########
H5CLEAR-clearall-objects
H5CLEAR-copy_h5clear_fsm_persist_equal.h5
@ -89,10 +95,6 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
######### tools/h5diff #########
H5DIFF-clearall-objects
######### tools/h5dump #########
H5DUMP-clearall-objects
H5DUMP_PACKED_BITS-clearall-objects
H5DUMP-XML-clearall-objects
H5DUMP_VDS-clearall-objects
H5DUMP-t128bit_float #uses grepTest.cmake
######### tools/h5format_convert #########
H5FC-clearall-objects
@ -100,136 +102,6 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
H5IMPORT-h5importtest-clear-objects
H5IMPORT-clear-objects
######### tools/h5jam #########
H5JAM-SETUP-N_twithub_u10_c-clear-objects
H5JAM-SETUP-N_twithub_u10_c
H5JAM-N_twithub_u10_c-clear-objects
H5JAM-NONE_COPY-N_twithub_u10_c
H5JAM-CHECKFILE-N_twithub_u10_c-clear-objects
H5JAM-SETUP-N_twithub_u511_c-clear-objects
H5JAM-SETUP-N_twithub_u511_c
H5JAM-N_twithub_u511_c-clear-objects
H5JAM-NONE_COPY-N_twithub_u511_c
H5JAM-CHECKFILE-N_twithub_u511_c-clear-objects
H5JAM-SETUP-N_twithub_u512_c-clear-objects
H5JAM-SETUP-N_twithub_u512_c
H5JAM-N_twithub_u512_c-clear-objects
H5JAM-NONE_COPY-N_twithub_u512_c
H5JAM-CHECKFILE-N_twithub_u512_c-clear-objects
H5JAM-SETUP-N_twithub_u513_c-clear-objects
H5JAM-SETUP-N_twithub_u513_c
H5JAM-N_twithub_u513_c-clear-objects
H5JAM-NONE_COPY-N_twithub_u513_c
H5JAM-CHECKFILE-N_twithub_u513_c-clear-objects
H5JAM-SETUP-N_twithub513_u10_c-clear-objects
H5JAM-SETUP-N_twithub513_u10_c
H5JAM-N_twithub513_u10_c-clear-objects
H5JAM-NONE_COPY-N_twithub513_u10_c
H5JAM-CHECKFILE-N_twithub513_u10_c-clear-objects
H5JAM-SETUP-N_twithub513_u511_c-clear-objects
H5JAM-SETUP-N_twithub513_u511_c
H5JAM-N_twithub513_u511_c-clear-objects
H5JAM-NONE_COPY-N_twithub513_u511_c
H5JAM-CHECKFILE-N_twithub513_u511_c-clear-objects
H5JAM-SETUP-N_twithub513_u512_c-clear-objects
H5JAM-SETUP-N_twithub513_u512_c
H5JAM-N_twithub513_u512_c-clear-objects
H5JAM-NONE_COPY-N_twithub513_u512_c
H5JAM-CHECKFILE-N_twithub513_u512_c-clear-objects
H5JAM-SETUP-N_twithub513_u513_c-clear-objects
H5JAM-SETUP-N_twithub513_u513_c
H5JAM-N_twithub513_u513_c-clear-objects
H5JAM-NONE_COPY-N_twithub513_u513_c
H5JAM-CHECKFILE-N_twithub513_u513_c-clear-objects
H5JAM-CHECKFILE-twithub_u10_c-clear-objects
H5JAM-twithub_u511_c-clear-objects
H5JAM-CHECKFILE-twithub_u511_c-clear-objects
H5JAM-twithub_u512_c-clear-objects
H5JAM-CHECKFILE-twithub_u512_c-clear-objects
H5JAM-twithub_u513_c-clear-objects
H5JAM-CHECKFILE-twithub_u513_c-clear-objects
H5JAM-twithub513_u10_c-clear-objects
H5JAM-CHECKFILE-twithub513_u10_c-clear-objects
H5JAM-twithub513_u511_c-clear-objects
H5JAM-CHECKFILE-twithub513_u511_c-clear-objects
H5JAM-twithub513_u512_c-clear-objects
H5JAM-CHECKFILE-twithub513_u512_c-clear-objects
H5JAM-twithub513_u513_c-clear-objects
H5JAM-CHECKFILE-twithub513_u513_c-clear-objects
H5JAM-SETUP-twithub_tall-clear-objects
H5JAM-SETUP-twithub_tall
H5JAM-UNJAM-twithub_tall-clear-objects
H5JAM-UNJAM_D-twithub_tall-clear-objects
H5JAM-CHECKFILE-twithub_tall-clear-objects
H5JAM-SETUP-twithub513_tall-clear-objects
H5JAM-SETUP-twithub513_tall
H5JAM-UNJAM-twithub513_tall-clear-objects
H5JAM-UNJAM_D-twithub513_tall-clear-objects
H5JAM-CHECKFILE-twithub513_tall-clear-objects
H5JAM-SETUP-N_twithub_tall-clear-objects
H5JAM-SETUP-N_twithub_tall
H5JAM-UNJAM-N_twithub_tall-clear-objects
H5JAM-UNJAM_D-N_twithub_tall-clear-objects
H5JAM-CHECKFILE-N_twithub_tall-clear-objects
H5JAM-SETUP-N_twithub513_tall-clear-objects
H5JAM-SETUP-N_twithub513_tall
H5JAM-UNJAM-N_twithub513_tall-clear-objects
H5JAM-UNJAM_D-N_twithub513_tall-clear-objects
H5JAM-CHECKFILE-N_twithub513_tall-clear-objects
H5JAM-SETUP-D_twithub_tall-clear-objects
H5JAM-SETUP-D_twithub_tall
H5JAM-UNJAM-D_twithub_tall-clear-objects
H5JAM-UNJAM_D-D_twithub_tall-clear-objects
H5JAM-CHECKFILE-D_twithub_tall-clear-objects
H5JAM-SETUP-D_twithub513_tall-clear-objects
H5JAM-SETUP-D_twithub513_tall
H5JAM-UNJAM-D_twithub513_tall-clear-objects
H5JAM-UNJAM_D-D_twithub513_tall-clear-objects
H5JAM-CHECKFILE-D_twithub513_tall-clear-objects
H5JAM-CHECKFILE-ta_u513-clear-objects
H5JAM-twithub_u10-clear-objects
H5JAM-CHECKFILE-twithub_u10-clear-objects
H5JAM-twithub_u511-clear-objects
H5JAM-CHECKFILE-twithub_u511-clear-objects
H5JAM-twithub_u512-clear-objects
H5JAM-CHECKFILE-twithub_u512-clear-objects
H5JAM-twithub_u513-clear-objects
H5JAM-CHECKFILE-twithub_u513-clear-objects
H5JAM-twithub513_u10-clear-objects
H5JAM-CHECKFILE-twithub513_u10-clear-objects
H5JAM-twithub513_u511-clear-objects
H5JAM-CHECKFILE-twithub513_u511-clear-objects
H5JAM-twithub513_u512-clear-objects
H5JAM-CHECKFILE-twithub513_u512-clear-objects
H5JAM-twithub513_u513-clear-objects
H5JAM-CHECKFILE-twithub513_u513-clear-objects
H5JAM-twithub_u10_c-clear-objects
H5JAM-tall_u10-clear-objects
H5JAM-CHECKFILE-tall_u10-clear-objects
H5JAM-tall_u511-clear-objects
H5JAM-CHECKFILE-tall_u511-clear-objects
H5JAM-tall_u512-clear-objects
H5JAM-CHECKFILE-tall_u512-clear-objects
H5JAM-tall_u513-clear-objects
H5JAM-CHECKFILE-tall_u513-clear-objects
H5JAM-SETUP-ta_u10-clear-objects
H5JAM-SETUP-ta_u10
H5JAM-ta_u10-clear-objects
H5JAM-NONE_COPY-ta_u10
H5JAM-CHECKFILE-ta_u10-clear-objects
H5JAM-SETUP-ta_u511-clear-objects
H5JAM-SETUP-ta_u511
H5JAM-ta_u511-clear-objects
H5JAM-NONE_COPY-ta_u511
H5JAM-CHECKFILE-ta_u511-clear-objects
H5JAM-SETUP-ta_u512-clear-objects
H5JAM-SETUP-ta_u512
H5JAM-ta_u512-clear-objects
H5JAM-NONE_COPY-ta_u512
H5JAM-CHECKFILE-ta_u512-clear-objects
H5JAM-SETUP-ta_u513-clear-objects
H5JAM-SETUP-ta_u513
H5JAM-ta_u513-clear-objects
H5JAM-NONE_COPY-ta_u513
######### tools/h5ls #########
H5LS-clearall-objects
H5LS_VDS-clearall-objects
@ -286,7 +158,6 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
H5REPACK-HDFFV-7840-clear-objects
H5REPACK_META-meta_long_N-clear-objects
H5REPACK_META-meta_short_N-clear-objects
H5REPACK_OLD-old_style_layout_short_switches-clear-objects
H5REPACK_STAT-GS_AGGR-clear-objects
H5REPACK_STAT-S_AGGR-clear-objects
H5REPACK_STAT-SP_NONE-clear-objects
@ -331,14 +202,7 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
H5MKGRP-clearall-objects
######### tools/perform #########
PERFORM_h5perform-clearall-objects
######### hl/tools/h5watch #########
######### hl/tools #########
HL_TOOLS-clear-objects
H5WATCH-clearall-objects
######### examples #########
EXAMPLES-clear-objects
CPP_ex-clear-objects
CPP_ex_tutr-clear-objects
HL_ex-clear-objects
f90_ex-clear-objects
HL_CPP_ex_ptExampleFL-clear-objects
HL_FORTRAN_f90_ex-clear-objects
)

View File

@ -14,7 +14,8 @@
# This file provides functions for HDF5 specific Fortran support.
#
#-------------------------------------------------------------------------------
ENABLE_LANGUAGE (Fortran)
enable_language (Fortran)
set (HDF_PREFIX "H5")
include (CheckFortranFunctionExists)

View File

@ -127,8 +127,8 @@ macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
PROPERTIES
OUTPUT_NAME
${LIB_RELEASE_NAME}
OUTPUT_NAME_DEBUG
${LIB_DEBUG_NAME}
# OUTPUT_NAME_DEBUG
# ${LIB_DEBUG_NAME}
OUTPUT_NAME_RELEASE
${LIB_RELEASE_NAME}
OUTPUT_NAME_MINSIZEREL

View File

@ -15,106 +15,103 @@
### T E S T I N G ###
##############################################################################
##############################################################################
file (MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/red ${PROJECT_BINARY_DIR}/blue ${PROJECT_BINARY_DIR}/u2w)
file (MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/red ${PROJECT_BINARY_DIR}/blue ${PROJECT_BINARY_DIR}/u2w)
set (test_CLEANFILES
Attributes.h5
btrees_file.h5
cmprss.h5
default_file.h5
dset.h5
extend.h5
extlink_prefix_source.h5
extlink_source.h5
extlink_target.h5
group.h5
groups.h5
hard_link.h5
mount1.h5
mount2.h5
one_index_file.h5
only_dspaces_and_attrs_file.h5
only_huge_mesgs_file.h5
REF_REG.h5
refere.h5
SDS.h5
SDScompound.h5
SDSextendible.h5
Select.h5
separate_indexes_file.h5
small_lists_file.h5
soft_link.h5
subset.h5
unix2win.h5
blue/prefix_target.h5
red/prefix_target.h5
u2w/u2w_target.h5
vds.h5
vds-exc.h5
vds-excalibur.h5
vds-exclim.h5
vds-percival.h5
vds-percival-unlim.h5
vds-percival-unlim-maxmin.h5
a.h5
b.h5
c.h5
d.h5
vds-simpleIO.h5
vds-eiger.h5
)
set (test_ex_CLEANFILES
Attributes.h5
btrees_file.h5
cmprss.h5
default_file.h5
dset.h5
extend.h5
extlink_prefix_source.h5
extlink_source.h5
extlink_target.h5
group.h5
groups.h5
hard_link.h5
mount1.h5
mount2.h5
one_index_file.h5
only_dspaces_and_attrs_file.h5
only_huge_mesgs_file.h5
REF_REG.h5
refere.h5
SDS.h5
SDScompound.h5
SDSextendible.h5
Select.h5
separate_indexes_file.h5
small_lists_file.h5
soft_link.h5
subset.h5
unix2win.h5
blue/prefix_target.h5
red/prefix_target.h5
u2w/u2w_target.h5
vds.h5
vds-exc.h5
vds-excalibur.h5
vds-exclim.h5
vds-percival.h5
vds-percival-unlim.h5
vds-percival-unlim-maxmin.h5
a.h5
b.h5
c.h5
d.h5
vds-simpleIO.h5
vds-eiger.h5
)
# Remove any output file left over from previous test run
add_test (
NAME EXAMPLES-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove ${test_CLEANFILES}
)
if (last_test)
set_tests_properties (EXAMPLES-clear-objects PROPERTIES DEPENDS ${last_test})
# Remove any output file left over from previous test run
add_test (
NAME EXAMPLES-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove ${test_ex_CLEANFILES}
)
set_tests_properties (EXAMPLES-clear-objects PROPERTIES FIXTURES_SETUP clear_EXAMPLES)
foreach (example ${examples})
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME EXAMPLES-${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:${example}>)
else ()
add_test (NAME EXAMPLES-${example} COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-D "TEST_PROGRAM=$<TARGET_FILE:${example}>"
-D "TEST_ARGS:STRING="
-D "TEST_EXPECT=0"
-D "TEST_SKIP_COMPARE=TRUE"
-D "TEST_OUTPUT=${example}.txt"
#-D "TEST_REFERENCE=${example}.out"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set (last_test "EXAMPLES-clear-objects")
foreach (example ${examples})
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME EXAMPLES-${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:${example}>)
else ()
add_test (NAME EXAMPLES-${example} COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-D "TEST_PROGRAM=$<TARGET_FILE:${example}>"
-D "TEST_ARGS:STRING="
-D "TEST_EXPECT=0"
-D "TEST_SKIP_COMPARE=TRUE"
-D "TEST_OUTPUT=${example}.txt"
#-D "TEST_REFERENCE=${example}.out"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
if (last_test)
set_tests_properties (EXAMPLES-${example} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "EXAMPLES-${example}")
endforeach ()
set_tests_properties (EXAMPLES-${example} PROPERTIES FIXTURES_REQUIRED clear_EXAMPLES)
if (last_test)
set_tests_properties (EXAMPLES-${example} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "EXAMPLES-${example}")
endforeach ()
### Windows pops up a modal permission dialog on this test
if (H5_HAVE_PARALLEL AND NOT WIN32)
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME MPI_TEST_EXAMPLES-ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:ph5example> ${MPIEXEC_POSTFLAGS})
else ()
add_test (NAME MPI_TEST_EXAMPLES-ph5example COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=${MPIEXEC_EXECUTABLE};${MPIEXEC_NUMPROC_FLAG};${MPIEXEC_MAX_NUMPROCS};${MPIEXEC_PREFLAGS};$<TARGET_FILE:ph5example>;${MPIEXEC_POSTFLAGS}"
-D "TEST_ARGS:STRING="
-D "TEST_EXPECT=0"
-D "TEST_OUTPUT=ph5example.out"
-D "TEST_REFERENCE:STRING=PHDF5 tests finished with no errors"
-D "TEST_FILTER:STRING=PHDF5 tests finished with no errors"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
)
endif ()
if (last_test)
set_tests_properties (MPI_TEST_EXAMPLES-ph5example PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "MPI_TEST_EXAMPLES-ph5example")
if (H5_HAVE_PARALLEL AND NOT WIN32)
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME MPI_TEST_EXAMPLES-ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:ph5example> ${MPIEXEC_POSTFLAGS})
else ()
add_test (NAME MPI_TEST_EXAMPLES-ph5example COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=${MPIEXEC_EXECUTABLE};${MPIEXEC_NUMPROC_FLAG};${MPIEXEC_MAX_NUMPROCS};${MPIEXEC_PREFLAGS};$<TARGET_FILE:ph5example>;${MPIEXEC_POSTFLAGS}"
-D "TEST_ARGS:STRING="
-D "TEST_EXPECT=0"
-D "TEST_OUTPUT=ph5example.out"
-D "TEST_REFERENCE:STRING=PHDF5 tests finished with no errors"
-D "TEST_FILTER:STRING=PHDF5 tests finished with no errors"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
)
endif ()
if (last_test)
set_tests_properties (MPI_TEST_EXAMPLES-ph5example PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "MPI_TEST_EXAMPLES-ph5example")
endif ()

View File

@ -16,34 +16,30 @@
##############################################################################
##############################################################################
set (test_CLEANFILES
compound.h5
copy1.h5
copy2.h5
dsetf.h5
extend.h5
FORTRAN.h5
groupf.h5
groupsf.h5
h5_cmprss.h5
mount1.h5
mount2.h5
sdsf.h5
subset.h5
SDScompound.h5
test.h5
)
set (test_ex_fortran_CLEANFILES
compound.h5
copy1.h5
copy2.h5
dsetf.h5
extend.h5
FORTRAN.h5
groupf.h5
groupsf.h5
h5_cmprss.h5
mount1.h5
mount2.h5
sdsf.h5
subset.h5
SDScompound.h5
test.h5
)
# Remove any output file left over from previous test run
add_test (
NAME f90_ex-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove ${test_CLEANFILES}
)
if (last_test)
set_tests_properties (f90_ex-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "f90_ex-clear-objects")
# Remove any output file left over from previous test run
add_test (
NAME f90_ex-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove ${test_ex_fortran_CLEANFILES}
)
set_tests_properties (f90_ex-clear-objects PROPERTIES FIXTURES_SETUP clear_f90_ex)
foreach (example ${examples})
if (HDF5_ENABLE_USING_MEMCHECKER)
@ -61,6 +57,7 @@ foreach (example ${examples})
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (f90_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_f90_ex)
if (last_test)
set_tests_properties (f90_ex_${example} PROPERTIES DEPENDS ${last_test})
endif ()
@ -83,6 +80,7 @@ foreach (example ${F2003_examples})
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (f03_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_f90_ex)
if (last_test)
set_tests_properties (f03_ex_${example} PROPERTIES DEPENDS ${last_test})
endif ()

View File

@ -16,7 +16,7 @@
##############################################################################
##############################################################################
set (test_CLEANFILES
set (testhdf5_fortran_CLEANFILES
a.h5
b.h5
c.h5
@ -55,14 +55,9 @@ set (test_CLEANFILES
# Remove any output file left over from previous test run
add_test (
NAME FORTRAN_testhdf5-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${test_CLEANFILES}
COMMAND ${CMAKE_COMMAND} -E remove ${testhdf5_fortran_CLEANFILES}
)
if (last_test)
set_tests_properties (FORTRAN_testhdf5-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "FORTRAN_testhdf5-clear-objects")
set_tests_properties (FORTRAN_testhdf5-clear-objects PROPERTIES FIXTURES_SETUP clear_testhdf5_fortran)
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME FORTRAN_testhdf5_fortran COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:testhdf5_fortran>)
@ -82,7 +77,9 @@ else ()
)
endif ()
#set_tests_properties (FORTRAN_testhdf5_fortran PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
set_tests_properties (FORTRAN_testhdf5_fortran PROPERTIES DEPENDS FORTRAN_testhdf5-clear-objects)
set_tests_properties (FORTRAN_testhdf5_fortran PROPERTIES
FIXTURES_REQUIRED clear_testhdf5_fortran
)
#-- Adding test for testhdf5_fortran_1_8
if (HDF5_ENABLE_USING_MEMCHECKER)
@ -103,7 +100,10 @@ else ()
)
endif ()
#set_tests_properties (FORTRAN_testhdf5_fortran_1_8 PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
set_tests_properties (FORTRAN_testhdf5_fortran_1_8 PROPERTIES DEPENDS FORTRAN_testhdf5_fortran)
set_tests_properties (FORTRAN_testhdf5_fortran_1_8 PROPERTIES
DEPENDS FORTRAN_testhdf5_fortran
FIXTURES_REQUIRED clear_testhdf5_fortran
)
#-- Adding test for fortranlib_test_F03
if (HDF5_ENABLE_USING_MEMCHECKER)
@ -124,7 +124,10 @@ else ()
)
endif ()
# set_tests_properties (FORTRAN_fortranlib_test_F03 PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
set_tests_properties (FORTRAN_fortranlib_test_F03 PROPERTIES DEPENDS FORTRAN_testhdf5_fortran_1_8)
set_tests_properties (FORTRAN_fortranlib_test_F03 PROPERTIES
DEPENDS FORTRAN_testhdf5_fortran_1_8
FIXTURES_REQUIRED clear_testhdf5_fortran
)
#-- Adding test for vol_connector
if (HDF5_ENABLE_USING_MEMCHECKER)
@ -146,9 +149,23 @@ else ()
endif ()
#-- Adding test for fflush1
add_test (NAME FORTRAN_fflush1 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:fflush1>)
set_tests_properties (FORTRAN_fflush1 PROPERTIES DEPENDS FORTRAN_testhdf5-clear-objects)
add_test (
NAME FORTRAN_flush1-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove flush.h5
)
add_test (
NAME FORTRAN_fflush1
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:fflush1>
)
set_tests_properties (FORTRAN_fflush1 PROPERTIES
DEPENDS FORTRAN_flush1-clear-objects
)
#-- Adding test for fflush2
add_test (NAME FORTRAN_fflush2 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:fflush2>)
set_tests_properties (FORTRAN_fflush2 PROPERTIES DEPENDS FORTRAN_fflush1)
add_test (
NAME FORTRAN_fflush2
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:fflush2>
)
set_tests_properties (FORTRAN_fflush2 PROPERTIES
DEPENDS FORTRAN_fflush1
)

View File

@ -21,6 +21,7 @@ add_test (
COMMAND ${CMAKE_COMMAND}
-E remove
PTcppexampleFL.h5
ptExampleFL.txt
)
if (HDF5_ENABLE_USING_MEMCHECKER)

View File

@ -16,6 +16,11 @@
##############################################################################
##############################################################################
add_test (
NAME HL_CPP_ptableTest-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove ${example}.txt
)
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME HL_CPP_ptableTest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_ptableTest>)
else ()
@ -31,3 +36,4 @@ else ()
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (HL_CPP_ptableTest PROPERTIES DEPENDS HL_CPP_ptableTest-clear-objects)

View File

@ -26,35 +26,32 @@ foreach (h5_file ${HDF5_TEST_FILES})
endforeach ()
add_custom_target(hl_ex_ex_ds1_files ALL COMMENT "Copying files needed by hl_ex_ex_ds1 tests" DEPENDS ${hl_ex_ex_ds1_files_list})
# Remove any output file left over from previous test run
add_test (
NAME HL_ex-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
ex_lite1.h5
ex_lite2.h5
ex_lite3.h5
packet_table_FLexample.h5
ex_image1.h5
ex_image2.h5
ex_table_01.h5
ex_table_02.h5
ex_table_03.h5
ex_table_04.h5
ex_table_05.h5
ex_table_06.h5
ex_table_07.h5
ex_table_08.h5
ex_table_09.h5
ex_table_10.h5
ex_table_11.h5
ex_table_12.h5
ex_ds1.h5
)
if (last_test)
set_tests_properties (HL_ex-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "HL_ex-clear-objects")
# Remove any output file left over from previous test run
add_test (
NAME HL_ex-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
ex_lite1.h5
ex_lite2.h5
ex_lite3.h5
packet_table_FLexample.h5
ex_image1.h5
ex_image2.h5
ex_table_01.h5
ex_table_02.h5
ex_table_03.h5
ex_table_04.h5
ex_table_05.h5
ex_table_06.h5
ex_table_07.h5
ex_table_08.h5
ex_table_09.h5
ex_table_10.h5
ex_table_11.h5
ex_table_12.h5
ex_ds1.h5
)
set_tests_properties (HL_ex-clear-objects PROPERTIES FIXTURES_SETUP clear_HL_ex)
foreach (example ${examples})
if (HDF5_ENABLE_USING_MEMCHECKER)
@ -73,7 +70,10 @@ foreach (example ${examples})
)
endif ()
if (last_test)
set_tests_properties (HL_ex_${example} PROPERTIES DEPENDS ${last_test})
set_tests_properties (HL_ex_${example} PROPERTIES
DEPENDS ${last_test}
FIXTURES_REQUIRED clear_HL_ex
)
endif ()
set (last_test "HL_ex_${example}")
endforeach ()

View File

@ -21,10 +21,10 @@ add_test (
NAME HL_FORTRAN_f90_ex-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
ex_ds1.h5
exlite.h5
ex_ds1.h5
exlite.h5
)
set_tests_properties (HL_FORTRAN_f90_ex-clear-objects PROPERTIES FIXTURES_SETUP clear_HL_FORTRAN_f90_ex)
foreach (example ${examples})
if (HDF5_ENABLE_USING_MEMCHECKER)
@ -42,5 +42,7 @@ foreach (example ${examples})
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (HL_FORTRAN_f90_ex_${example} PROPERTIES DEPENDS HL_FORTRAN_f90_ex-clear-objects)
set_tests_properties (HL_FORTRAN_f90_ex_${example} PROPERTIES
FIXTURES_REQUIRED clear_HL_FORTRAN_f90_ex
)
endforeach ()

View File

@ -16,7 +16,7 @@
##############################################################################
##############################################################################
set (test_CLEANFILES
set (test_hl_fortran_CLEANFILES
dsetf1.h5
dsetf2.h5
dsetf3.h5
@ -28,6 +28,14 @@ set (test_CLEANFILES
tstds.h5
)
# Remove any output file left over from previous test run
add_test (
NAME HL_FORTRAN_test-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove ${test_hl_fortran_CLEANFILES}
)
set_tests_properties (HL_FORTRAN_test-clear-objects PROPERTIES FIXTURES_SETUP clear_HL_FORTRAN_test)
macro (ADD_H5_FORTRAN_TEST file)
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME HL_FORTRAN_f90_${file} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_f90_${file}>)
@ -44,16 +52,11 @@ macro (ADD_H5_FORTRAN_TEST file)
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (HL_FORTRAN_f90_${file} PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)
set_tests_properties (HL_FORTRAN_f90_${file} PROPERTIES
FIXTURES_REQUIRED clear_HL_FORTRAN_test
)
endmacro ()
# Remove any output file left over from previous test run
add_test (
NAME HL_FORTRAN_test-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove ${test_CLEANFILES}
)
foreach (h5_test ${H5_TESTS})
ADD_H5_FORTRAN_TEST(${h5_test})
endforeach ()

View File

@ -43,6 +43,44 @@ foreach (h5_file ${HL_REFERENCE_TEST_FILES})
endforeach ()
add_custom_target(hl_test_files ALL COMMENT "Copying files needed by hl_test tests" DEPENDS ${hl_test_files_list})
# Remove any output file left over from previous test run
set (test_hl_CLEANFILES
combine_tables1.h5
combine_tables2.h5
file_img1.h5
file_img2.h5
test_append.h5
h5do_compat.h5
test_detach.h5
test_ds1.h5
test_ds2.h5
test_ds3.h5
test_ds4.h5
test_ds5.h5
test_ds6.h5
test_ds7.h5
test_ds8.h5
test_ds9.h5
test_ds10.h5
test_image1.h5
test_image2.h5
test_image3.h5
test_lite1.h5
test_lite2.h5
test_lite3.h5
test_lite4.h5
test_packet_compress.h5
test_packet_table.h5
test_packet_table_vlen.h5
testfl_packet_table_vlen.h5
test_table.h5
)
add_test (
NAME HL_test-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove ${test_hl_CLEANFILES}
)
set_tests_properties (HL_test-clear-objects PROPERTIES FIXTURES_SETUP clear_test_hl)
# --------------------------------------------------------------------
# Macro used to add a unit test
# --------------------------------------------------------------------
@ -62,54 +100,13 @@ macro (HL_ADD_TEST hl_name)
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
if (last_test)
set_tests_properties (HL_${hl_name} PROPERTIES DEPENDS ${last_test}
set_tests_properties (HL_${hl_name} PROPERTIES
FIXTURES_REQUIRED clear_test_hl
ENVIRONMENT "srcdir=${HDF5_HL_TEST_BINARY_DIR}"
WORKING_DIRECTORY ${HDF5_HL_TEST_BINARY_DIR}
)
endif ()
)
endmacro ()
# Remove any output file left over from previous test run
add_test (
NAME HL_test-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
combine_tables1.h5
combine_tables2.h5
file_img1.h5
file_img2.h5
test_append.h5
h5do_compat.h5
test_detach.h5
test_ds1.h5
test_ds2.h5
test_ds3.h5
test_ds4.h5
test_ds5.h5
test_ds6.h5
test_ds7.h5
test_ds8.h5
test_ds9.h5
test_ds10.h5
test_image1.h5
test_image2.h5
test_image3.h5
test_lite1.h5
test_lite2.h5
test_lite3.h5
test_lite4.h5
test_packet_compress.h5
test_packet_table.h5
test_packet_table_vlen.h5
testfl_packet_table_vlen.h5
test_table.h5
)
if (last_test)
set_tests_properties (HL_test-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "HL_test-clear-objects")
HL_add_test (test_lite )
HL_add_test (test_image)
HL_add_test (test_file_image)

View File

@ -43,20 +43,32 @@ add_test (
image.gif
image24.gif
)
set_tests_properties (HL_TOOLS-clear-objects PROPERTIES FIXTURES_SETUP clear_tools_hl)
add_test (NAME HL_TOOLS_gif2h5 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:gif2h5${tgt_ext}> testfiles/image1.gif image1.h5)
set_tests_properties (HL_TOOLS_gif2h5 PROPERTIES DEPENDS HL_TOOLS-clear-objects)
set_tests_properties (HL_TOOLS_gif2h5 PROPERTIES
FIXTURES_REQUIRED clear_tools_hl
)
add_test (NAME HL_TOOLS_h52gif COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h52gif${tgt_ext}> testfiles/h52giftst.h5 image1.gif -i image)
set_tests_properties (HL_TOOLS_h52gif PROPERTIES DEPENDS HL_TOOLS-clear-objects)
set_tests_properties (HL_TOOLS_h52gif PROPERTIES
FIXTURES_REQUIRED clear_tools_hl
)
add_test (NAME HL_TOOLS_h52gif_none COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h52gif${tgt_ext}> testfiles/h52giftst.h5 image.gif -i nosuch_image)
set_tests_properties (HL_TOOLS_h52gif_none PROPERTIES WILL_FAIL "true")
set_tests_properties (HL_TOOLS_h52gif_none PROPERTIES DEPENDS HL_TOOLS-clear-objects)
set_tests_properties (HL_TOOLS_h52gif_none PROPERTIES
WILL_FAIL "true"
FIXTURES_REQUIRED clear_tools_hl
)
#add_test (NAME HL_TOOLS_h52gifpal COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h52gif${tgt_ext}> testfiles/h52giftst.h5 image.gif -i palette)
#set_tests_properties (HL_TOOLS_h52gifpal PROPERTIES WILL_FAIL "true")
#set_tests_properties (HL_TOOLS_h52gifpal PROPERTIES
# WILL_FAIL "true"
# FIXTURES_REQUIRED clear_tools_hl
#)
add_test (NAME HL_TOOLS_h52gif24bits COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h52gif${tgt_ext}> testfiles/ex_image2.h5 image24.gif -i image24bitpixel)
set_tests_properties (HL_TOOLS_h52gif24bits PROPERTIES WILL_FAIL "true")
set_tests_properties (HL_TOOLS_h52gif24bits PROPERTIES DEPENDS HL_TOOLS-clear-objects)
set_tests_properties (HL_TOOLS_h52gif24bits PROPERTIES
WILL_FAIL "true"
FIXTURES_REQUIRED clear_tools_hl
)

View File

@ -88,7 +88,10 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes
-D "TEST_REFERENCE=${resultfile}.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5WATCH_ARGS-h5watch-${resultfile} PROPERTIES DEPENDS ${last_test})
set_tests_properties (H5WATCH_ARGS-h5watch-${resultfile} PROPERTIES
DEPENDS ${last_test}
FIXTURES_REQUIRED gen_test_watch
)
set (last_test "H5WATCH_ARGS-h5watch-${resultfile}")
endif ()
endmacro ()
@ -108,7 +111,10 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes
-D "TEST_ERRREF=${resultfile}.err"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5WATCH_ARGS-h5watch-${resultfile} PROPERTIES DEPENDS ${last_test})
set_tests_properties (H5WATCH_ARGS-h5watch-${resultfile} PROPERTIES
DEPENDS ${last_test}
FIXTURES_REQUIRED gen_test_watch
)
set (last_test "H5WATCH_ARGS-h5watch-${resultfile}")
endif ()
endmacro ()
@ -133,7 +139,11 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes
-D "TEST_REFERENCE=${resultfile}.txt"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5WATCH-${resultfile} PROPERTIES DEPENDS H5WATCH-${resultfile}-clear-objects)
set_tests_properties (H5WATCH-${resultfile} PROPERTIES
DEPENDS H5WATCH-${resultfile}-clear-objects
FIXTURES_REQUIRED gen_test_watch
)
set (last_test "H5WATCH-${resultfile}")
endif ()
endmacro ()
@ -151,9 +161,7 @@ if (NOT SWMR_INCOMPAT)
# Remove any output file left over from previous test run
add_test (
NAME H5WATCH-clearall-objects
COMMAND ${CMAKE_COMMAND}
-E remove
WATCH.h5
COMMAND ${CMAKE_COMMAND} -E remove WATCH.h5
)
if (last_test)
set_tests_properties (H5WATCH-clearall-objects PROPERTIES DEPENDS ${last_test})
@ -181,8 +189,11 @@ if (NOT SWMR_INCOMPAT)
#################################################################################################
# create the output files to be used.
add_test (NAME H5WATCH-h5watchgentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5watchgentest>)
set_tests_properties (H5WATCH-h5watchgentest PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
set_tests_properties (H5WATCH-h5watchgentest PROPERTIES DEPENDS "H5WATCH-clearall-objects")
set_tests_properties (H5WATCH-h5watchgentest PROPERTIES
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
DEPENDS "H5WATCH-clearall-objects"
)
set_tests_properties (H5WATCH-h5watchgentest PROPERTIES FIXTURES_SETUP gen_test_watch)
set (last_test "H5WATCH-h5watchgentest")
# Test on --help options

View File

@ -90,13 +90,6 @@ add_custom_target(HDF5_VOLTEST_LIB_files ALL COMMENT "Copying files needed by HD
if ("${voltest}" STREQUAL "flush1" OR "${voltest}" STREQUAL "flush2")
if ("${volname}" STREQUAL "multi" OR "${volname}" STREQUAL "split")
if (NOT BUILD_SHARED_LIBS AND NOT ${HDF_CFG_NAME} MATCHES "Debug")
add_test (
NAME VOL-${volname}-${voltest}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${volname}/${volname}-${voltest}.out
${volname}/${volname}-${voltest}.out.err
)
add_test (NAME VOL-${volname}-${voltest}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
@ -109,7 +102,6 @@ add_custom_target(HDF5_VOLTEST_LIB_files ALL COMMENT "Copying files needed by HD
-P "${HDF_RESOURCES_DIR}/volTest.cmake"
)
set_tests_properties (VOL-${volname}-${voltest} PROPERTIES
DEPENDS VOL-${volname}-${voltest}-clear-objects
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${volname}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${volname}
)
@ -119,13 +111,6 @@ add_custom_target(HDF5_VOLTEST_LIB_files ALL COMMENT "Copying files needed by HD
)
endif ()
else ()
add_test (
NAME VOL-${volname}-${voltest}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${volname}/${volname}-${voltest}.out
${volname}/${volname}-${voltest}.out.err
)
add_test (NAME VOL-${volname}-${voltest}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
@ -138,19 +123,11 @@ add_custom_target(HDF5_VOLTEST_LIB_files ALL COMMENT "Copying files needed by HD
-P "${HDF_RESOURCES_DIR}/volTest.cmake"
)
set_tests_properties (VOL-${volname}-${voltest} PROPERTIES
DEPENDS VOL-${volname}-${voltest}-clear-objects
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${volname}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${volname}
)
endif ()
else ()
add_test (
NAME VOL-${volname}-${voltest}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${volname}/${volname}-${voltest}.out
${volname}/${volname}-${voltest}.out.err
)
add_test (NAME VOL-${volname}-${voltest}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
@ -163,7 +140,6 @@ add_custom_target(HDF5_VOLTEST_LIB_files ALL COMMENT "Copying files needed by HD
-P "${HDF_RESOURCES_DIR}/volTest.cmake"
)
set_tests_properties (VOL-${volname}-${voltest} PROPERTIES
DEPENDS VOL-${volname}-${voltest}-clear-objects
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${volname};HDF5TestExpress=${HDF_TEST_EXPRESS}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${volname}
)
@ -172,13 +148,6 @@ add_custom_target(HDF5_VOLTEST_LIB_files ALL COMMENT "Copying files needed by HD
macro (DO_VOL_TEST voltest volname volinfo resultcode)
#message(STATUS "${voltest}-${volname} with ${volinfo}")
add_test (
NAME VOL-${volname}-${voltest}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${volname}/${volname}-${voltest}.out
${volname}/${volname}-${voltest}.out.err
)
add_test (NAME VOL-${volname}-${voltest}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
@ -191,7 +160,6 @@ add_custom_target(HDF5_VOLTEST_LIB_files ALL COMMENT "Copying files needed by HD
-P "${HDF_RESOURCES_DIR}/volTest.cmake"
)
set_tests_properties (VOL-${volname}-${voltest} PROPERTIES
DEPENDS VOL-${volname}-${voltest}-clear-objects
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${volname}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${volname}
)
@ -216,13 +184,6 @@ add_custom_target(HDF5_VOLTEST_LIB_files ALL COMMENT "Copying files needed by HD
set_tests_properties (VOL-${volname}-cache PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
endif ()
if (HDF5_TEST_FHEAP_PASSTHROUGH_VOL)
add_test (
NAME VOL-${volname}-fheap-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${volname}/${volname}-fheap.out
${volname}/${volname}-fheap.out.err
)
add_test (NAME VOL-${volname}-fheap
COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
@ -235,7 +196,6 @@ add_custom_target(HDF5_VOLTEST_LIB_files ALL COMMENT "Copying files needed by HD
-P "${HDF_RESOURCES_DIR}/volTest.cmake"
)
set_tests_properties (VOL-${volname}-fheap PROPERTIES
DEPENDS VOL-${volname}-fheap-clear-objects
TIMEOUT ${CTEST_VERY_LONG_TIMEOUT}
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${volname};HDF5TestExpress=${HDF_TEST_EXPRESS}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${volname}

View File

@ -198,13 +198,12 @@ set (testhdf5_CLEANFILES
)
# Remove any output file left over from previous test run
add_test (NAME H5TEST-clear-testhdf5-objects
COMMAND ${CMAKE_COMMAND}
-E remove ${testhdf5_CLEANFILES}
WORKING_DIRECTORY
${HDF5_TEST_BINARY_DIR}/H5TEST
add_test (
NAME H5TEST-testhdf5-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove ${testhdf5_CLEANFILES}
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-clear-testhdf5-objects PROPERTIES FIXTURES_SETUP clear_testhdf5)
set_tests_properties (H5TEST-testhdf5-clear-objects PROPERTIES FIXTURES_SETUP clear_testhdf5)
add_test (NAME H5TEST-testhdf5-base COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:testhdf5> -x heap -x file -x select)
set_tests_properties (H5TEST-testhdf5-base PROPERTIES
@ -451,14 +450,12 @@ set (test_CLEANFILES
)
# Remove any output file left over from previous test run
add_test (NAME H5TEST-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${test_CLEANFILES}
WORKING_DIRECTORY
${HDF5_TEST_BINARY_DIR}/H5TEST
add_test (
NAME H5TEST-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove ${test_CLEANFILES}
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-clear-objects PROPERTIES FIXTURES_SETUP clear_objects)
set_tests_properties (H5TEST-clear-objects PROPERTIES FIXTURES_SETUP clear_H5TEST)
set (H5TEST_SEPARATE_TESTS
testhdf5
@ -498,7 +495,7 @@ foreach (h5_test ${H5_TESTS})
)
endif ()
set_tests_properties (H5TEST-${h5_test} PROPERTIES
FIXTURES_REQUIRED clear_objects
FIXTURES_REQUIRED clear_H5TEST
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
@ -513,14 +510,12 @@ set_tests_properties (H5TEST-objcopy PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOU
#-- Adding test for cache
if (NOT CYGWIN)
add_test (NAME H5TEST-clear-cache-objects
COMMAND ${CMAKE_COMMAND}
-E remove
cache_test.h5
WORKING_DIRECTORY
${HDF5_TEST_BINARY_DIR}/H5TEST
add_test (
NAME H5TEST-cache-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove cache_test.h5
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-clear-cache-objects PROPERTIES FIXTURES_SETUP cache_clear_objects)
set_tests_properties (H5TEST-cache-clear-objects PROPERTIES FIXTURES_SETUP clear_cache)
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME H5TEST-cache COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cache>)
else ()
@ -537,7 +532,7 @@ if (NOT CYGWIN)
)
endif ()
set_tests_properties (H5TEST-cache PROPERTIES
FIXTURES_REQUIRED cache_clear_objects
FIXTURES_REQUIRED clear_cache
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=${HDF_TEST_EXPRESS}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
@ -547,17 +542,14 @@ endif ()
if (TEST_CACHE_IMAGE)
#-- Adding test for cache_image
add_test (
NAME H5TEST-clear-cache_image-objects
COMMAND ${CMAKE_COMMAND}
-E remove
cache_image_test.h5
WORKING_DIRECTORY
${HDF5_TEST_BINARY_DIR}/H5TEST
NAME H5TEST-cache_image-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove cache_image_test.h5
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-clear-cache_image-objects PROPERTIES FIXTURES_SETUP cache_image_clear_objects)
add_test (NAME H5TEST-cache_image COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cache_image>)
set_tests_properties (H5TEST-cache_image-clear-objects PROPERTIES FIXTURES_SETUP clear_cache_image)
add_test (NAME H5TEST_cache_image COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cache_image>)
set_tests_properties (H5TEST-cache_image PROPERTIES
FIXTURES_REQUIRED cache_image_clear_objects
FIXTURES_REQUIRED clear_cache_image
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=${HDF_TEST_EXPRESS}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
@ -565,9 +557,8 @@ endif ()
#-- Adding test for external_env
add_test (
NAME H5TEST-clear-external_env-objects
COMMAND ${CMAKE_COMMAND}
-E remove
NAME H5TEST-external_env-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove
extern_1r.raw
extern_2r.raw
extern_3r.raw
@ -576,12 +567,10 @@ add_test (
extern_2w.raw
extern_3w.raw
extern_4w.raw
external_env.txt
external_env.out
WORKING_DIRECTORY
${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-clear-external_env-objects PROPERTIES FIXTURES_SETUP external_env_clear_objects)
set_tests_properties (H5TEST-external_env-clear-objects PROPERTIES FIXTURES_SETUP clear_external_env)
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME H5TEST-external_env COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:external_env>)
else ()
@ -600,25 +589,22 @@ else ()
)
endif ()
set_tests_properties (H5TEST-external_env PROPERTIES
FIXTURES_REQUIRED external_env_clear_objects
FIXTURES_REQUIRED clear_external_env
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=${HDF_TEST_EXPRESS}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
#-- Adding test for vds_env
add_test (
NAME H5TEST-clear-vds_env-objects
COMMAND ${CMAKE_COMMAND}
-E remove
NAME H5TEST-vds_env-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove
vds_virt_0.h5
vds_virt_3.h5
vds_src_2.h5
vds_env.txt
vds_env.out
WORKING_DIRECTORY
${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-clear-vds_env-objects PROPERTIES FIXTURES_SETUP vds_env_clear_objects)
set_tests_properties (H5TEST-vds_env-clear-objects PROPERTIES FIXTURES_SETUP clear_vds_env)
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME H5TEST-vds_env COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:vds_env>)
else ()
@ -637,15 +623,14 @@ else ()
)
endif ()
set_tests_properties (H5TEST-vds_env PROPERTIES
FIXTURES_REQUIRED vds_env_clear_objects
FIXTURES_REQUIRED clear_vds_env
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=${HDF_TEST_EXPRESS}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
#-- Adding test for flush1/2
add_test (NAME H5TEST-clear-flush-objects
COMMAND ${CMAKE_COMMAND}
-E remove
add_test (NAME H5TEST-flush-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove
flush.h5
flush-swmr.h5
noflush.h5
@ -657,6 +642,7 @@ add_test (NAME H5TEST-clear-flush-objects
WORKING_DIRECTORY
${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-flush-clear-objects PROPERTIES FIXTURES_SETUP clear_flush)
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME H5TEST-flush1 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:flush1>)
else ()
@ -672,7 +658,7 @@ else ()
)
endif ()
set_tests_properties (H5TEST-flush1 PROPERTIES
DEPENDS H5TEST-clear-flush-objects
FIXTURES_REQUIRED clear_flush
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=${HDF_TEST_EXPRESS}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
@ -690,7 +676,10 @@ else ()
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (H5TEST-flush2 PROPERTIES DEPENDS H5TEST-flush1)
set_tests_properties (H5TEST-flush2 PROPERTIES
FIXTURES_REQUIRED clear_flush
DEPENDS H5TEST-flush1
)
#-- Adding test for tcheck_version
add_test (NAME H5TEST-tcheck_version-major COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:tcheck_version> "-tM")
@ -743,49 +732,34 @@ set_tests_properties (H5TEST-tcheck_version-release PROPERTIES
#-- Adding test for filenotclosed
add_test (
NAME H5TEST-clear-filenotclosed-objects
COMMAND ${CMAKE_COMMAND}
-E remove
filenotclosed.h5
WORKING_DIRECTORY
${HDF5_TEST_BINARY_DIR}/H5TEST
NAME H5TEST-filenotclosed-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove filenotclosed.h5
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-clear-filenotclosed-objects PROPERTIES FIXTURES_SETUP filenotclosed_clear_objects)
set_tests_properties (H5TEST-filenotclosed-clear-objects PROPERTIES FIXTURES_SETUP clear_filenotclosed)
add_test (NAME H5TEST-filenotclosed COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:filenotclosed>)
set_tests_properties (H5TEST-filenotclosed PROPERTIES
FIXTURES_REQUIRED filenotclosed_clear_objects
FIXTURES_REQUIRED clear_filenotclosed
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
#-- Adding test for del_many_dense_attrs
add_test (
NAME H5TEST-clear-del_many_dense_attrs-objects
COMMAND ${CMAKE_COMMAND}
-E remove
del_many_dense_attrs.h5
WORKING_DIRECTORY
${HDF5_TEST_BINARY_DIR}/H5TEST
NAME H5TEST-del_many_dense_attrs-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove del_many_dense_attrs.h5
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-clear-del_many_dense_attrs-objects PROPERTIES FIXTURES_SETUP del_many_dense_attrs_clear_objects)
set_tests_properties (H5TEST-del_many_dense_attrs-clear-objects PROPERTIES FIXTURES_SETUP clear_del_many_dense_attrs)
add_test (NAME H5TEST-del_many_dense_attrs COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:del_many_dense_attrs>)
set_tests_properties (H5TEST-del_many_dense_attrs PROPERTIES
FIXTURES_REQUIRED del_many_dense_attrs_clear_objects
FIXTURES_REQUIRED clear_del_many_dense_attrs
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
#-- Adding test for err_compat
if (HDF5_ENABLE_DEPRECATED_SYMBOLS)
add_test (NAME H5TEST-clear-err_compat-objects
COMMAND ${CMAKE_COMMAND}
-E remove
err_compat.txt
err_compat.txt.err
WORKING_DIRECTORY
${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-clear-err_compat-objects PROPERTIES FIXTURES_SETUP err_compat_clear_objects)
if (HDF5_ENABLE_DEPRECATED_SYMBOLS AND NOT MINGW)
add_test (NAME H5TEST-err_compat COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-D "TEST_PROGRAM=$<TARGET_FILE:err_compat>"
@ -799,23 +773,13 @@ if (HDF5_ENABLE_DEPRECATED_SYMBOLS)
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5TEST-err_compat PROPERTIES
FIXTURES_REQUIRED err_compat_clear_objects
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
endif ()
#-- Adding test for error_test
add_test (NAME H5TEST-clear-error_test-objects
COMMAND ${CMAKE_COMMAND}
-E remove
error_test.txt
error_test.txt.err
WORKING_DIRECTORY
${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-clear-error_test-objects PROPERTIES FIXTURES_SETUP error_test_clear_objects)
if (HDF5_USE_16_API_DEFAULT)
if (HDF5_USE_16_API_DEFAULT OR MINGW)
add_test (
NAME H5TEST-error_test
COMMAND ${CMAKE_COMMAND} -E echo "SKIP $<TARGET_FILE:error_test>"
@ -835,25 +799,21 @@ else ()
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5TEST-error_test PROPERTIES
FIXTURES_REQUIRED error_test_clear_objects
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5_PLUGIN_PRELOAD=::"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
endif ()
#-- Adding test for links_env
add_test (NAME H5TEST-clear-links_env-objects
COMMAND ${CMAKE_COMMAND}
-E remove
links_env.txt
links_env.txt.err
add_test (NAME H5TEST-links_env-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove
extlinks_env0.h5
extlinks_env1.h5
tmp/extlinks_env1.h5
WORKING_DIRECTORY
${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-clear-links_env-objects PROPERTIES FIXTURES_SETUP links_env_clear_objects)
set_tests_properties (H5TEST-links_env-clear-objects PROPERTIES FIXTURES_SETUP clear_links_env)
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME H5TEST-links_env COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:links_env>)
else ()
@ -871,7 +831,7 @@ else ()
)
endif ()
set_tests_properties (H5TEST-links_env PROPERTIES
FIXTURES_REQUIRED links_env_clear_objects
FIXTURES_REQUIRED clear_links_env
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5_EXT_PREFIX=.:tmp"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
@ -938,16 +898,12 @@ if (ENABLE_EXTENDED_TESTS)
file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/flushrefresh_test")
find_package (Perl)
if (PERL_FOUND)
add_test (NAME H5TEST-clear-testflushrefresh-objects
COMMAND ${CMAKE_COMMAND}
-E remove
flushrefresh.txt
flushrefresh.txt.err
flushrefresh.h5
WORKING_DIRECTORY
${HDF5_TEST_BINARY_DIR}/H5TEST/flushrefresh_test
add_test (
NAME H5TEST-testflushrefresh-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove flushrefresh.h5
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST/flushrefresh_test
)
set_tests_properties (H5TEST-clear-testflushrefresh-objects PROPERTIES FIXTURES_SETUP testflushrefresh_clear_objects)
set_tests_properties (H5TEST-testflushrefresh-clear-objects PROPERTIES FIXTURES_SETUP clear_testflushrefresh)
add_test (NAME H5TEST-testflushrefresh COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-D "TEST_PROGRAM=$<TARGET_FILE:flushrefresh>"
@ -963,7 +919,7 @@ if (ENABLE_EXTENDED_TESTS)
-P "${HDF5_TEST_SOURCE_DIR}/flushrefreshTest.cmake"
)
set_tests_properties (H5TEST-testflushrefresh PROPERTIES
FIXTURES_REQUIRED testflushrefresh_clear_objects
FIXTURES_REQUIRED clear_testflushrefresh
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST/flushrefresh_test"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST/flushrefresh_test
)

View File

@ -93,13 +93,6 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
if ("${vfdtest}" STREQUAL "flush1" OR "${vfdtest}" STREQUAL "flush2")
if ("${vfdname}" STREQUAL "multi" OR "${vfdname}" STREQUAL "split")
if (NOT BUILD_SHARED_LIBS AND NOT HDF_CFG_NAME MATCHES "Debug")
add_test (
NAME VFD-${vfdname}-${vfdtest}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${vfdname}/${vfdname}-${vfdtest}.out
${vfdname}/${vfdname}-${vfdtest}.out.err
)
add_test (NAME VFD-${vfdname}-${vfdtest}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
@ -112,7 +105,6 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
-P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
)
set_tests_properties (VFD-${vfdname}-${vfdtest} PROPERTIES
DEPENDS VFD-${vfdname}-${vfdtest}-clear-objects
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}
)
@ -122,13 +114,6 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
)
endif ()
else ()
add_test (
NAME VFD-${vfdname}-${vfdtest}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${vfdname}/${vfdname}-${vfdtest}.out
${vfdname}/${vfdname}-${vfdtest}.out.err
)
add_test (NAME VFD-${vfdname}-${vfdtest}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
@ -141,19 +126,11 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
-P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
)
set_tests_properties (VFD-${vfdname}-${vfdtest} PROPERTIES
DEPENDS VFD-${vfdname}-${vfdtest}-clear-objects
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}
)
endif ()
else ()
add_test (
NAME VFD-${vfdname}-${vfdtest}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${vfdname}/${vfdname}-${vfdtest}.out
${vfdname}/${vfdname}-${vfdtest}.out.err
)
add_test (NAME VFD-${vfdname}-${vfdtest}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
@ -166,7 +143,6 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
-P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
)
set_tests_properties (VFD-${vfdname}-${vfdtest} PROPERTIES
DEPENDS VFD-${vfdname}-${vfdtest}-clear-objects
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname};HDF5TestExpress=${HDF_TEST_EXPRESS}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}
)
@ -174,13 +150,6 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
endmacro ()
macro (DO_VFD_TEST vfdtest vfdname resultcode)
add_test (
NAME VFD-${vfdname}-${vfdtest}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${vfdname}/${vfdname}-${vfdtest}.out
${vfdname}/${vfdname}-${vfdtest}.out.err
)
add_test (NAME VFD-${vfdname}-${vfdtest}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
@ -193,7 +162,6 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
-P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
)
set_tests_properties (VFD-${vfdname}-${vfdtest} PROPERTIES
DEPENDS VFD-${vfdname}-${vfdtest}-clear-objects
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}
)
@ -217,13 +185,6 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
set_tests_properties (VFD-${vfdname}-cache PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
endif ()
if (HDF5_TEST_FHEAP_VFD)
add_test (
NAME VFD-${vfdname}-fheap-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${vfdname}/${vfdname}-fheap.out
${vfdname}/${vfdname}-fheap.out.err
)
add_test (NAME VFD-${vfdname}-fheap
COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
@ -236,7 +197,6 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
-P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
)
set_tests_properties (VFD-${vfdname}-fheap PROPERTIES
DEPENDS VFD-${vfdname}-fheap-clear-objects
TIMEOUT ${CTEST_VERY_LONG_TIMEOUT}
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname};HDF5TestExpress=${HDF_TEST_EXPRESS}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}

View File

@ -16,11 +16,10 @@
##############################################################################
##############################################################################
# Remove any output file left over from previous test run
add_test (NAME MPI_TEST-clear-testphdf5-objects
COMMAND ${CMAKE_COMMAND}
-E remove ParaTest.h5
WORKING_DIRECTORY
${HDF5_TEST_PAR_BINARY_DIR}
add_test (
NAME MPI_TEST-clear-testphdf5-objects
COMMAND ${CMAKE_COMMAND} -E remove ParaTest.h5
WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}
)
set_tests_properties (MPI_TEST-clear-testphdf5-objects PROPERTIES FIXTURES_SETUP par_clear_testphdf5)
@ -93,12 +92,10 @@ set (test_par_CLEANFILES
)
# Remove any output file left over from previous test run
add_test (NAME MPI_TEST-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${test_par_CLEANFILES}
WORKING_DIRECTORY
${HDF5_TEST_PAR_BINARY_DIR}
add_test (
NAME MPI_TEST-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove ${test_par_CLEANFILES}
WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}
)
set_tests_properties (MPI_TEST-clear-objects PROPERTIES FIXTURES_SETUP par_clear_objects)

View File

@ -40,13 +40,6 @@ endforeach ()
macro (ADD_VFD_TEST vfdname resultcode)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
foreach (h5_test ${H5P_VFD_TESTS})
add_test (
NAME MPI_TEST_VFD-${vfdname}-${h5_test}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${vfdname}/${vfdname}-${h5_test}.out
${vfdname}/${vfdname}-${h5_test}.out.err
)
add_test (
NAME MPI_TEST_VFD-${vfdname}-${h5_test}
COMMAND "${CMAKE_COMMAND}"
@ -60,7 +53,6 @@ endforeach ()
-P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
)
set_tests_properties (MPI_TEST_VFD-${vfdname}-${h5_test} PROPERTIES
DEPENDS MPI_TEST_VFD-${vfdname}-${h5_test}-clear-objects
ENVIRONMENT "srcdir=${HDF5_TEST_PAR_BINARY_DIR}/${vfdname}"
WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}/${vfdname}
)

View File

@ -65,9 +65,7 @@
# Remove any output file left over from previous test run
add_test (
NAME H5COPY_F-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
./testfiles/${testname}.out.h5
COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}.out.h5
)
endif ()
@ -101,9 +99,7 @@
# Remove any output file left over from previous test run
add_test (
NAME H5COPY-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
./testfiles/${testname}.out.h5
COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}.out.h5
)
endif ()
@ -147,9 +143,7 @@
# Remove any output file left over from previous test run
add_test (
NAME H5COPY-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
./testfiles/${testname}.out.h5
COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}.out.h5
)
endif ()
@ -188,9 +182,7 @@
# Remove any output file left over from previous test run
add_test (
NAME H5COPY_SAME-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
./testfiles/${testname}.out.h5
COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}.out.h5
)
endif ()
@ -242,11 +234,7 @@
# Remove any output file left over from previous test run
add_test (
NAME H5COPY-CMP-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
./testfiles/${testname}.out.h5
./testfiles/${testname}.out.out
./testfiles/${testname}.out.out.err
COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}.out.h5
)
add_test (
NAME H5COPY-CMP-${testname}
@ -271,13 +259,7 @@
# Remove any output file left over from previous test run
add_test (
NAME H5COPY_UD-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/${testname}.out.h5
testfiles/${infile}.out
testfiles/${infile}.out.err
testfiles/${testname}.out.h5.out
testfiles/${testname}.out.h5.out.err
COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testname}.out.h5
)
if (${resultcode} EQUAL 2)
add_test (
@ -340,13 +322,7 @@
# Remove any output file left over from previous test run
add_test (
NAME H5COPY_UD_ERR-${testname}-clearall-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/${testname}_ERR.out.h5
testfiles/${infile}_ERR.out
testfiles/${infile}_ERR.out.err
testfiles/${testname}_ERR.out.h5.out
testfiles/${testname}_ERR.out.h5.out.err
COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testname}_ERR.out.h5
)
if (${resultcode} EQUAL 2)
add_test (
@ -424,8 +400,7 @@
# Remove any output file left over from previous test run
add_test (
NAME H5COPY-clearall-objects
COMMAND ${CMAKE_COMMAND}
-E remove
COMMAND ${CMAKE_COMMAND} -E remove
simple.out.h5
chunk.out.h5
compact.out.h5
@ -458,8 +433,6 @@
samefile1.out.h5
samefile2.out.h5
h5copy_misc1.out.h5
h5copy_misc1.out.out
h5copy_misc1.out.out.err
)
set_tests_properties (H5COPY-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
if (last_test)

View File

@ -374,17 +374,6 @@
set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
else ()
# Remove any output file left over from previous test run
add_test (
NAME H5DIFF-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/${resultfile}.out
testfiles/${resultfile}.out.err
)
if (last_test)
set_tests_properties (H5DIFF-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5DIFF-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -398,7 +387,9 @@
-D "TEST_APPEND=EXIT CODE:"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS H5DIFF-${resultfile}-clear-objects)
if (last_test)
set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
endif ()
if (H5_HAVE_PARALLEL)
ADD_PH5_TEST (${resultfile} ${resultcode} ${ARGN})
@ -417,17 +408,6 @@
set_tests_properties (MPI_TEST_H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
else ()
# Remove any output file left over from previous test run
add_test (
NAME MPI_TEST_H5DIFF-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
PAR/testfiles/${resultfile}.out
PAR/testfiles/${resultfile}.out.err
)
if (last_test)
set_tests_properties (MPI_TEST_H5DIFF-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME MPI_TEST_H5DIFF-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -443,21 +423,15 @@
-D "TEST_SORT_COMPARE=TRUE"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (MPI_TEST_H5DIFF-${resultfile} PROPERTIES DEPENDS MPI_TEST_H5DIFF-${resultfile}-clear-objects)
if (last_test)
set_tests_properties (MPI_TEST_H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "PH5DIFF-${resultfile}")
endif ()
endmacro ()
macro (ADD_H5_UD_TEST testname resultcode resultfile)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
add_test (
NAME H5DIFF_UD-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/${resultfile}.out
testfiles/${resultfile}.out.err
)
if (${resultcode} EQUAL 2)
add_test (
NAME H5DIFF_UD-${testname}
@ -493,7 +467,9 @@
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (H5DIFF_UD-${testname} PROPERTIES DEPENDS H5DIFF_UD-${testname}-clear-objects)
if (last_test)
set_tests_properties (H5DIFF_UD-${testname} PROPERTIES DEPENDS ${last_test})
endif ()
endif ()
endmacro ()

View File

@ -414,17 +414,6 @@
endif ()
set (last_test "H5DUMP-${testname}")
else ()
# Remove any output file left over from previous test run
add_test (
NAME H5DUMP-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/std/h5dump-${testname}.out
testfiles/std/h5dump-${testname}.out.err
)
if (last_test)
set_tests_properties (H5DUMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5DUMP-${testname}
COMMAND "${CMAKE_COMMAND}"
@ -437,7 +426,9 @@
-D "TEST_REFERENCE=h5dump-${testname}.txt"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5DUMP-${testname} PROPERTIES DEPENDS H5DUMP-${testname}-clear-objects)
if (last_test)
set_tests_properties (H5DUMP-${testname} PROPERTIES DEPENDS ${last_test})
endif ()
endif ()
endmacro ()
@ -469,11 +460,7 @@
else ()
add_test (
NAME H5DUMP-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.bin
${resultfile}.out
${resultfile}.out.err
COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}.bin
)
set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
add_test (
@ -506,11 +493,7 @@
else ()
add_test (
NAME H5DUMP-N-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}-N.bin
${resultfile}-N.out
${resultfile}-N.out.err
COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}-N.bin
)
set_tests_properties (H5DUMP-N-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
add_test (
@ -543,11 +526,7 @@
else ()
add_test (
NAME H5DUMP-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.txt
${resultfile}.out
${resultfile}.out.err
COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}.txt
)
set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
add_test (
@ -566,8 +545,7 @@
if(NOT CMAKE_VERSION VERSION_LESS "3.14.0")
add_test (
NAME H5DUMP-${resultfile}-output-cmp
COMMAND ${CMAKE_COMMAND}
-E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
)
set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES DEPENDS H5DUMP-${resultfile})
@ -589,12 +567,9 @@
else ()
add_test (
NAME H5DUMP-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
COMMAND ${CMAKE_COMMAND} -E remove
${ddlfile}.txt
${resultfile}.txt
${resultfile}.out
${resultfile}.out.err
)
set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
add_test (
@ -613,15 +588,13 @@
if(NOT CMAKE_VERSION VERSION_LESS "3.14.0")
add_test (
NAME H5DUMP-${resultfile}-output-cmp
COMMAND ${CMAKE_COMMAND}
-E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
)
set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES DEPENDS H5DUMP-${resultfile})
add_test (
NAME H5DUMP-${resultfile}-output-cmp-ddl
COMMAND ${CMAKE_COMMAND}
-E compare_files --ignore-eol ${ddlfile}.txt ${ddlfile}.exp
COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${ddlfile}.txt ${ddlfile}.exp
)
set_tests_properties (H5DUMP-${resultfile}-output-cmp-ddl PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
set_tests_properties (H5DUMP-${resultfile}-output-cmp-ddl PROPERTIES DEPENDS H5DUMP-${resultfile}-output-cmp)
@ -633,8 +606,7 @@
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5DUMP-output-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove ${resultfile}.txt
COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}.txt
)
set_tests_properties (H5DUMP-output-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
add_test (
@ -646,8 +618,7 @@
if(NOT CMAKE_VERSION VERSION_LESS "3.14.0")
add_test (
NAME H5DUMP-output-cmp-${resultfile}
COMMAND ${CMAKE_COMMAND}
-E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
)
set_tests_properties (H5DUMP-output-cmp-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
set_tests_properties (H5DUMP-output-cmp-${resultfile} PROPERTIES DEPENDS H5DUMP-output-${resultfile})
@ -657,15 +628,6 @@
macro (ADD_H5_MASK_TEST resultfile resultcode)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
add_test (
NAME H5DUMP-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.out
${resultfile}.out.err
)
set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
add_test (
NAME H5DUMP-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -679,21 +641,11 @@
-D "TEST_MASK_ERROR=true"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
endif ()
endmacro ()
macro (ADD_H5_GREP_TEST resultfile resultcode result_check)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
add_test (
NAME H5DUMP-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.out
${resultfile}.out.err
)
set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
add_test (
NAME H5DUMP-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -706,21 +658,11 @@
-D "TEST_REFERENCE=${result_check}"
-P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
)
set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
endif ()
endmacro ()
macro (ADD_H5ERR_MASK_TEST resultfile resultcode result_errcheck)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
add_test (
NAME H5DUMP-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.out
${resultfile}.out.err
)
set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
add_test (
NAME H5DUMP-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -734,21 +676,11 @@
-D "TEST_ERRREF=${result_errcheck}"
-P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
)
set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
endif ()
endmacro ()
macro (ADD_H5ERR_MASK_ENV_TEST resultfile resultcode result_errcheck envvar envval)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
add_test (
NAME H5DUMP-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.out
${resultfile}.out.err
)
set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
add_test (
NAME H5DUMP-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -764,7 +696,6 @@
-D "TEST_ENV_VALUE:STRING=${envval}"
-P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
)
set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
endif ()
endmacro ()
@ -773,11 +704,9 @@
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5DUMP-IMPORT-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
COMMAND ${CMAKE_COMMAND} -E remove
${resultfile}.bin
${resultfile}.h5
${conffile}.out
)
set_tests_properties (H5DUMP-IMPORT-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
add_test (
@ -804,15 +733,6 @@
macro (ADD_H5_UD_TEST testname resultcode resultfile)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
add_test (
NAME H5DUMP_UD-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.out
${resultfile}.out.err
)
set_tests_properties (H5DUMP_UD-${testname}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
add_test (
NAME H5DUMP_UD-${testname}
COMMAND "${CMAKE_COMMAND}"
@ -828,7 +748,6 @@
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5DUMP_UD-${testname} PROPERTIES DEPENDS H5DUMP_UD-${testname}-clear-objects)
endif ()
endmacro ()
@ -838,368 +757,6 @@
##############################################################################
##############################################################################
if (HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
add_test (
NAME H5DUMP-clearall-objects
COMMAND ${CMAKE_COMMAND}
-E remove
h5dump-help.out
charsets.out
charsets.out.err
file_space.out
file_space.out.err
filter_fail.out
filter_fail.out.err
non_existing.out
non_existing.out.err
packedbits.out
packedbits.out.err
tall-1.out
tall-1.out.err
tall-2.out
tall-2.out.err
tall-2A.out
tall-2A.out.err
tall-2A0.out
tall-2A0.out.err
tall-2B.out
tall-2B.out.err
tall-3.out
tall-3.out.err
tall-4s.out
tall-4s.out.err
tall-5s.out
tall-5s.out.err
tall-6.txt
tall-6.out
tall-6.out.err
tall-7.out
tall-7.out.err
tall-7N.out
tall-7N.out.err
tallfilters.out
tallfilters.out.err
tarray1.out
tarray1.out.err
tarray1_big.out
tarray1_big.out.err
tarray2.out
tarray2.out.err
tarray3.out
tarray3.out.err
tarray4.out
tarray4.out.err
tarray5.out
tarray5.out.err
tarray6.out
tarray6.out.err
tarray7.out
tarray7.out.err
tarray8.out
tarray8.out.err
tattr-1.out
tattr-1.out.err
tattr-2.out
tattr-2.out.err
tattr-3.out
tattr-3.out.err
tattr-4_be.out
tattr-4_be.out.err
tattrcontents1.out
tattrcontents1.out.err
tattrcontents2.out
tattrcontents2.out.err
tattrintsize.out
tattrintsize.out.err
tattrreg.out
tattrreg.out.err
tattrregR.out
tattrregR.out.err
tbin1LE.bin
tbinregR.txt
tbinregR.out
tbinregR.out.err
tbigdims.out
tbigdims.out.err
tbitnopaque_be.out
tbitnopaque_be.out.err
tbitnopaque_le.out
tbitnopaque_le.out.err
tboot1.out
tboot1.out.err
tboot2.out
tboot2.out.err
tboot2A.out
tboot2A.out.err
tboot2B.out
tboot2B.out.err
tchar1.out
tchar1.out.err
tchunked.out
tchunked.out.err
tcmpdattrintsize.out
tcmpdattrintsize.out.err
tcmpdintarray.out
tcmpdintarray.out.err
tcmpdints.out
tcmpdints.out.err
tcmpdintsize.out
tcmpdintsize.out.err
tcomp-1.out
tcomp-1.out.err
tcomp-2.out
tcomp-2.out.err
tcomp-3.out
tcomp-3.out.err
tcomp-4.out
tcomp-4.out.err
tcompact.out
tcompact.out.err
tcompound_complex.out
tcompound_complex.out.err
tcontents.out
tcontents.out.err
tcontiguos.out
tcontiguos.out.err
tdatareg.out
tdatareg.out.err
tdataregR.out
tdataregR.out.err
tdeflate.out
tdeflate.out.err
tdset-1.out
tdset-1.out.err
tdset-2.out
tdset-2.out.err
tdset-3s.out
tdset-3s.out.err
tempty.out
tempty.out.err
texternal.out
texternal.out.err
textlinksrc.out
textlinksrc.out.err
textlinkfar.out
textlinkfar.out.err
textlink.out
textlink.out.err
tfamily.out
tfamily.out.err
tfill.out
tfill.out.err
tfletcher32.out
tfletcher32.out.err
tfpformat.out
tfpformat.out.err
tgroup-1.out
tgroup-1.out.err
tgroup-2.out
tgroup-2.out.err
tgrp_comments.out
tgrp_comments.out.err
tgrpnullspace.out
tgrpnullspace.out.err
thlink-1.out
thlink-1.out.err
thlink-2.out
thlink-2.out.err
thlink-3.out
thlink-3.out.err
thlink-4.out
thlink-4.out.err
thlink-5.out
thlink-5.out.err
thyperslab.out
thyperslab.out.err
tindicesno.out
tindicesno.out.err
tindicessub1.out
tindicessub1.out.err
tindicessub2.out
tindicessub2.out.err
tindicessub3.out
tindicessub3.out.err
tindicessub4.out
tindicessub4.out.err
texceedsubstart.out
texceedsubstart.out.err
texceedsubcount.out
texceedsubcount.out.err
texceedsubstride.out
texceedsubstride.out.err
texceedsubblock.out
texceedsubblock.out.err
tindicesyes.out
tindicesyes.out.err
tints4dims.out
tints4dims.out.err
tints4dimsBlock2.out
tints4dimsBlock2.out.err
tints4dimsBlockEq.out
tints4dimsBlockEq.out.err
tints4dimsCount2.out
tints4dimsCount2.out.err
tints4dimsCountEq.out
tints4dimsCountEq.out.err
tints4dimsStride2.out
tints4dimsStride2.out.err
tintsattrs.out
tintsattrs.out.err
tintsnodata.out
tintsnodata.out.err
tlarge_objname.out
tlarge_objname.out.err
tldouble.out
tldouble.out.err
tlonglinks.out
tlonglinks.out.err
tloop-1.out
tloop-1.out.err
tmulti.out
tmulti.out.err
tmultifile.out
tmultifile.out.err
# tqmarkfile.out
# tqmarkfile.out.err
# tstarfile.out
# tstarfile.out.err
tnamed_dtype_attr.out
tnamed_dtype_attr.out.err
tnbit.out
tnbit.out.err
tnestcomp-1.out
tnestcomp-1.out.err
tnestedcmpddt.out
tnestedcmpddt.out.err
tnoattrdata.out
tnoattrdata.out.err
tnoattrddl.out
tnoattrddl.out.err
tnodata.out
tnodata.out.err
tnoddl.out
tnoddl.out.err
tnoddlfile.out
tnoddlfile.out.err
tno-subset.out
tno-subset.out.err
tnullspace.out
tnullspace.out.err
tordergr1.out
tordergr1.out.err
tordergr2.out
tordergr2.out.err
tordergr3.out
tordergr3.out.err
tordergr4.out
tordergr4.out.err
tordergr5.out
tordergr5.out.err
torderattr1.out
torderattr1.out.err
torderattr2.out
torderattr2.out.err
torderattr3.out
torderattr3.out.err
torderattr4.out
torderattr4.out.err
tordercontents1.out
tordercontents1.out.err
tordercontents2.out
tordercontents2.out.err
torderlinks1.out
torderlinks1.out.err
torderlinks2.out
torderlinks2.out.err
tperror.out
tperror.out.err
trawdatafile.out
trawdatafile.out.err
trawdatafile.txt
trawssetfile.out
trawssetfile.out.err
trawssetfile.txt
treadfilter.out
treadfilter.out.err
treadintfilter.out
treadintfilter.out.err
treference.out
treference.out.err
tsaf.out
tsaf.out.err
tscalarattrintsize.out
tscalarattrintsize.out.err
tscalarintattrsize.out
tscalarintattrsize.out.err
tscalarintsize.out
tscalarintsize.out.err
tscalarstring.out
tscalarstring.out.err
tscaleoffset.out
tscaleoffset.out.err
tshuffle.out
tshuffle.out.err
tslink-1.out
tslink-1.out.err
tslink-2.out
tslink-2.out.err
tslink-D.out
tslink-D.out.err
tsplit_file.out
tsplit_file.out.err
tstr-1.out
tstr-1.out.err
tstr-2.out
tstr-2.out.err
tstr2bin2.txt
tstr2bin6.txt
tstring.out
tstring.out.err
tstring2.out
tstring2.out.err
tstringe.out
tstringe.out.err
tszip.out
tszip.out.err
tudlink-1.out
tudlink-1.out.err
tudlink-2.out
tudlink-2.out.err
tuserfilter.out
tuserfilter.out.err
tvldtypes1.out
tvldtypes1.out.err
tvldtypes2.out
tvldtypes2.out.err
tvldtypes3.out
tvldtypes3.out.err
tvldtypes4.out
tvldtypes4.out.err
tvldtypes5.out
tvldtypes5.out.err
tvlenstr_array.out
tvlenstr_array.out.err
tvlstr.out
tvlstr.out.err
tvms.out
tvms.out.err
twidedisplay.out
twidedisplay.out.err
twithddl.txt
twithddlfile.out
twithddlfile.out.err
twithddlfile.txt
zerodim.out
zerodim.out.err
)
set_tests_properties (H5DUMP-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
if (last_test)
set_tests_properties (H5DUMP-clearall-objects PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "H5DUMP-clearall-objects")
endif ()
ADD_HELP_TEST(help 0 -h)
# test data output redirection

View File

@ -137,15 +137,6 @@
set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS ${last_pbits_test})
endif ()
else ()
# Remove any output file left over from previous test run
add_test (
NAME H5DUMP-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.out
${resultfile}.out.err
)
set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/pbits")
add_test (
NAME H5DUMP-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -158,7 +149,6 @@
-D "TEST_REFERENCE=${resultfile}.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS H5DUMP-${resultfile}-clear-objects)
endif ()
endmacro ()
@ -168,126 +158,6 @@
##############################################################################
##############################################################################
if (HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
add_test (
NAME H5DUMP_PACKED_BITS-clearall-objects
COMMAND ${CMAKE_COMMAND}
-E remove
tnofilename-with-packed-bits.out
tnofilename-with-packed-bits.out.err
tpbitsArray.out
tpbitsArray.out.err
tpbitsCompound.out
tpbitsCompound.out.err
tpbitsIncomplete.out
tpbitsIncomplete.out.err
tpbitsLengthExceeded.out
tpbitsLengthExceeded.out.err
tpbitsCharLengthExceeded.out
tpbitsCharLengthExceeded.out.err
tpbitsIntLengthExceeded.out
tpbitsIntLengthExceeded.out.err
tpbitsLongLengthExceeded.out
tpbitsLongLengthExceeded.out.err
tpbitsLengthPositive.out
tpbitsLengthPositive.out.err
tpbitsMax.out
tpbitsMax.out.err
tpbitsMaxExceeded.out
tpbitsMaxExceeded.out.err
tpbitsOffsetExceeded.out
tpbitsOffsetExceeded.out.err
tpbitsCharOffsetExceeded.out
tpbitsCharOffsetExceeded.out.err
tpbitsIntOffsetExceeded.out
tpbitsIntOffsetExceeded.out.err
tpbitsLongOffsetExceeded.out
tpbitsLongOffsetExceeded.out.err
tpbitsOffsetNegative.out
tpbitsOffsetNegative.out.err
tpbitsOverlapped.out
tpbitsOverlapped.out.err
tpbitsSigned.out
tpbitsSigned.out.err
tpbitsUnsigned.out
tpbitsUnsigned.out.err
tpbitsSignedInt.out
tpbitsSignedInt.out.err
tpbitsUnsignedInt.out
tpbitsUnsignedInt.out.err
tpbitsSignedLong.out
tpbitsSignedLong.out.err
tpbitsUnsignedLong.out
tpbitsUnsignedLong.out.err
tpbitsSignedLongLong.out
tpbitsSignedLongLong.out.err
tpbitsUnsignedLongLong.out
tpbitsUnsignedLongLong.out.err
tpbitsSignedWhole.out
tpbitsSignedWhole.out.err
tpbitsUnsignedWhole.out
tpbitsUnsignedWhole.out.err
tpbitsSignedIntWhole.out
tpbitsSignedIntWhole.out.err
tpbitsUnsignedIntWhole.out
tpbitsUnsignedIntWhole.out.err
tpbitsSignedLongWhole.out
tpbitsSignedLongWhole.out.err
tpbitsUnsignedLongWhole.out
tpbitsUnsignedLongWhole.out.err
tpbitsSignedLongLongWhole.out
tpbitsSignedLongLongWhole.out.err
tpbitsUnsignedLongLongWhole.out
tpbitsUnsignedLongLongWhole.out.err
tpbitsSignedLongLongWhole1.out
tpbitsSignedLongLongWhole1.out.err
tpbitsUnsignedLongLongWhole1.out
tpbitsUnsignedLongLongWhole1.out.err
tpbitsSignedLongLongWhole63.out
tpbitsSignedLongLongWhole63.out.err
tpbitsUnsignedLongLongWhole63.out
tpbitsUnsignedLongLongWhole63.out.err
tpbitsSigned4.out
tpbitsSigned4.out.err
tpbitsUnsigned4.out
tpbitsUnsigned4.out.err
tpbitsSignedInt8.out
tpbitsSignedInt8.out.err
tpbitsUnsignedInt8.out
tpbitsUnsignedInt8.out.err
tpbitsSignedLong16.out
tpbitsSignedLong16.out.err
tpbitsUnsignedLong16.out
tpbitsUnsignedLong16.out.err
tpbitsSignedLongLong32.out
tpbitsSignedLongLong32.out.err
tpbitsUnsignedLongLong32.out
tpbitsUnsignedLongLong32.out.err
tpbitsSigned2.out
tpbitsSigned2.out.err
tpbitsUnsigned2.out
tpbitsUnsigned2.out.err
tpbitsSignedInt4.out
tpbitsSignedInt4.out.err
tpbitsUnsignedInt4.out
tpbitsUnsignedInt4.out.err
tpbitsSignedLong8.out
tpbitsSignedLong8.out.err
tpbitsUnsignedLong8.out
tpbitsUnsignedLong8.out.err
tpbitsSignedLongLong16.out
tpbitsSignedLongLong16.out.err
tpbitsUnsignedLongLong16.out
tpbitsUnsignedLongLong16.out.err
)
set_tests_properties (H5DUMP_PACKED_BITS-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/pbits")
if (last_pbits_test)
set_tests_properties (H5DUMP_PACKED_BITS-clearall-objects PROPERTIES DEPENDS ${last_pbits_test})
endif ()
set (last_pbits_test "H5DUMP_PACKED_BITS-clearall-objects")
endif ()
# test failure handling
# Missing file name
ADD_H5_PBITS_TEST (tnofilename-with-packed-bits 1 --enable-error-stack)

View File

@ -133,15 +133,6 @@
set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS ${last_VDS_test})
endif ()
else ()
# Remove any output file left over from previous test run
add_test (
NAME H5DUMP-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.out
${resultfile}.out.err
)
set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
add_test (
NAME H5DUMP-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -154,7 +145,6 @@
-D "TEST_REFERENCE=${resultfile}.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS H5DUMP-${resultfile}-clear-objects)
endif ()
endmacro ()
@ -173,15 +163,6 @@
set_tests_properties (H5DUMP_PREFIX-${resultfile} PROPERTIES DEPENDS ${last_VDS_test})
endif ()
else ()
# Remove any output file left over from previous test run
add_test (
NAME H5DUMP_PREFIX-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.out
${resultfile}.out.err
)
set_tests_properties (H5DUMP_PREFIX-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds/prefix")
add_test (
NAME H5DUMP_PREFIX-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -196,7 +177,6 @@
-D "TEST_ENV_VALUE=${PROJECT_BINARY_DIR}/testfiles/vds/"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5DUMP_PREFIX-${resultfile} PROPERTIES DEPENDS H5DUMP_PREFIX-${resultfile}-clear-objects)
endif ()
endmacro ()
@ -212,15 +192,6 @@
set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS ${last_VDS_test})
endif ()
else ()
# Remove any output file left over from previous test run
add_test (
NAME H5DUMP-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.out
${resultfile}.out.err
)
set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
add_test (
NAME H5DUMP-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -233,7 +204,6 @@
-D "TEST_REFERENCE=${resultfile}.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
endif ()
endmacro ()
@ -243,54 +213,6 @@
##############################################################################
##############################################################################
if (HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
add_test (
NAME H5DUMP_VDS-clearall-objects
COMMAND ${CMAKE_COMMAND}
-E remove
tvds-1.out
tvds-1.out.err
tvds-2.out
tvds-2.out.err
tvds-3_1.out
tvds-3_1.out.err
tvds-3_2.out
tvds-3_2.out.err
tvds-4.out
tvds-4.out.err
tvds-5.out
tvds-5.out.err
vds-first.out
vds-first.out.err
vds-gap1.out
vds-gap1.out.err
vds-gap2.out
vds-gap2.out.err
tvds_layout-1.out
tvds_layout-1.out.err
tvds_layout-2.out
tvds_layout-2.out.err
tvds_layout-3_1.out
tvds_layout-3_1.out.err
tvds_layout-3_2.out
tvds_layout-3_2.out.err
tvds_layout-4.out
tvds_layout-4.out.err
tvds_layout-5.out
tvds_layout-5.out.err
vds_layout-eiger.out
vds_layout-eiger.out.err
vds_layout-maxmin.out
vds_layout-maxmin.out.err
)
set_tests_properties (H5DUMP_VDS-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
if (last_vds_test)
set_tests_properties (H5DUMP_VDS-clearall-objects PROPERTIES DEPENDS ${last_vds_test})
endif ()
set (last_VDS_test "H5DUMP_VDS-clearall-objects")
endif ()
# See which filters are usable (and skip tests for filters we
# don't have). Do this by searching H5pubconf.h to see which
# filters are defined.

View File

@ -191,15 +191,6 @@
set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES DEPENDS ${last_xml_test})
endif ()
else ()
# Remove any output file left over from previous test run
add_test (
NAME H5DUMP_XML-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.out
${resultfile}.out.err
)
set_tests_properties (H5DUMP_XML-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/xml")
add_test (
NAME H5DUMP_XML-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -212,7 +203,6 @@
-D "TEST_REFERENCE=${resultfile}.xml"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES DEPENDS H5DUMP_XML-${resultfile}-clear-objects)
endif ()
endmacro ()
@ -222,154 +212,6 @@
##############################################################################
##############################################################################
if (HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
add_test (
NAME H5DUMP-XML-clearall-objects
COMMAND ${CMAKE_COMMAND}
-E remove
tall.h5.out
tall.h5.out.err
tall-2A.h5.out
tall-2A.h5.out.err
tarray1.h5.out
tarray1.h5.out.err
tarray2.h5.out
tarray2.h5.out.err
tarray3.h5.out
tarray3.h5.out.err
tarray6.h5.out
tarray6.h5.out.err
tarray7.h5.out
tarray7.h5.out.err
tattr.h5.out
tattr.h5.out.err
tbitfields_be.h5.out
tbitfields_be.h5.out.err
tbitfields_le.h5.out
tbitfields_le.h5.out.err
tcompound.h5.out
tcompound.h5.out.err
tcompound2.h5.out
tcompound2.h5.out.err
tcompound_complex.h5.out
tcompound_complex.h5.out.err
tdatareg.h5.out
tdatareg.h5.out.err
tdset.h5.out
tdset.h5.out.err
tdset2.h5.out
tdset2.h5.out.err
tempty-dtd-2.h5.out
tempty-dtd-2.h5.out.err
tempty-dtd-uri.h5.out
tempty-dtd-uri.h5.out.err
tempty-dtd.h5.out
tempty-dtd.h5.out.err
tempty-nons-2.h5.out
tempty-nons-2.h5.out.err
tempty-nons-uri.h5.out
tempty-nons-uri.h5.out.err
tempty-nons.h5.out
tempty-nons.h5.out.err
tempty-ns-2.h5.out
tempty-ns-2.h5.out.err
tempty-ns.h5.out
tempty-ns.h5.out.err
tempty.h5.out
tempty.h5.out.err
tenum.h5.out
tenum.h5.out.err
test35.nc.out
test35.nc.out.err
textlink.h5.out
textlink.h5.out.err
tfpformat.h5.out
tfpformat.h5.out.err
tgroup.h5.out
tgroup.h5.out.err
thlink.h5.out
thlink.h5.out.err
tloop.h5.out
tloop.h5.out.err
tloop2.h5.out
tloop2.h5.out.err
tmany.h5.out
tmany.h5.out.err
tname-amp.h5.out
tname-amp.h5.out.err
tname-apos.h5.out
tname-apos.h5.out.err
tname-gt.h5.out
tname-gt.h5.out.err
tname-lt.h5.out
tname-lt.h5.out.err
tname-quot.h5.out
tname-quot.h5.out.err
tname-sp.h5.out
tname-sp.h5.out.err
tnamed_dtype_attr.h5.out
tnamed_dtype_attr.h5.out.err
tnestedcomp.h5.out
tnestedcomp.h5.out.err
tnodata.h5.out
tnodata.h5.out.err
tnoname.h5.out
tnoname.h5.out.err
tnullspace.h5.out
tnullspace.h5.out.err
tobjref.h5.out
tobjref.h5.out.err
topaque.h5.out
topaque.h5.out.err
torderattr1.h5.out
torderattr1.h5.out.err
torderattr2.h5.out
torderattr2.h5.out.err
torderattr3.h5.out
torderattr3.h5.out.err
torderattr4.h5.out
torderattr4.h5.out.err
tref-escapes-at.h5.out
tref-escapes-at.h5.out.err
tref-escapes.h5.out
tref-escapes.h5.out.err
tref.h5.out
tref.h5.out.err
tsaf.h5.out
tsaf.h5.out.err
tslink.h5.out
tslink.h5.out.err
tstr.h5.out
tstr.h5.out.err
tstr2.h5.out
tstr2.h5.out.err
tstring.h5.out
tstring.h5.out.err
tstring-at.h5.out
tstring-at.h5.out.err
tudlink.h5.out
tudlink.h5.out.err
tvldtypes1.h5.out
tvldtypes1.h5.out.err
tvldtypes2.h5.out
tvldtypes2.h5.out.err
tvldtypes3.h5.out
tvldtypes3.h5.out.err
tvldtypes4.h5.out
tvldtypes4.h5.out.err
tvldtypes5.h5.out
tvldtypes5.h5.out.err
tvlstr.h5.out
tvlstr.h5.out.err
)
set_tests_properties (H5DUMP-XML-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/xml")
if (last_xml_test)
set_tests_properties (H5DUMP-XML-clearall-objects PROPERTIES DEPENDS ${last_xml_test})
endif ()
set (last_test "H5DUMP-XML-clearall-objects")
endif ()
########## test XML
ADD_XML_H5_TEST (tall.h5 0 tall.h5)
ADD_XML_H5_TEST (tattr.h5 0 tattr.h5)

View File

@ -108,11 +108,7 @@
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5FC-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
./testfiles/outtmp.h5
./testfiles/${testname}.out
./testfiles/${testname}.out.err
COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/outtmp.h5
)
if (last_test)
set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
@ -120,8 +116,7 @@
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/outtmp.h5
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/outtmp.h5
)
set_tests_properties (H5FC-${testname}-${testfile}-tmpfile PROPERTIES DEPENDS "H5FC-${testname}-clear-objects")
add_test (
@ -163,19 +158,14 @@
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5FC-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
./testfiles/outtmp.h5
./testfiles/${testname}.out
./testfiles/${testname}.out.err
COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/outtmp.h5
)
if (last_test)
set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5FC-${testname}-${testfile}-tmpfile
COMMAND ${CMAKE_COMMAND}
-E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/outtmp.h5
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/outtmp.h5
)
set_tests_properties (H5FC-${testname}-${testfile}-tmpfile PROPERTIES DEPENDS "H5FC-${testname}-clear-objects")
add_test (
@ -200,19 +190,14 @@
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5FC-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
./testfiles/outtmp.h5
./testfiles/${testname}.out
./testfiles/${testname}.out.err
COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/outtmp.h5
)
if (last_test)
set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5FC-${testname}-${testfile}-tmpfile
COMMAND ${CMAKE_COMMAND}
-E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/outtmp.h5
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/outtmp.h5
)
set_tests_properties (H5FC-${testname}-${testfile}-tmpfile PROPERTIES DEPENDS "H5FC-${testname}-clear-objects")
add_test (
@ -238,19 +223,14 @@
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5FC-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
./testfiles/tmp.h5
./testfiles/${testname}.out
./testfiles/${testname}.out.err
COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/tmp.h5
)
if (last_test)
set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5FC-${testname}-tmpfile
COMMAND ${CMAKE_COMMAND}
-E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} testfiles/tmp.h5
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} testfiles/tmp.h5
)
set_tests_properties (H5FC-${testname}-tmpfile PROPERTIES DEPENDS "H5FC-${testname}-clear-objects")
add_test (
@ -286,19 +266,14 @@
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5FC-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
./testfiles/chktmp.h5
./testfiles/${testname}.out
./testfiles/${testname}.out.err
COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/chktmp.h5
)
if (last_test)
set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5FC-${testname}-tmpfile
COMMAND ${CMAKE_COMMAND}
-E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} testfiles/chktmp.h5
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} testfiles/chktmp.h5
)
set_tests_properties (H5FC-${testname}-tmpfile PROPERTIES DEPENDS "H5FC-${testname}-clear-objects")
add_test (
@ -324,25 +299,18 @@
endmacro ()
macro (ADD_H5_H5DUMP_CHECK testname)
# If using memchecker add tests without using scripts
# If using memchecker skip tests
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5FC-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
./testfiles/dmptmp.h5
./testfiles/${testname}.out
./testfiles/${testname}.out.err
./testfiles/${testname}_chk.out
./testfiles/${testname}_chk.out.err
COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/dmptmp.h5
)
if (last_test)
set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5FC-${testname}-tmpfile
COMMAND ${CMAKE_COMMAND}
-E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testname}.h5 testfiles/dmptmp.h5
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testname}.h5 testfiles/dmptmp.h5
)
set_tests_properties (H5FC-${testname}-tmpfile PROPERTIES DEPENDS "H5FC-${testname}-clear-objects")
add_test (
@ -385,60 +353,7 @@
# Remove any output file left over from previous test run
add_test (
NAME H5FC-clearall-objects
COMMAND ${CMAKE_COMMAND}
-E remove
h5fc_help.out
h5fc_help.out.err
h5fc_nooption.out
h5fc_nooption.out.err
h5fc_nonexistfile.out
h5fc_nonexistfile.out.err
h5fc_d_file.out
h5fc_d_file.out.err
h5fc_d_file-d.out
h5fc_d_file-d.out.err
h5fc_dname.out
h5fc_dname.out.err
h5fc_nonexistdset_file.out
h5fc_nonexistdset_file.out.err
h5fc_v_non_chunked.out
h5fc_v_non_chunked.out.err
h5fc_v_bt1.out
h5fc_v_bt1.out.err
h5fc_v_ndata_bt1.out
h5fc_v_ndata_bt1.out.err
h5fc_v_all.out
h5fc_v_all.out.err
h5fc_v_n_1d.out
h5fc_v_n_1d.out.err
h5fc_v_n_all.out
h5fc_v_n_all.out.err
h5fc_ext1_i.out
h5fc_ext1_i.out.err
h5fc_ext1_s.out
h5fc_ext1_s.out.err
h5fc_ext1_f.out
h5fc_ext1_f.out.err
h5fc_ext2_if.out
h5fc_ext2_if.out.err
h5fc_ext2_is.out
h5fc_ext2_is.out.err
h5fc_ext2_sf.out
h5fc_ext2_sf.out.err
h5fc_ext3_isf.out
h5fc_ext3_isf.out.err
old_h5fc_ext1_i.out
old_h5fc_ext1_i.out.err
old_h5fc_ext1_s.out
old_h5fc_ext1_s.out.err
old_h5fc_ext1_f.out
old_h5fc_ext1_f.out.err
old_h5fc_ext2_if.out
old_h5fc_ext2_is.out.err
old_h5fc_ext2_is.out
old_h5fc_ext2_sf.out.err
old_h5fc_ext3_isf.out
old_h5fc_ext3_isf.out.err
COMMAND ${CMAKE_COMMAND} -E remove
outtmp.h5
tmp.h5
chktmp.h5

View File

@ -106,25 +106,22 @@
# If using memchecker skip macro based tests
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME H5IMPORT-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5import${tgt_ext}> ${importfile} -c ${conffile} -o ${testfile})
if (last_test)
set_tests_properties (H5IMPORT-${testname} PROPERTIES DEPENDS H5IMPORT-h5importtest)
endif ()
set_tests_properties (H5IMPORT-${testname} PROPERTIES
FIXTURES_REQUIRED set_h5importtest
)
else ()
add_test (
NAME H5IMPORT-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${testfile}
${testfile}.new
${testfile}.new.err
${testfile}.out
${testfile}.out.err
${testfile}
COMMAND ${CMAKE_COMMAND} -E remove ${testfile}
)
set_tests_properties (H5IMPORT-${testname}-clear-objects PROPERTIES
FIXTURES_REQUIRED set_h5importtest
)
set_tests_properties (H5IMPORT-${testname}-clear-objects PROPERTIES DEPENDS H5IMPORT-h5importtest)
add_test (NAME H5IMPORT-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5import${tgt_ext}> ${importfile} -c ${conffile} -o ${testfile})
set_tests_properties (H5IMPORT-${testname} PROPERTIES DEPENDS H5IMPORT-${testname}-clear-objects)
set_tests_properties (H5IMPORT-${testname} PROPERTIES
DEPENDS H5IMPORT-${testname}-clear-objects
)
add_test (
NAME H5IMPORT-${testname}-H5DMP
@ -139,7 +136,9 @@
-D "TEST_SKIP_COMPARE=TRUE"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5IMPORT-${testname}-H5DMP PROPERTIES DEPENDS H5IMPORT-${testname})
set_tests_properties (H5IMPORT-${testname}-H5DMP PROPERTIES
DEPENDS H5IMPORT-${testname}
)
add_test (
NAME H5IMPORT-${testname}-H5DMP_CMP
COMMAND "${CMAKE_COMMAND}"
@ -153,7 +152,9 @@
-D "TEST_REFERENCE=${testfile}.new"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5IMPORT-${testname}-H5DMP_CMP PROPERTIES DEPENDS H5IMPORT-${testname}-H5DMP)
set_tests_properties (H5IMPORT-${testname}-H5DMP_CMP PROPERTIES
DEPENDS H5IMPORT-${testname}-H5DMP
)
endif ()
endmacro ()
@ -162,18 +163,13 @@
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5IMPORT-DUMP-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
COMMAND ${CMAKE_COMMAND} -E remove
d${testfile}
d${testfile}.bin
d${testfile}.dmp
d${testfile}.dmp.err
d${testfile}.imp
d${testfile}.imp.err
d${testfile}.dff
d${testfile}.dff.err
)
set_tests_properties (H5IMPORT-DUMP-${testname}-clear-objects PROPERTIES DEPENDS H5IMPORT-h5importtest)
set_tests_properties (H5IMPORT-DUMP-${testname}-clear-objects PROPERTIES
DEPENDS H5IMPORT-${testname}-H5DMP_CMP
)
if ("${ARGN}" STREQUAL "BINARY")
add_test (
@ -202,7 +198,9 @@
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (H5IMPORT-DUMP-${testname}-H5DMP PROPERTIES DEPENDS "H5IMPORT-DUMP-${testname}-clear-objects")
set_tests_properties (H5IMPORT-DUMP-${testname}-H5DMP PROPERTIES
DEPENDS "H5IMPORT-DUMP-${testname}-clear-objects"
)
add_test (
NAME H5IMPORT-DUMP-${testname}
@ -216,7 +214,9 @@
-D "TEST_SKIP_COMPARE=TRUE"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5IMPORT-DUMP-${testname} PROPERTIES DEPENDS "H5IMPORT-DUMP-${testname}-H5DMP")
set_tests_properties (H5IMPORT-DUMP-${testname} PROPERTIES
DEPENDS "H5IMPORT-DUMP-${testname}-H5DMP"
)
add_test (
NAME H5IMPORT-DUMP-${testname}-H5DFF
@ -231,7 +231,9 @@
-D "TEST_REFERENCE=testfiles/d${testfile}.txt"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5IMPORT-DUMP-${testname}-H5DFF PROPERTIES DEPENDS "H5IMPORT-DUMP-${testname}")
set_tests_properties (H5IMPORT-DUMP-${testname}-H5DFF PROPERTIES
DEPENDS "H5IMPORT-DUMP-${testname}"
)
endif ()
endmacro ()
@ -240,18 +242,13 @@
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5IMPORT_SUB-DUMP-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
d-${testname}.dmp
d-${testname}.dmp.err
COMMAND ${CMAKE_COMMAND} -E remove
d-${testname}.h5
${testname}.dmp
${testname}.dmp.err
${testname}.imp
${testname}.imp.err
${testname}.bin
)
set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-clear-objects PROPERTIES DEPENDS H5IMPORT-h5importtest)
set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-clear-objects PROPERTIES
FIXTURES_REQUIRED set_h5importtest
)
add_test (
NAME H5IMPORT_SUB-DUMP-${testname}-H5DMP
@ -265,7 +262,9 @@
-D "TEST_SKIP_COMPARE=TRUE"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-H5DMP PROPERTIES DEPENDS "H5IMPORT_SUB-DUMP-${testname}-clear-objects")
set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-H5DMP PROPERTIES
DEPENDS "H5IMPORT_SUB-DUMP-${testname}-clear-objects"
)
add_test (
NAME H5IMPORT_SUB-DUMP-${testname}-H5IMP
@ -279,7 +278,9 @@
-D "TEST_SKIP_COMPARE=TRUE"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-H5IMP PROPERTIES DEPENDS "H5IMPORT_SUB-DUMP-${testname}-H5DMP")
set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-H5IMP PROPERTIES
DEPENDS "H5IMPORT_SUB-DUMP-${testname}-H5DMP"
)
add_test (
NAME H5IMPORT_SUB-DUMP-${testname}-CMP
COMMAND "${CMAKE_COMMAND}"
@ -292,7 +293,9 @@
-D "TEST_REFERENCE=testfiles/${testname}.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-CMP PROPERTIES DEPENDS "H5IMPORT_SUB-DUMP-${testname}-H5IMP")
set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-CMP PROPERTIES
DEPENDS "H5IMPORT_SUB-DUMP-${testname}-H5IMP"
)
endif ()
endmacro ()
@ -323,8 +326,7 @@
# Remove any output file left over from previous test run
add_test (
NAME H5IMPORT-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
COMMAND ${CMAKE_COMMAND} -E remove
binfp64.bin
binin8.bin
binin8w.bin
@ -333,164 +335,40 @@
binuin16.bin
binuin32.bin
txtin32.h5
txtin32.h5.new
txtin32.h5.new.err
txtin32.h5.out
txtin32.h5.out.err
txtin16.h5
txtin16.h5.new
txtin16.h5.new.err
txtin16.h5.out
txtin16.h5.out.err
txtin8.h5
txtin8.h5.new
txtin8.h5.new.err
txtin8.h5.out
txtin8.h5.out.err
txtuin16.h5
txtuin16.h5.new
txtuin16.h5.new.err
txtuin16.h5.out
txtuin16.h5.out.err
txtuin32.h5
txtuin32.h5.new
txtuin32.h5.new.err
txtuin32.h5.out
txtuin32.h5.out.err
txtfp32.h5
txtfp32.h5.new
txtfp32.h5.new.err
txtfp32.h5.out
txtfp32.h5.out.err
txtfp64.h5
txtfp64.h5.new
txtfp64.h5.new.err
txtfp64.h5.out
txtfp64.h5.out.err
binfp64.h5
binfp64.h5.new
binfp64.h5.new.err
binfp64.h5.out
binfp64.h5.out.err
binin8.h5
binin8.h5.new
binin8.h5.new.err
binin8.h5.out
binin8.h5.out.err
binin8w.h5
binin8w.h5.new
binin8w.h5.new.err
binin8w.h5.out
binin8w.h5.out.err
binin16.h5
binin16.h5.new
binin16.h5.new.err
binin16.h5.out
binin16.h5.out.err
binin32.h5
binin32.h5.new
binin32.h5.new.err
binin32.h5.out
binin32.h5.out.err
binuin16.h5
binuin16.h5.new
binuin16.h5.new.err
binuin16.h5.out
binuin16.h5.out.err
binuin32.h5
binuin32.h5.new
binuin32.h5.new.err
binuin32.h5.out
binuin32.h5.out.err
txtstr.h5
txtstr.h5.new
txtstr.h5.new.err
txtstr.h5.out
txtstr.h5.out.err
textpfe.h5
textpfe.h5.new
textpfe.h5.new.err
textpfe.h5.out
textpfe.h5.out.err
dbinfp64.h5
dbinfp64.h5.bin
dbinfp64.h5.imp
dbinfp64.h5.imp.err
dbinfp64.h5.dmp
dbinfp64.h5.dmp.err
dbinfp64.h5.dff
dbinfp64.h5.dff.err
dbinin8.h5
dbinin8.h5.bin
dbinin8.h5.imp
dbinin8.h5.imp.err
dbinin8.h5.dmp
dbinin8.h5.dmp.err
dbinin8.h5.dff
dbinin8.h5.dff.err
dbinin8w.h5
dbinin8w.h5.bin
dbinin8w.h5.imp
dbinin8w.h5.imp.err
dbinin8w.h5.dmp
dbinin8w.h5.dmp.err
dbinin8w.h5.dff
dbinin8w.h5.dff.err
dbinin16.h5
dbinin16.h5.bin
dbinin16.h5.imp
dbinin16.h5.imp.err
dbinin16.h5.dmp
dbinin16.h5.dmp.err
dbinin16.h5.dff
dbinin16.h5.dff.err
dbinin32.h5
dbinin32.h5.bin
dbinin32.h5.imp
dbinin32.h5.imp.err
dbinin32.h5.dmp
dbinin32.h5.dmp.err
dbinin32.h5.dff
dbinin32.h5.dff.err
dbinuin16.h5
dbinuin16.h5.bin
dbinuin16.h5.imp
dbinuin16.h5.imp.err
dbinuin16.h5.dmp
dbinuin16.h5.dmp.err
dbinuin16.h5.dff
dbinuin16.h5.dff.err
dbinuin32.h5
dbinuin32.h5.bin
dbinuin32.h5.imp
dbinuin32.h5.imp.err
dbinuin32.h5.dmp
dbinuin32.h5.dmp.err
dbinuin32.h5.dff
dbinuin32.h5.dff.err
dtxtstr.h5
dtxtstr.h5.bin
dtxtstr.h5.imp
dtxtstr.h5.imp.err
dtxtstr.h5.dmp
dtxtstr.h5.dmp.err
dtxtstr.h5.dff
dtxtstr.h5.dff.err
tall_fp32.dmp
tall_fp32.dmp.err
tall_fp32.bin
tall_fp32.imp
tall_fp32.imp.err
d-tall_fp32.dmp
d-tall_fp32.dmp.err
d-tall_fp32.h5
tall_i32.dmp
tall_i32.dmp.err
tall_i32.bin
tall_i32.imp
tall_i32.imp.err
d-tall_i32.dmp
d-tall_i32.dmp.err
d-tall_i32.h5
)
set (last_test "H5IMPORT-clear-objects")
@ -498,8 +376,7 @@
add_test (
NAME H5IMPORT-h5importtest-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
COMMAND ${CMAKE_COMMAND} -E remove
binfp64.bin
binfp64.conf
binin8.bin
@ -515,13 +392,12 @@
binuin32.bin
binuin32.conf
)
if (last_test)
set_tests_properties (H5IMPORT-h5importtest-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "H5IMPORT-clear-objects")
add_test (NAME H5IMPORT-h5importtest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5importtest>)
set_tests_properties (H5IMPORT-h5importtest PROPERTIES DEPENDS H5IMPORT-h5importtest-clear-objects)
set_tests_properties (H5IMPORT-h5importtest PROPERTIES
FIXTURES_SETUP set_h5importtest
DEPENDS H5IMPORT-h5importtest-clear-objects
)
# ----- TESTING "ASCII I32 rank 3 - Output BE " ;
ADD_H5_TEST (ASCII_I32 testfiles/txtin32.txt testfiles/txtin32.conf txtin32.h5)

View File

@ -65,13 +65,6 @@
set_tests_properties (H5JAM-${expectfile} PROPERTIES WILL_FAIL "true")
endif ()
else ()
add_test (
NAME H5JAM-${expectfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${expectfile}.out
${expectfile}.out.err
)
add_test (
NAME H5JAM-${expectfile}
COMMAND "${CMAKE_COMMAND}"
@ -86,7 +79,6 @@
-D "TEST_REFERENCE=testfiles/${expectfile}.txt"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5JAM-${expectfile} PROPERTIES DEPENDS "H5JAM-${expectfile}-clear-objects")
endif ()
endmacro ()
@ -102,13 +94,6 @@
set_tests_properties (H5JAM-UNJAM-${expectfile} PROPERTIES WILL_FAIL "true")
endif ()
else ()
add_test (
NAME H5JAM-UNJAM-${expectfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${expectfile}.out
${expectfile}.out.err
)
add_test (
NAME H5JAM-UNJAM-${expectfile}
COMMAND "${CMAKE_COMMAND}"
@ -121,23 +106,12 @@
-D "TEST_REFERENCE=testfiles/${expectfile}.txt"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5JAM-UNJAM-${expectfile} PROPERTIES DEPENDS "H5JAM-UNJAM-${expectfile}-clear-objects")
endif ()
endmacro ()
macro (CHECKFILE testname testdepends expected actual)
# If using memchecker add tests without using scripts
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5JAM-${testname}-CHECKFILE-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${actual}.new
${actual}.new.err
${actual}.out
${actual}.out.err
)
set_tests_properties (H5JAM-${testname}-CHECKFILE-clear-objects PROPERTIES DEPENDS ${testdepends})
add_test (
NAME H5JAM-${testname}-CHECKFILE-H5DMP
COMMAND "${CMAKE_COMMAND}"
@ -151,7 +125,7 @@
-D "TEST_SKIP_COMPARE=TRUE"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP PROPERTIES DEPENDS H5JAM-${testname}-CHECKFILE-clear-objects)
set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP PROPERTIES DEPENDS ${testdepends})
add_test (
NAME H5JAM-${testname}-CHECKFILE-H5DMP_CMP
COMMAND "${CMAKE_COMMAND}"
@ -219,8 +193,7 @@
if (${compare_test})
add_test (
NAME H5JAM-${testname}-UNJAM-CHECK_UB_1-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
COMMAND ${CMAKE_COMMAND} -E remove
${infile}.len.txt
${infile}.cmp
${infile}-ub.cmp
@ -285,8 +258,7 @@
add_test (
NAME H5JAM-${testname}-CHECK_UB_1-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
COMMAND ${CMAKE_COMMAND} -E remove
${compare_test}.len.txt
${compare_test}.cmp
${compare_test}-ub.cmp
@ -341,8 +313,7 @@
add_test (
NAME H5JAM-${testname}_NONE-CHECK_UB_1-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
COMMAND ${CMAKE_COMMAND} -E remove
${compare_test}.len.txt
${compare_test}.cmp
${compare_test}-ub.cmp

View File

@ -148,18 +148,8 @@
if (${resultcode} EQUAL 1)
set_tests_properties (H5LS-${resultfile} PROPERTIES WILL_FAIL "true")
endif ()
if (last_test)
set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
else ()
# Remove any output file left over from previous test run
add_test (
NAME H5LS-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/${resultfile}.out
testfiles/${resultfile}.out.err
)
add_test (
NAME H5LS-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -172,7 +162,6 @@
-D "TEST_REFERENCE=${resultfile}.ls"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS H5LS-${resultfile}-clear-objects)
endif ()
endmacro ()
@ -184,18 +173,7 @@
if (${resultcode} EQUAL 1)
set_tests_properties (H5LS-${resultfile} PROPERTIES WILL_FAIL "true")
endif ()
if (last_test)
set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
else ()
# Remove any output file left over from previous test run
add_test (
NAME H5LS-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/${resultfile}.out
testfiles/${resultfile}.out.err
)
add_test (
NAME H5LS-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -209,20 +187,11 @@
-D "TEST_ERRREF=${resultfile}.err"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS H5LS-${resultfile}-clear-objects)
endif ()
endmacro ()
macro (ADD_H5_UD_TEST testname resultcode resultfile)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
add_test (
NAME H5LS_UD-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/${resultfile}.out
testfiles/${resultfile}.out.err
)
add_test (
NAME H5LS_UD-${testname}
COMMAND "${CMAKE_COMMAND}"
@ -238,7 +207,6 @@
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5LS_UD-${testname} PROPERTIES DEPENDS H5LS_UD-${testname}-clear-objects)
endif ()
endmacro ()
@ -248,128 +216,6 @@
##############################################################################
##############################################################################
if (HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
add_test (
NAME H5LS-clearall-objects
COMMAND ${CMAKE_COMMAND}
-E remove
help-1.out
help-1.out.err
help-2.out
help-2.out.err
help-3.out
help-3.out.err
nosuchfile.out
nosuchfile.out.err
tall-1.out
tall-1.out.err
tall-2.out
tall-2.out.err
tarray1.out
tarray1.out.err
tattr2.out
tattr2.out.err
tcomp-1.out
tcomp-1.out.err
tdataregbe.out
tdataregbe.out.err
tdataregle.out
tdataregle.out.err
tdset-1.out
tdset-1.out.err
tempty.out
tempty.out.err
textlink-1.out
textlink-1.out.err
textlinksrc-1.out
textlinksrc-1.out.err
textlinksrc-2.out
textlinksrc-2.out.err
textlinksrc-3.out
textlinksrc-3.out.err
textlinksrc-4.out
textlinksrc-4.out.err
textlinksrc-5.out
textlinksrc-5.out.err
textlinksrc-6.out
textlinksrc-6.out.err
textlinksrc-7.out
textlinksrc-7.out.err
textlinksrc-1-old.out
textlinksrc-1-old.out.err
textlinksrc-2-old.out
textlinksrc-2-old.out.err
textlinksrc-3-old.out
textlinksrc-3-old.out.err
textlinksrc-6-old.out
textlinksrc-6-old.out.err
textlinksrc-7-old.out
textlinksrc-7-old.out.err
tgrp_comments.out
tgrp_comments.out.err
tgrpnullspace.out
tgrpnullspace.out.err
tsoftlinks-1.out
tsoftlinks-1.out.err
tsoftlinks-2.out
tsoftlinks-2.out.err
tsoftlinks-3.out
tsoftlinks-3.out.err
tsoftlinks-4.out
tsoftlinks-4.out.err
tsoftlinks-5.out
tsoftlinks-5.out.err
textlinksrc-nodangle-1.out
textlinksrc-nodangle-1.out.err
textlinksrc-nodangle-2.out
textlinksrc-nodangle-2.out.err
tsoftlinks-nodangle-1.out
tsoftlinks-nodangle-1.out.err
thlinks-nodangle-1.out
thlinks-nodangle-1.out.err
tgroup.out
tgroup.out.err
tgroup-1.out
tgroup-1.out.err
tgroup-2.out
tgroup-2.out.err
tgroup-3.out
tgroup-3.out.err
thlink-1.out
thlink-1.out.err
tloop-1.out
tloop-1.out.err
tnestcomp-1.out
tnestcomp-1.out.err
tnestcomp-2.out
tnestcomp-2.out.err
tnestcomp-3.out
tnestcomp-3.out.err
tnestcomp-4.out
tnestcomp-4.out.err
tsaf.out
tsaf.out.err
tslink-1.out
tslink-1.out.err
tstr-1.out
tstr-1.out.err
tudlink-1.out
tudlink-1.out.err
tvldtypes1.out
tvldtypes1.out.err
tvldtypes2le.out
tvldtypes2le.out.err
tvldtypes2be.out
tvldtypes2be.out.err
)
set_tests_properties (H5LS-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
if (last_test)
set_tests_properties (H5LS-clearall-objects PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "H5LS-clearall-objects")
endif ()
# See which filters are usable (and skip tests for filters we
# don't have). Do this by searching H5pubconf.h to see which
# filters are defined.

View File

@ -94,18 +94,7 @@
if (${resultcode} EQUAL 1)
set_tests_properties (H5LS-${resultfile} PROPERTIES WILL_FAIL "true")
endif ()
if (last_test)
set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
else ()
add_test (
NAME H5LS-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.out
${resultfile}.out.err
)
set_tests_properties (H5LS-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
add_test (
NAME H5LS-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -118,7 +107,6 @@
-D "TEST_REFERENCE=${resultfile}.ls"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS H5LS-${resultfile}-clear-objects)
endif ()
endmacro ()
@ -133,18 +121,7 @@
if (${resultcode} EQUAL 1)
set_tests_properties (H5LS_PREFIX-${resultfile} PROPERTIES WILL_FAIL "true")
endif ()
if (last_test)
set_tests_properties (H5LS_PREFIX-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
else ()
add_test (
NAME H5LS_PREFIX-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.out
${resultfile}.out.err
)
set_tests_properties (H5LS_PREFIX-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds/prefix")
add_test (
NAME H5LS_PREFIX-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -159,7 +136,6 @@
-D "TEST_ENV_VALUE=\${ORIGIN}"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5LS_PREFIX-${resultfile} PROPERTIES DEPENDS H5LS_PREFIX-${resultfile}-clear-objects)
endif ()
endmacro ()
@ -169,44 +145,6 @@
##############################################################################
##############################################################################
if (HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
add_test (
NAME H5LS_VDS-clearall-objects
COMMAND ${CMAKE_COMMAND}
-E remove
tvds-1.out
tvds-1.out.err
tvds-2.out
tvds-2.out.err
tvds-3_1.out
tvds-3_1.out.err
tvds-3_2.out
tvds-3_2.out.err
tvds-4.out
tvds-4.out.err
tvds-5.out
tvds-5.out.err
tvds_layout-1.out
tvds_layout-1.out.err
tvds_layout-2.out
tvds_layout-2.out.err
tvds_layout-3_1.out
tvds_layout-3_1.out.err
tvds_layout-3_2.out
tvds_layout-3_2.out.err
tvds_layout-4.out
tvds_layout-4.out.err
tvds_layout-5.out
tvds_layout-5.out.err
)
set_tests_properties (H5LS_VDS-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
if (last_test)
set_tests_properties (H5LS_VDS-clearall-objects PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "H5LS_VDS-clearall-objects")
endif ()
ADD_H5_VDS_TEST (tvds-1 0 -w80 -v -S 1_vds.h5)
ADD_H5_VDS_TEST (tvds-2 0 -w80 -v -S 2_vds.h5)
ADD_H5_VDS_TEST (tvds-3_1 0 -w80 -v -S 3_1_vds.h5)

View File

@ -167,22 +167,10 @@
# If using memchecker add tests without using scripts
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME H5REPACK-h5repack-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN})
set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
if (last_test)
set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "H5REPACK-h5repack-${testname}")
else ()
add_test (
NAME H5REPACK-h5repack-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/h5repack-${testname}.out
testfiles/h5repack-${testname}.out.err
set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
)
if (last_test)
set_tests_properties (H5REPACK-h5repack-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
else ()
add_test (
NAME H5REPACK-h5repack-${testname}
COMMAND "${CMAKE_COMMAND}"
@ -195,39 +183,43 @@
-D "TEST_REFERENCE=h5repack-${testname}.txt"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES DEPENDS H5REPACK-h5repack-${testname}-clear-objects)
endif ()
set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES
FIXTURES_REQUIRED clear_h5repack
)
endmacro ()
macro (ADD_H5_TEST_OLD testname testtype testfile)
if ("${testtype}" STREQUAL "SKIP")
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
if ("${testtype}" STREQUAL "SKIP")
add_test (
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)
else ()
add_test (
NAME H5REPACK_OLD-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile}
)
set_tests_properties (H5REPACK_OLD-${testname}-clear-objects PROPERTIES
FIXTURES_REQUIRED clear_h5repack
)
add_test (
NAME H5REPACK_OLD-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN} -i ${PROJECT_BINARY_DIR}/testfiles/${testfile} -o ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
)
set_tests_properties (H5REPACK_OLD-${testname} PROPERTIES
DEPENDS H5REPACK_OLD-${testname}-clear-objects
)
add_test (
NAME H5REPACK_OLD-${testname}_DFF
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_ext}> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
)
set_tests_properties (H5REPACK_OLD-${testname}_DFF PROPERTIES
DEPENDS H5REPACK_OLD-${testname}
)
endif ()
else ()
add_test (
NAME H5REPACK_OLD-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/out-${testname}.${testfile}
)
if (last_test)
set_tests_properties (H5REPACK_OLD-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5REPACK_OLD-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN} -i ${PROJECT_BINARY_DIR}/testfiles/${testfile} -o ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
)
set_tests_properties (H5REPACK_OLD-${testname} PROPERTIES DEPENDS H5REPACK_OLD-${testname}-clear-objects)
add_test (
NAME H5REPACK_OLD-${testname}_DFF
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_ext}> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
)
set_tests_properties (H5REPACK_OLD-${testname}_DFF PROPERTIES DEPENDS H5REPACK_OLD-${testname})
endif ()
endmacro ()
@ -243,23 +235,25 @@
else ()
add_test (
NAME H5REPACK-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/out-${testname}.${testfile}
COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile}
)
set_tests_properties (H5REPACK-${testname}-clear-objects PROPERTIES
FIXTURES_REQUIRED clear_h5repack
)
if (last_test)
set_tests_properties (H5REPACK-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5REPACK-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> --enable-error-stack ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
)
set_tests_properties (H5REPACK-${testname} PROPERTIES DEPENDS H5REPACK-${testname}-clear-objects)
set_tests_properties (H5REPACK-${testname} PROPERTIES
DEPENDS H5REPACK-${testname}-clear-objects
)
add_test (
NAME H5REPACK-${testname}_DFF
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_ext}> --enable-error-stack ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
)
set_tests_properties (H5REPACK-${testname}_DFF PROPERTIES DEPENDS H5REPACK-${testname})
set_tests_properties (H5REPACK-${testname}_DFF PROPERTIES
DEPENDS H5REPACK-${testname}
)
endif ()
endmacro ()
@ -279,21 +273,14 @@
NAME H5REPACK_CMP-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}
)
if (last_test)
set_tests_properties (H5REPACK_CMP-${testname} PROPERTIES DEPENDS ${last_test})
endif ()
else ()
add_test (
NAME H5REPACK_CMP-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/out-${testname}.${resultfile}
testfiles/${resultfile}-${testname}.out
testfiles/${resultfile}-${testname}.out.err
COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile}
)
set_tests_properties (H5REPACK_CMP-${testname}-clear-objects PROPERTIES
FIXTURES_REQUIRED clear_h5repack
)
if (last_test)
set_tests_properties (H5REPACK_CMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5REPACK_CMP-${testname}
COMMAND "${CMAKE_COMMAND}"
@ -307,7 +294,9 @@
-D "TEST_REFERENCE=${resultfile}-${testname}.tst"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5REPACK_CMP-${testname} PROPERTIES DEPENDS H5REPACK_CMP-${testname}-clear-objects)
set_tests_properties (H5REPACK_CMP-${testname} PROPERTIES
DEPENDS H5REPACK_CMP-${testname}-clear-objects
)
endif ()
endif ()
endmacro ()
@ -328,21 +317,17 @@
NAME H5REPACK_MASK-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}
)
if (last_test)
set_tests_properties (H5REPACK_MASK-${testname} PROPERTIES DEPENDS ${last_test})
endif ()
set_tests_properties (H5REPACK_MASK-${testname} PROPERTIES
FIXTURES_REQUIRED clear_h5repack
)
else (HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5REPACK_MASK-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/out-${testname}.${resultfile}
testfiles/${resultfile}-${testname}.out
testfiles/${resultfile}-${testname}.out.err
COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile}
)
set_tests_properties (H5REPACK_MASK-${testname}-clear-objects PROPERTIES DEPENDS ${last_test}
FIXTURES_REQUIRED clear_h5repack
)
if (last_test)
set_tests_properties (H5REPACK_MASK-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5REPACK_MASK-${testname}
COMMAND "${CMAKE_COMMAND}"
@ -374,20 +359,18 @@
else ()
add_test (
NAME H5REPACK_DMP-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/out-${testname}.${resultfile}
testfiles/${resultfile}-${testname}.out
testfiles/${resultfile}-${testname}.out.err
COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile}
)
set_tests_properties (H5REPACK_DMP-${testname}-clear-objects PROPERTIES
FIXTURES_REQUIRED clear_h5repack
)
if (last_test)
set_tests_properties (H5REPACK_DMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5REPACK_DMP-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}
)
set_tests_properties (H5REPACK_DMP-${testname} PROPERTIES DEPENDS H5REPACK_DMP-${testname}-clear-objects)
set_tests_properties (H5REPACK_DMP-${testname} PROPERTIES
DEPENDS H5REPACK_DMP-${testname}-clear-objects
)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5REPACK_DMP-h5dump-${testname}
@ -401,7 +384,9 @@
-D "TEST_REFERENCE=${testname}.${resultfile}.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5REPACK_DMP-h5dump-${testname} PROPERTIES DEPENDS "H5REPACK_DMP-${testname}")
set_tests_properties (H5REPACK_DMP-h5dump-${testname} PROPERTIES
DEPENDS "H5REPACK_DMP-${testname}"
)
endif ()
endif ()
endmacro ()
@ -418,20 +403,18 @@
else ()
add_test (
NAME H5REPACK_STAT-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/out-${statarg}.${resultfile}
testfiles/${resultfile}-${testname}.out
testfiles/${resultfile}-${testname}.out.err
COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${statarg}.${resultfile}
)
set_tests_properties (H5REPACK_STAT-${testname}-clear-objects PROPERTIES
FIXTURES_REQUIRED clear_h5repack
)
if (last_test)
set_tests_properties (H5REPACK_STAT-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5REPACK_STAT-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${statarg}.${resultfile}
)
set_tests_properties (H5REPACK_STAT-${testname} PROPERTIES DEPENDS H5REPACK_STAT-${testname}-clear-objects)
set_tests_properties (H5REPACK_STAT-${testname} PROPERTIES
DEPENDS H5REPACK_STAT-${testname}-clear-objects
)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5REPACK_STAT-h5stat-${testname}
@ -445,7 +428,9 @@
-D "TEST_REFERENCE=${statarg}.${resultfile}.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5REPACK_STAT-h5stat-${testname} PROPERTIES DEPENDS "H5REPACK_STAT-${testname}")
set_tests_properties (H5REPACK_STAT-h5stat-${testname} PROPERTIES
DEPENDS "H5REPACK_STAT-${testname}"
)
endif ()
endif ()
endmacro ()
@ -463,25 +448,25 @@
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5REPACK_VERIFY_LAYOUT-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/out-${testname}.${testfile}
testfiles/${testfile}-${testname}-v.out
testfiles/${testfile}-${testname}-v.out.err
COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile}
)
set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}-clear-objects PROPERTIES
FIXTURES_REQUIRED clear_h5repack
)
if (last_test)
set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5REPACK_VERIFY_LAYOUT-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
)
set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}-clear-objects)
set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES
DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}-clear-objects
)
add_test (
NAME H5REPACK_VERIFY_LAYOUT-${testname}_DFF
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_ext}> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
)
set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DFF PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname})
set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DFF PROPERTIES
DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}
)
if (NOT ${resultcode})
add_test (
NAME H5REPACK_VERIFY_LAYOUT-${testname}_DMP
@ -496,7 +481,9 @@
-D "TEST_REFERENCE=${testfilter}"
-P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
)
set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DMP PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}_DFF)
set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DMP PROPERTIES
DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}_DFF
)
else ()
if ("${testfilter}" STREQUAL "CHUNKED")
set (nottestfilter "(CONTIGUOUS|COMPACT)")
@ -520,7 +507,9 @@
-D "TEST_REFERENCE=${testfilter}"
-P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
)
set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DMP PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}_DFF)
set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DMP PROPERTIES
DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}_DFF
)
endif ()
endif ()
endif ()
@ -540,21 +529,19 @@
# Remove any output file left over from previous test run
add_test (
NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/out-${testname}.${testfile}
testfiles/${testfile}-${testname}-v.out
testfiles/${testfile}-${testname}-v.out.err
COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile}
)
set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname}-clear-objects PROPERTIES
FIXTURES_REQUIRED clear_h5repack
)
if (last_test)
set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
)
set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname} PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT_VDS-${testname}-clear-objects)
set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname} PROPERTIES
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
DEPENDS H5REPACK_VERIFY_LAYOUT_VDS-${testname}-clear-objects
)
add_test (
NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP
COMMAND "${CMAKE_COMMAND}"
@ -567,8 +554,10 @@
-D "TEST_REFERENCE=${testfile}-${testname}-v.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT_VDS-${testname})
set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP PROPERTIES
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
DEPENDS H5REPACK_VERIFY_LAYOUT_VDS-${testname}
)
endif ()
endif ()
endmacro ()
@ -578,20 +567,18 @@
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5REPACK_VERIFY_SUPERBLOCK-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/out-${testname}.${testfile}
testfiles/${testfile}-${testname}-v.out
testfiles/${testfile}-${testname}-v.out.err
COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile}
)
set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname}-clear-objects PROPERTIES
FIXTURES_REQUIRED clear_h5repack
)
if (last_test)
set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5REPACK_VERIFY_SUPERBLOCK-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> -j;${lowbound};-k;${highbound} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
)
set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname} PROPERTIES DEPENDS H5REPACK_VERIFY_SUPERBLOCK-${testname}-clear-objects)
set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname} PROPERTIES
DEPENDS H5REPACK_VERIFY_SUPERBLOCK-${testname}-clear-objects
)
add_test (
NAME H5REPACK_VERIFY_SUPERBLOCK-${testname}_DMP
COMMAND "${CMAKE_COMMAND}"
@ -605,28 +592,27 @@
-D "TEST_REFERENCE=SUPERBLOCK_VERSION ${superblock}"
-P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
)
set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname}_DMP PROPERTIES DEPENDS H5REPACK_VERIFY_SUPERBLOCK-${testname})
set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname}_DMP PROPERTIES
DEPENDS H5REPACK_VERIFY_SUPERBLOCK-${testname}
)
endif ()
endmacro ()
macro (ADD_H5_VERIFY_INVALIDBOUNDS testname resultcode lowbound highbound)
add_test (
NAME ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/out-${testname}.${testfile}
COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile}
)
set_tests_properties (ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}-clear-objects PROPERTIES
FIXTURES_REQUIRED clear_h5repack
)
if (last_test)
set_tests_properties (ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> -j;${lowbound};-k;${highbound} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
)
set_tests_properties (
ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname} PROPERTIES
DEPENDS ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}-clear-objects
WILL_FAIL "true"
set_tests_properties (ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname} PROPERTIES
DEPENDS ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}-clear-objects
WILL_FAIL "true"
)
endmacro ()
@ -634,28 +620,33 @@
# Remove any output file left over from previous test run
add_test (
NAME H5REPACK_META-${testname}_N-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
COMMAND ${CMAKE_COMMAND} -E remove
testfiles/out-${testname}_N.${testname}.h5
testfiles/out-${testname}_M.${testname}.h5
)
if (last_test)
set_tests_properties (H5REPACK_META-${testname}_N-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
set_tests_properties (H5REPACK_META-${testname}_N-clear-objects PROPERTIES
FIXTURES_REQUIRED clear_h5repack
)
add_test (
NAME H5REPACK_META-${testname}_N
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_N.${testname}.h5
)
set_tests_properties (H5REPACK_META-${testname}_N PROPERTIES DEPENDS H5REPACK_META-${testname}_N-clear-objects)
set_tests_properties (H5REPACK_META-${testname}_N PROPERTIES
DEPENDS H5REPACK_META-${testname}_N-clear-objects
)
add_test (
NAME H5REPACK_META-${testname}_M
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_M.${testname}.h5
)
set_tests_properties (H5REPACK_META-${testname}_M PROPERTIES DEPENDS H5REPACK_META-${testname}_N)
set_tests_properties (H5REPACK_META-${testname}_M PROPERTIES
DEPENDS H5REPACK_META-${testname}_N
)
add_test (NAME H5REPACK_META-${testname} COMMAND ${CMAKE_COMMAND} -E compare_files ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_N.${testname}.h5 ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_M.${testname}.h5)
set_tests_properties (H5REPACK_META-${testname} PROPERTIES WILL_FAIL "true")
set_tests_properties (H5REPACK_META-${testname} PROPERTIES DEPENDS H5REPACK_META-${testname}_M)
set_tests_properties (H5REPACK_META-${testname} PROPERTIES
WILL_FAIL "true"
DEPENDS H5REPACK_META-${testname}_M
)
endmacro ()
macro (ADD_H5_UD_TEST testname resultcode resultfile)
@ -663,17 +654,11 @@
# Remove any output file left over from previous test run
add_test (
NAME H5REPACK_UD-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/out-${testname}.${resultfile}
testfiles/${testname}.${resultfile}.out
testfiles/${testname}.${resultfile}.out.err
testfiles/${resultfile}-${testname}.out
testfiles/${resultfile}-${testname}.out.err
COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile}
)
set_tests_properties (H5REPACK_UD-${testname}-clear-objects PROPERTIES
FIXTURES_REQUIRED clear_h5repack
)
if (last_test)
set_tests_properties (H5REPACK_UD-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5REPACK_UD-${testname}
COMMAND "${CMAKE_COMMAND}"
@ -690,7 +675,9 @@
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5REPACK_UD-${testname} PROPERTIES DEPENDS H5REPACK_UD-${testname}-clear-objects)
set_tests_properties (H5REPACK_UD-${testname} PROPERTIES
DEPENDS H5REPACK_UD-${testname}-clear-objects
)
add_test (
NAME H5REPACK_UD-${testname}-h5dump
COMMAND "${CMAKE_COMMAND}"
@ -706,7 +693,9 @@
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5REPACK_UD-${testname}-h5dump PROPERTIES DEPENDS "H5REPACK_UD-${testname}")
set_tests_properties (H5REPACK_UD-${testname}-h5dump PROPERTIES
DEPENDS "H5REPACK_UD-${testname}"
)
endif ()
endmacro ()
@ -750,67 +739,6 @@
if (HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
set (LIST_TO_CLEAR
h5dump-help.out
h5repack_layout.h5-chunk_18x13-v.out
h5repack_layout.h5-chunk_18x13-v.out.err
h5repack_layout.h5-chunk_20x10-v.out
h5repack_layout.h5-chunk_20x10-v.out.err
h5repack_layout.h5-chunk_compa-v.out
h5repack_layout.h5-chunk_compa-v.out.err
h5repack_layout.h5-chunk_conti-v.out
h5repack_layout.h5-chunk_conti-v.out.err
h5repack_layout.h5-compa-v.out
h5repack_layout.h5-compa-v.out.err
h5repack_layout.h5-conti-v.out
h5repack_layout.h5-conti-v.out.err
h5repack_layout.h5-deflate_limit.out
h5repack_layout.h5-deflate_limit.out.err
h5repack_layout.h5-dset2_chunk_20x10-v.out
h5repack_layout.h5-dset2_chunk_20x10-v.out.err
h5repack_layout.h5-dset2_chunk_20x10-errstk.out
h5repack_layout.h5-dset2_chunk_20x10-errstk.out.err
h5repack_layout.h5-dset2_compa-v.out
h5repack_layout.h5-dset2_compa-v.out.err
h5repack_layout.h5-dset2_conti-v.out
h5repack_layout.h5-dset2_conti-v.out.err
h5repack_layout.h5-dset_compa_chunk-v.out
h5repack_layout.h5-dset_compa_chunk-v.out.err
h5repack_layout.h5-dset_compa_compa-v.out
h5repack_layout.h5-dset_compa_compa-v.out.err
h5repack_layout.h5-dset_compa_conti-v.out
h5repack_layout.h5-dset_compa_conti-v.out.err
h5repack_layout.h5-dset_conti_chunk-v.out
h5repack_layout.h5-dset_conti_chunk-v.out.err
h5repack_layout.h5-dset_conti_compa-v.out
h5repack_layout.h5-dset_conti_compa-v.out.err
h5repack_layout.h5-dset_conti_conti-v.out
h5repack_layout.h5-dset_conti_conti-v.out.err
h5repack_layout.h5-layout_long_switches-v.out
h5repack_layout.h5-layout_long_switches-v.out.err
h5repack_layout.h5-layout_short_switches-v.out
h5repack_layout.h5-layout_short_switches-v.out.err
h5repack_layout.h5-plugin_test.out
h5repack_layout.h5-plugin_test.out.err
h5repack_layout2.h5-contig_small_compa-v.out
h5repack_layout2.h5-contig_small_compa-v.out.err
h5repack_layout2.h5-contig_small_fixed_compa-v.out
h5repack_layout2.h5-contig_small_fixed_compa-v.out.err
h5repack_layout3.h5-ckdim_biger-v.out
h5repack_layout3.h5-ckdim_biger-v.out.err
h5repack_layout3.h5-ckdim_smaller-v.out
h5repack_layout3.h5-ckdim_smaller-v.out.err
h5repack_layout3.h5-chunk2chunk-v.out
h5repack_layout3.h5-chunk2chunk-v.out.err
h5repack_layout3.h5-chunk2compa-v.out
h5repack_layout3.h5-chunk2compa-v.out.err
h5repack_layout3.h5-chunk2conti-v.out
h5repack_layout3.h5-chunk2conti-v.out.err
h5repack_layout3.h5-error1-v.out
h5repack_layout3.h5-error1-v.out.err
h5repack_layout3.h5-error2-v.out
h5repack_layout3.h5-error2-v.out.err
h5repack_layout3.h5-error3-v.out
h5repack_layout3.h5-error3-v.out.err
out-family.tfamily%05d.h5
out-HDFFV-7840.h5diff_attr1.h5
out-attr.h5repack_attr.h5
@ -919,10 +847,10 @@
NAME H5REPACK-clearall-objects
COMMAND ${CMAKE_COMMAND} -E remove ${LIST_TO_CLEAR}
)
set_tests_properties (H5REPACK-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
if (last_test)
set_tests_properties (H5REPACK-clearall-objects PROPERTIES DEPENDS ${last_test})
endif ()
set_tests_properties (H5REPACK-clearall-objects PROPERTIES
FIXTURES_SETUP clear_h5repack
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
)
endif ()
ADD_HELP_TEST(help 0 -h)

View File

@ -48,10 +48,6 @@
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
)
if (last_test)
set_tests_properties (H5REPACK-VFD-${vfdname}-h5repacktest PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "H5REPACK-VFD-${vfdname}-h5repacktest")
endmacro ()
##############################################################################

View File

@ -106,20 +106,7 @@
if (${resultcode})
set_tests_properties (H5STAT-${resultfile} PROPERTIES WILL_FAIL "true")
endif ()
if (last_test)
set_tests_properties (H5STAT-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
else (HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5STAT-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.out
${resultfile}.out.err
)
if (last_test)
set_tests_properties (H5STAT-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5STAT-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -132,7 +119,6 @@
-D "TEST_REFERENCE=${resultfile}.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5STAT-${resultfile} PROPERTIES DEPENDS H5STAT-${resultfile}-clear-objects)
endif ()
endmacro ()
@ -143,20 +129,7 @@
if (${resultcode})
set_tests_properties (H5STAT-${resultfile} PROPERTIES WILL_FAIL "true")
endif ()
if (last_test)
set_tests_properties (H5STAT-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
else (HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5STAT-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.out
${resultfile}.out.err
)
if (last_test)
set_tests_properties (H5STAT-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5STAT-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -170,7 +143,6 @@
-D "TEST_ERRREF=${resultfile}.err"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5STAT-${resultfile} PROPERTIES DEPENDS H5STAT-${resultfile}-clear-objects)
endif ()
endmacro ()
@ -187,13 +159,8 @@
endforeach ()
add_test (
NAME H5STAT-clearall-objects
COMMAND ${CMAKE_COMMAND}
-E remove ${CLEAR_LIST}
COMMAND ${CMAKE_COMMAND} -E remove ${CLEAR_LIST}
)
if (last_test)
set_tests_properties (H5STAT-clearall-objects PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "H5STAT-clearall-objects")
endif ()
# Test for help flag

View File

@ -93,16 +93,6 @@
# This is an issue on Windows
macro (ADD_H5_CMP testname resultfile resultcode)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5CLEAR_CMP-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/${testname}.out
testfiles/${testname}.out.err
)
if (last_test)
set_tests_properties (H5CLEAR_CMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5CLEAR_CMP-${testname}
COMMAND "${CMAKE_COMMAND}"
@ -115,23 +105,11 @@
-D "TEST_REFERENCE=${resultfile}.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS H5CLEAR_CMP-${testname}-clear-objects)
set (last_test "H5CLEAR_CMP-${testname}")
endif ()
endmacro ()
macro (ADD_H5_ERR_CMP testname resultfile resultcode)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5CLEAR_CMP-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/${testname}.out
testfiles/${testname}.out.err
)
if (last_test)
set_tests_properties (H5CLEAR_CMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5CLEAR_CMP-${testname}
COMMAND "${CMAKE_COMMAND}"
@ -145,8 +123,6 @@
-D "TEST_ERRREF=${resultfile}.err"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS H5CLEAR_CMP-${testname}-clear-objects)
set (last_test "H5CLEAR_CMP-${testname}")
endif ()
endmacro ()
@ -154,22 +130,16 @@
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5CLEAR_CMP-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/${testname}.out
testfiles/${testname}.out.err
testfiles/${testfile}
COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testfile}
)
if (last_test)
set_tests_properties (H5CLEAR_CMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5CLEAR_CMP-copy_${testname}
COMMAND ${CMAKE_COMMAND}
-E copy_if_different
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${PROJECT_SOURCE_DIR}/testfiles/${testfile}" "${PROJECT_BINARY_DIR}/testfiles/${testfile}"
)
set_tests_properties (H5CLEAR_CMP-copy_${testname} PROPERTIES DEPENDS H5CLEAR_CMP-${testname}-clear-objects)
set_tests_properties (H5CLEAR_CMP-copy_${testname} PROPERTIES
DEPENDS H5CLEAR_CMP-${testname}-clear-objects
)
add_test (
NAME H5CLEAR_CMP-${testname}
COMMAND "${CMAKE_COMMAND}"
@ -182,8 +152,9 @@
-D "TEST_REFERENCE=${resultfile}.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS H5CLEAR_CMP-copy_${testname})
set (last_test "H5CLEAR_CMP-${testname}")
set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES
DEPENDS H5CLEAR_CMP-copy_${testname}
)
endif ()
endmacro ()
@ -191,22 +162,16 @@
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5CLEAR_CMP-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/${testname}.out
testfiles/${testname}.out.err
testfiles/${testfile}
COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testfile}
)
if (last_test)
set_tests_properties (H5CLEAR_CMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5CLEAR_CMP-copy_${testname}
COMMAND ${CMAKE_COMMAND}
-E copy_if_different
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${PROJECT_SOURCE_DIR}/testfiles/${testfile}" "${PROJECT_BINARY_DIR}/testfiles/${testfile}"
)
set_tests_properties (H5CLEAR_CMP-copy_${testname} PROPERTIES DEPENDS H5CLEAR_CMP-${testname}-clear-objects)
set_tests_properties (H5CLEAR_CMP-copy_${testname} PROPERTIES
DEPENDS H5CLEAR_CMP-${testname}-clear-objects
)
add_test (
NAME H5CLEAR_CMP-${testname}
COMMAND "${CMAKE_COMMAND}"
@ -220,8 +185,9 @@
-D "TEST_ERRREF=${resultfile}.err"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS H5CLEAR_CMP-copy_${testname})
set (last_test "H5CLEAR_CMP-${testname}")
set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES
DEPENDS H5CLEAR_CMP-copy_${testname}
)
endif ()
endmacro ()
@ -231,12 +197,10 @@
NAME H5CLEAR_RET-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5clear${tgt_ext}> ${ARGN}
)
set_tests_properties (H5CLEAR_RET-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
set_tests_properties (H5CLEAR_RET-${testname} PROPERTIES WILL_FAIL "${resultcode}")
if (last_test)
set_tests_properties (H5CLEAR_RET-${testname} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "H5CLEAR_RET-${testname}")
set_tests_properties (H5CLEAR_RET-${testname} PROPERTIES
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
WILL_FAIL "${resultcode}"
)
endif ()
endmacro ()
@ -244,24 +208,16 @@
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5CLEAR_FILESIZE_TEST-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/${testname}_before_size.out
testfiles/${testname}_before_size.out.err
testfiles/${testname}_after_size.out
testfiles/${testname}_after_size.out.err
testfiles/${testname}.h5
COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testname}.h5
)
if (last_test)
set_tests_properties (H5CLEAR_FILESIZE_TEST-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5CLEAR_FILESIZE_TEST-copy_${testname}
COMMAND ${CMAKE_COMMAND}
-E copy_if_different
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${PROJECT_SOURCE_DIR}/testfiles/${testname}.h5" "${PROJECT_BINARY_DIR}/testfiles/${testname}.h5"
)
set_tests_properties (H5CLEAR_FILESIZE_TEST-copy_${testname} PROPERTIES DEPENDS H5CLEAR_FILESIZE_TEST-${testname}-clear-objects)
set_tests_properties (H5CLEAR_FILESIZE_TEST-copy_${testname} PROPERTIES
DEPENDS H5CLEAR_FILESIZE_TEST-${testname}-clear-objects
)
add_test (
NAME H5CLEAR_FILESIZE_CMP-${testname}_before_size
COMMAND "${CMAKE_COMMAND}"
@ -274,7 +230,9 @@
-D "TEST_REFERENCE=${resultfile}_before_size.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5CLEAR_FILESIZE_CMP-${testname}_before_size PROPERTIES DEPENDS H5CLEAR_FILESIZE_TEST-copy_${testname})
set_tests_properties (H5CLEAR_FILESIZE_CMP-${testname}_before_size PROPERTIES
DEPENDS H5CLEAR_FILESIZE_TEST-copy_${testname}
)
if (NOT ${incr_size} MATCHES "NONE")
add_test (
NAME H5CLEAR_FILESIZE_INCR-${testname}
@ -286,9 +244,11 @@
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5clear${tgt_ext}> --increment ${testname}.h5
)
endif ()
set_tests_properties (H5CLEAR_FILESIZE_INCR-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
set_tests_properties (H5CLEAR_FILESIZE_INCR-${testname} PROPERTIES WILL_FAIL "${resultcode}")
set_tests_properties (H5CLEAR_FILESIZE_INCR-${testname} PROPERTIES DEPENDS H5CLEAR_FILESIZE_CMP-${testname}_before_size)
set_tests_properties (H5CLEAR_FILESIZE_INCR-${testname} PROPERTIES
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
WILL_FAIL "${resultcode}"
DEPENDS H5CLEAR_FILESIZE_CMP-${testname}_before_size
)
add_test (
NAME H5CLEAR_FILESIZE_CMP-${testname}_after_size
COMMAND "${CMAKE_COMMAND}"
@ -297,12 +257,75 @@
-D "TEST_ARGS:STRING=--filesize;${testname}.h5"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
-D "TEST_OUTPUT=${testname}_after_size.out"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_EXPECT=0"
-D "TEST_REFERENCE=${resultfile}_after_size.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5CLEAR_FILESIZE_CMP-${testname}_after_size PROPERTIES DEPENDS H5CLEAR_FILESIZE_INCR-${testname})
set (last_test "H5CLEAR_FILESIZE_CMP-${testname}_after_size")
set_tests_properties (H5CLEAR_FILESIZE_CMP-${testname}_after_size PROPERTIES
DEPENDS H5CLEAR_FILESIZE_INCR-${testname}
)
endif ()
endmacro ()
macro (ADD_H5_FILESIZE_FAIL_TEST testname resultcode resultfile incr_size)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5CLEAR_FILESIZE_FAIL_TEST-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testname}.h5
)
add_test (
NAME H5CLEAR_FILESIZE_FAIL_TEST-copy_${testname}
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${PROJECT_SOURCE_DIR}/testfiles/${testname}.h5" "${PROJECT_BINARY_DIR}/testfiles/${testname}.h5"
)
set_tests_properties (H5CLEAR_FILESIZE_FAIL_TEST-copy_${testname} PROPERTIES
DEPENDS H5CLEAR_FILESIZE_FAIL_TEST-${testname}-clear-objects
)
add_test (
NAME H5CLEAR_FILESIZE_FAIL_CMP-${testname}_before_size
COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5clear${tgt_ext}>"
-D "TEST_ARGS:STRING=--filesize;${testname}.h5"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
-D "TEST_OUTPUT=${testname}_before_size.out"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_REFERENCE=${resultfile}.mty"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5CLEAR_FILESIZE_FAIL_CMP-${testname}_before_size PROPERTIES
DEPENDS H5CLEAR_FILESIZE_FAIL_TEST-copy_${testname}
)
if (NOT ${incr_size} MATCHES "NONE")
add_test (
NAME H5CLEAR_FILESIZE_FAIL_INCR-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5clear${tgt_ext}> -s --increment=${incr_size} ${testname}.h5
)
else ()
add_test (
NAME H5CLEAR_FILESIZE_FAIL_INCR-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5clear${tgt_ext}> -s --increment ${testname}.h5
)
endif ()
set_tests_properties (H5CLEAR_FILESIZE_FAIL_INCR-${testname} PROPERTIES
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
DEPENDS H5CLEAR_FILESIZE_FAIL_CMP-${testname}_before_size
)
add_test (
NAME H5CLEAR_FILESIZE_FAIL_CMP-${testname}_after_size
COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5clear${tgt_ext}>"
-D "TEST_ARGS:STRING=--filesize;${testname}.h5"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
-D "TEST_OUTPUT=${testname}_after_size.out"
-D "TEST_EXPECT=0"
-D "TEST_REFERENCE=${resultfile}_after_size.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5CLEAR_FILESIZE_FAIL_CMP-${testname}_after_size PROPERTIES
DEPENDS H5CLEAR_FILESIZE_FAIL_INCR-${testname}
)
endif ()
endmacro ()
@ -310,32 +333,39 @@
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5CLEAR-clr_open_chk-copy_${testname}.h5
COMMAND ${CMAKE_COMMAND}
-E copy_if_different
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${PROJECT_SOURCE_DIR}/testfiles/${testfile}.h5" "${PROJECT_BINARY_DIR}/testfiles/${testfile}.h5"
)
if (last_test)
set_tests_properties (H5CLEAR-clr_open_chk-copy_${testname}.h5 PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "H5CLEAR-clr_open_chk-copy_${testname}.h5")
# Initial file open fails OR
# File open succeeds because the library does not check status_flags for file with < v3 superblock
add_test (NAME H5CLEAR-clr_open_chk-${testname}_${resultcode} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:clear_open_chk> ${testfile}.h5)
set_tests_properties (H5CLEAR-clr_open_chk-${testname}_${resultcode} PROPERTIES WILL_FAIL "${resultcode}")
set_tests_properties (H5CLEAR-clr_open_chk-${testname}_${resultcode} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
if (last_test)
set_tests_properties (H5CLEAR-clr_open_chk-${testname}_${resultcode} PROPERTIES DEPENDS ${last_test})
endif ()
add_test (
NAME H5CLEAR-clr_open_chk-${testname}_${resultcode}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:clear_open_chk> ${testfile}.h5
)
set_tests_properties (H5CLEAR-clr_open_chk-${testname}_${resultcode} PROPERTIES
WILL_FAIL "${resultcode}"
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
DEPENDS H5CLEAR-clr_open_chk-copy_${testname}.h5
)
# After "h5clear" the file, the subsequent file open succeeds
add_test (NAME H5CLEAR-h5clr-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5clear${tgt_ext}> -s ${testfile}.h5)
set_tests_properties (H5CLEAR-h5clr-${testname} PROPERTIES DEPENDS H5CLEAR-clr_open_chk-${testname}_${resultcode})
set_tests_properties (H5CLEAR-h5clr-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
add_test (NAME H5CLEAR-clr_open_chk-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:clear_open_chk> ${testfile}.h5)
set_tests_properties (H5CLEAR-clr_open_chk-${testname} PROPERTIES DEPENDS H5CLEAR-h5clr-${testname})
set_tests_properties (H5CLEAR-clr_open_chk-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
set (last_test "H5CLEAR-clr_open_chk-${testname}")
add_test (
NAME H5CLEAR-h5clr-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5clear${tgt_ext}> -s ${testfile}.h5
)
set_tests_properties (H5CLEAR-h5clr-${testname} PROPERTIES
DEPENDS H5CLEAR-clr_open_chk-${testname}_${resultcode}
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
)
add_test (
NAME H5CLEAR-clr_open_chk-${testname}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:clear_open_chk> ${testfile}.h5
)
set_tests_properties (H5CLEAR-clr_open_chk-${testname} PROPERTIES
DEPENDS H5CLEAR-h5clr-${testname}
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
)
endif ()
endmacro ()
@ -344,73 +374,6 @@
### T H E T E S T S ###
##############################################################################
##############################################################################
#
#
#
# The following are tests to verify the status_flags field is cleared properly:
if (HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
add_test (
NAME H5CLEAR-clearall-objects
COMMAND ${CMAKE_COMMAND}
-E remove
h5clear_log_v3.h5
h5clear_mdc_image.h5
h5clear_sec2_v0.h5
h5clear_sec2_v2.h5
h5clear_sec2_v3.h5
orig_h5clear_sec2_v0.h5
orig_h5clear_sec2_v2.h5
orig_h5clear_sec2_v3.h5
latest_h5clear_log_v3.h5
latest_h5clear_sec2_v3.h5
mod_h5clear_mdc_image.h5
mod_h5clear_mdc_image2.h5
${HDF5_TEST_FILES}
)
if (last_test)
set_tests_properties (H5CLEAR-clearall-objects PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "H5CLEAR-clearall-objects")
foreach (h5_file ${HDF5_TEST_FILES} ${HDF5_SEC2_TEST_FILES})
add_test (
NAME H5CLEAR-copy_${h5_file}
COMMAND ${CMAKE_COMMAND}
-E copy_if_different
"${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}"
)
if (last_test)
set_tests_properties (H5CLEAR-copy_${h5_file} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "H5CLEAR-copy_${h5_file}")
endforeach ()
# make second copy of h5clear_sec2.h5
foreach (h5_file ${HDF5_SEC2_TEST_FILES})
add_test (
NAME H5CLEAR-copy_orig_${h5_file}
COMMAND ${CMAKE_COMMAND}
-E copy_if_different
"${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/orig_${h5_file}"
)
if (last_test)
set_tests_properties (H5CLEAR-copy_orig_${h5_file} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "H5CLEAR-copy_orig_${h5_file}")
endforeach ()
# make second copy of mod_h5clear_mdc_image.h5
add_test (
NAME H5CLEAR-copy_mod_h5clr_mdc_image2.h5
COMMAND ${CMAKE_COMMAND}
-E copy_if_different
"${PROJECT_SOURCE_DIR}/testfiles/mod_h5clear_mdc_image.h5" "${PROJECT_BINARY_DIR}/testfiles/mod_h5clear_mdc_image2.h5"
)
if (last_test)
set_tests_properties (H5CLEAR-copy_mod_h5clr_mdc_image2.h5 PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "H5CLEAR-copy_mod_h5clr_mdc_image2.h5")
endif()
#
#
#
@ -487,9 +450,7 @@ endif()
# "h5clear -s --increment=0 h5clear_status_noclose.h5" (clear status_flag, EOA = MAX(EOA, EOF) + 0)
# (no output, check exit code)
# "h5clear --filesize h5clear_status_noclose.h5" (print EOA/EOF after the last action)
ADD_H5_ERR_CMP_WITH_COPY (h5clr_open_fail_nc_s 1 h5clear_open_fail h5clear_status_noclose.h5 "--filesize")
ADD_H5_RETTEST (h5clr_mdc_image_nc "false" "-s" "--increment=0" h5clear_status_noclose.h5)
ADD_H5_CMP (h5clr_no_mdc_image_nc_m h5clear_status_noclose_after_size 0 "--filesize" h5clear_status_noclose.h5)
ADD_H5_FILESIZE_FAIL_TEST (h5clear_status_noclose 1 h5clear_status_noclose 0)
#
# (2) h5clear_fsm_persist_noclose.h5
# "h5clear --filesize h5clear_fsm_persist_noclose.h5" (print EOA/EOF before the next action)

View File

@ -61,29 +61,22 @@
endif ()
macro (ADD_H5_TEST resultfile resultcode resultoption)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5MKGRP-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.h5
${resultfile}.out
${resultfile}.out.err
)
set_tests_properties (H5MKGRP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
endif ()
add_test (
NAME H5MKGRP-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}.h5
)
set_tests_properties (H5MKGRP-${resultfile}-clear-objects PROPERTIES
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
)
add_test (
NAME H5MKGRP-${resultfile}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5mkgrp${tgt_ext}> ${resultoption} ${resultfile}.h5 ${ARGN}
)
set_tests_properties (H5MKGRP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
if (HDF5_ENABLE_USING_MEMCHECKER)
if (last_test)
set_tests_properties (H5MKGRP-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
else ()
set_tests_properties (H5MKGRP-${resultfile} PROPERTIES DEPENDS H5MKGRP-${resultfile}-clear-objects)
set_tests_properties (H5MKGRP-${resultfile} PROPERTIES
DEPENDS H5MKGRP-${resultfile}-clear-objects
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5MKGRP-${resultfile}-h5ls
COMMAND "${CMAKE_COMMAND}"
@ -107,13 +100,11 @@
else ()
add_test (
NAME H5MKGRP_CMP-${resultfile}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${resultfile}.h5
${resultfile}.out
${resultfile}.out.err
COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}.h5
)
set_tests_properties (H5MKGRP_CMP-${resultfile}-clear-objects PROPERTIES
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
)
set_tests_properties (H5MKGRP_CMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
add_test (
NAME H5MKGRP_CMP-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@ -126,7 +117,9 @@
-D "TEST_REFERENCE=${resultfile}.txt"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5MKGRP_CMP-${resultfile} PROPERTIES DEPENDS H5MKGRP_CMP-${resultfile}-clear-objects)
set_tests_properties (H5MKGRP_CMP-${resultfile} PROPERTIES
DEPENDS H5MKGRP_CMP-${resultfile}-clear-objects
)
endif ()
endmacro ()
@ -138,54 +131,23 @@
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5MKGRP-clearall-objects
COMMAND ${CMAKE_COMMAND}
-E remove
h5mkgrp_help.out
h5mkgrp_help.out.err
h5mkgrp_version.out
h5mkgrp_version.out.err
h5mkgrp_single.h5
h5mkgrp_single.out
h5mkgrp_single.out.err
h5mkgrp_single_v.h5
h5mkgrp_single_v.out
h5mkgrp_single_v.out.err
h5mkgrp_single_p.h5
h5mkgrp_single_p.out
h5mkgrp_single_p.out.err
h5mkgrp_single_l.h5
h5mkgrp_single_l.out
h5mkgrp_single_l.out.err
h5mkgrp_several.h5
h5mkgrp_several.out
h5mkgrp_several.out.err
h5mkgrp_several_v.h5
h5mkgrp_several_v.out
h5mkgrp_several_v.out.err
h5mkgrp_several_p.h5
h5mkgrp_several_p.out
h5mkgrp_several_p.out.err
h5mkgrp_several_l.h5
h5mkgrp_several_l.out
h5mkgrp_several_l.out.err
h5mkgrp_nested_p.h5
h5mkgrp_nested_p.out
h5mkgrp_nested_p.out.err
h5mkgrp_nested_lp.h5
h5mkgrp_nested_lp.out
h5mkgrp_nested_lp.out.err
h5mkgrp_nested_mult_p.h5
h5mkgrp_nested_mult_p.out
h5mkgrp_nested_mult_p.out.err
h5mkgrp_nested_mult_lp.h5
h5mkgrp_nested_mult_lp.out
h5mkgrp_nested_mult_lp.out.err
COMMAND ${CMAKE_COMMAND} -E remove
h5mkgrp_single.h5
h5mkgrp_single_v.h5
h5mkgrp_single_p.h5
h5mkgrp_single_l.h5
h5mkgrp_several.h5
h5mkgrp_several_v.h5
h5mkgrp_several_p.h5
h5mkgrp_several_l.h5
h5mkgrp_nested_p.h5
h5mkgrp_nested_lp.h5
h5mkgrp_nested_mult_p.h5
h5mkgrp_nested_mult_lp.h5
)
set_tests_properties (H5MKGRP-clearall-objects PROPERTIES
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
)
set_tests_properties (H5MKGRP-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
if (last_test)
set_tests_properties (H5MKGRP-clearall-objects PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "H5MKGRP-clearall-objects")
endif ()
# Check that help & version is displayed properly

View File

@ -80,31 +80,46 @@
set_tests_properties (H5REPART-clearall-objects PROPERTIES FIXTURES_SETUP clear_testrepart)
# repartition family member size to 20,000 bytes.
add_test (NAME H5REPART-h5repart_20K COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart${tgt_ext}> -m 20000 family_file%05d.h5 fst_family%05d.h5)
add_test (
NAME H5REPART-h5repart_20K
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart${tgt_ext}> -m 20000 family_file%05d.h5 fst_family%05d.h5
)
set_tests_properties (H5REPART-h5repart_20K PROPERTIES
FIXTURES_REQUIRED clear_testrepart
)
# repartition family member size to 5 KB.
add_test (NAME H5REPART-h5repart_5K COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart${tgt_ext}> -m 5k family_file%05d.h5 scd_family%05d.h5)
add_test (
NAME H5REPART-h5repart_5K
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart${tgt_ext}> -m 5k family_file%05d.h5 scd_family%05d.h5
)
set_tests_properties (H5REPART-h5repart_5K PROPERTIES
FIXTURES_REQUIRED clear_testrepart
)
# convert family file to sec2 file of 20,000 bytes
add_test (NAME H5REPART-h5repart_single COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart${tgt_ext}> -m 20000 -family_to_single family_file%05d.h5 family_to_single.h5)
add_test (
NAME H5REPART-h5repart_single
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart${tgt_ext}> -m 20000 -family_to_single family_file%05d.h5 family_to_single.h5
)
set_tests_properties (H5REPART-h5repart_single PROPERTIES
FIXTURES_REQUIRED clear_testrepart
)
# convert family file to sec2 file of 20,000 bytes (old argument)
add_test (NAME H5REPART-h5repart_sec2 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart${tgt_ext}> -m 20000 -family_to_sec2 family_file%05d.h5 family_to_sec2.h5)
add_test (
NAME H5REPART-h5repart_sec2
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart${tgt_ext}> -m 20000 -family_to_sec2 family_file%05d.h5 family_to_sec2.h5
)
set_tests_properties (H5REPART-h5repart_sec2 PROPERTIES
FIXTURES_REQUIRED clear_testrepart
)
# test the output files repartitioned above.
add_test (NAME H5REPART-h5repart_test COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart_test>)
add_test (
NAME H5REPART-h5repart_test
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart_test>
)
set_tests_properties (H5REPART-h5repart_test PROPERTIES
DEPENDS "H5REPART-h5repart_20K;H5REPART-h5repart_5K;H5REPART-h5repart_single;H5REPART-h5repart_sec2"
)

View File

@ -67,8 +67,10 @@ else ()
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (PERFORM_h5perf_serial PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
set_tests_properties (PERFORM_h5perf_serial PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
set_tests_properties (PERFORM_h5perf_serial PROPERTIES
TIMEOUT ${CTEST_VERY_LONG_TIMEOUT}
DEPENDS "PERFORM_h5perform-clearall-objects"
)
if (HDF5_BUILD_PERFORM_STANDALONE)
add_test (NAME PERFORM_h5perf_serial_alone COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5perf_serial_alone>)
@ -89,7 +91,9 @@ else ()
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (PERFORM_chunk PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
set_tests_properties (PERFORM_chunk PROPERTIES
DEPENDS "PERFORM_h5perform-clearall-objects"
)
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME PERFORM_iopipe COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:iopipe>)
@ -106,7 +110,9 @@ else ()
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (PERFORM_iopipe PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
set_tests_properties (PERFORM_iopipe PROPERTIES
DEPENDS "PERFORM_h5perform-clearall-objects"
)
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME PERFORM_overhead COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:overhead>)
@ -123,7 +129,9 @@ else ()
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (PERFORM_overhead PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
set_tests_properties (PERFORM_overhead PROPERTIES
DEPENDS "PERFORM_h5perform-clearall-objects"
)
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME PERFORM_perf_meta COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:perf_meta>)
@ -140,7 +148,9 @@ else ()
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (PERFORM_perf_meta PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
set_tests_properties (PERFORM_perf_meta PROPERTIES
DEPENDS "PERFORM_h5perform-clearall-objects"
)
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME PERFORM_zip_perf_help COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:zip_perf> "-h")
@ -157,7 +167,9 @@ else ()
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (PERFORM_zip_perf_help PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
set_tests_properties (PERFORM_zip_perf_help PROPERTIES
DEPENDS "PERFORM_h5perform-clearall-objects"
)
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME PERFORM_zip_perf COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:zip_perf> tfilters.h5)
@ -174,7 +186,9 @@ else ()
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (PERFORM_zip_perf PROPERTIES DEPENDS "PERFORM_zip_perf_help;PERFORM_h5perform-clearall-objects")
set_tests_properties (PERFORM_zip_perf PROPERTIES
DEPENDS "PERFORM_zip_perf_help;PERFORM_h5perform-clearall-objects"
)
if (H5_HAVE_PARALLEL)
if (UNIX)