diff options
Diffstat (limited to 'tools/test/h5repack/h5repack.sh.in')
| -rw-r--r-- | tools/test/h5repack/h5repack.sh.in | 64 |
1 files changed, 52 insertions, 12 deletions
diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in index 3756a95..9b826b3 100644 --- a/tools/test/h5repack/h5repack.sh.in +++ b/tools/test/h5repack/h5repack.sh.in @@ -39,6 +39,9 @@ H5DUMP_BIN=`pwd`/$H5DUMP # The path of the h5dump tool binary H5STAT=../../src/h5stat/h5stat # The h5stat tool name H5STAT_BIN=`pwd`/$H5STAT # The path of the h5stat tool binary +VDS_CHECK_COMPAT_VOL=../../../utils/vds_check_compat_vol # The vds_check_compat_vol tool name +VDS_CHECK_COMPAT_VOL_BIN=`pwd`/$VDS_CHECK_COMPAT_VOL # The path of the vds_check_compat_vol tool binary + RM='rm -rf' CMP='cmp' DIFF='diff -c' @@ -327,6 +330,26 @@ SKIP() { echo " -SKIP-" } +BOUNCE() { + ACTUAL_TEST=$1 + shift + $ACTUAL_TEST $@ +} + +# Check for compatible VOL connector +# Note: Requires VOL connector that supports external links and virtual datasets +COMPAT_VOL_TEST() { + if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then + ACTUAL_TEST=$1 + shift + $ACTUAL_TEST $@ + else + SKIP $@ + echo " The VOL connector specified by the HDF5_VOL_CONNECTOR environment" + echo " variable does not support external links or virtual datasets." + fi +} + ############################################################################## ############################################################################## ### T H E T E S T S M A C R O S ### @@ -1316,6 +1339,13 @@ fi # prepare for test COPY_TESTFILES_TO_TESTDIR +# Check to see if the VOL connector specified by the HDF5_VOL_CONNECTOR +# environment variable supports virtual datasets (and external links) +# +# Note: Depends on vds_check_compat_vol tool from $(topdir)/utils +$VDS_CHECK_COMPAT_VOL_BIN +COMPAT_VOL=$? + TOOLTEST_HELP h5repack-help.txt -h # copy files (these files have no filters) @@ -1732,31 +1762,36 @@ TOOLTEST_META meta_long h5repack_layout.h5 --metadata_block_size=8192 if test $USE_FILTER_DEFLATE != "yes" ; then SKIP vds_dset_chunk_20x10x5 else - VERIFY_LAYOUT_VDS vds_dset_chunk20x10x5 1_vds.h5 vds_dset CHUNKED --layout vds_dset:CHUNK=20x10x5 + # Note: Requires VOL connector that supports external links + COMPAT_VOL_TEST VERIFY_LAYOUT_VDS vds_dset_chunk20x10x5 1_vds.h5 vds_dset CHUNKED --layout vds_dset:CHUNK=20x10x5 fi if test $USE_FILTER_DEFLATE != "yes" ; then SKIP vds_chunk2x5x8 else - VERIFY_LAYOUT_VDS vds_chunk2x5x8 3_1_vds.h5 vds_dset CHUNKED -l vds_dset:CHUNK=2x5x8 + # Note: Requires VOL connector that supports external links + COMPAT_VOL_TEST VERIFY_LAYOUT_VDS vds_chunk2x5x8 3_1_vds.h5 vds_dset CHUNKED -l vds_dset:CHUNK=2x5x8 fi if test $USE_FILTER_DEFLATE != "yes" ; then SKIP vds_chunk3x6x9 else - VERIFY_LAYOUT_VDS vds_chunk3x6x9 2_vds.h5 vds_dset CHUNKED -l vds_dset:CHUNK=3x6x9 + # Note: Requires VOL connector that supports external links + COMPAT_VOL_TEST VERIFY_LAYOUT_VDS vds_chunk3x6x9 2_vds.h5 vds_dset CHUNKED -l vds_dset:CHUNK=3x6x9 fi if test $USE_FILTER_DEFLATE != "yes" ; then SKIP vds_compa 4_vds.h5 else - VERIFY_LAYOUT_VDS vds_compa 4_vds.h5 vds_dset COMPACT -l vds_dset:COMPA + # Note: Requires VOL connector that supports external links + COMPAT_VOL_TEST VERIFY_LAYOUT_VDS vds_compa 4_vds.h5 vds_dset COMPACT -l vds_dset:COMPA fi if test $USE_FILTER_DEFLATE != "yes" ; then - SKIP vds_conti 4_vds.h5 + SKIP vds_conti 4_vds.h5 else - VERIFY_LAYOUT_VDS vds_conti 4_vds.h5 vds_dset CONTIGUOUS -l vds_dset:CONTI + # Note: Requires VOL connector that supports external links + COMPAT_VOL_TEST VERIFY_LAYOUT_VDS vds_conti 4_vds.h5 vds_dset CONTIGUOUS -l vds_dset:CONTI fi ################################################################ @@ -1789,11 +1824,15 @@ VERIFY_EXTERNAL_CONSOLIDATION -l CONTI #TOOLTEST_DUMP h5copy_extlinks_src-base h5copy_extlinks_src.h5 --enable-error-stack TOOLTEST_DUMP tsoftlinks-base tsoftlinks.h5 --enable-error-stack TOOLTEST_DUMP textlink-base textlink.h5 --enable-error-stack -TOOLTEST_DUMP textlinkfar-base textlinkfar.h5 --enable-error-stack -TOOLTEST_DUMP textlinksrc-base textlinksrc.h5 --enable-error-stack -TOOLTEST_DUMP textlinktar-base textlinktar.h5 --enable-error-stack - -TOOLTESTSV h5copy_extlinks_src-merge h5copy_extlinks_src.h5 --merge +# Note: Requires VOL connector that supports external links +COMPAT_VOL_TEST TOOLTEST_DUMP textlinkfar-base textlinkfar.h5 --enable-error-stack +# Note: Requires VOL connector that supports external links +COMPAT_VOL_TEST TOOLTEST_DUMP textlinksrc-base textlinksrc.h5 --enable-error-stack +# Note: Requires VOL connector that supports external links +COMPAT_VOL_TEST TOOLTEST_DUMP textlinktar-base textlinktar.h5 --enable-error-stack + +# Note: Requires VOL connector that supports external links +COMPAT_VOL_TEST TOOLTESTSV h5copy_extlinks_src-merge h5copy_extlinks_src.h5 --merge TOOLFAILSV tsoftlinks-merge tsoftlinks.h5 --merge TOOLTESTSV textlink-merge textlink.h5 --merge ### HDFFV-11128 needs fixed to enable the following test @@ -1810,7 +1849,8 @@ TOOLTEST_DUMP textlinkfar-prune textlinkfar.h5 --prune --enable-error-stack TOOLTEST_DUMP textlinksrc-prune textlinksrc.h5 --prune --enable-error-stack TOOLTEST_DUMP textlinktar-prune textlinktar.h5 --prune --enable-error-stack -TOOLTEST_DUMP h5copy_extlinks_src-mergeprune h5copy_extlinks_src.h5 --merge --prune --enable-error-stack +# Note: Requires VOL connector that supports external links +COMPAT_VOL_TEST TOOLTEST_DUMP h5copy_extlinks_src-mergeprune h5copy_extlinks_src.h5 --merge --prune --enable-error-stack TOOLTEST_DUMP tsoftlinks-mergeprune tsoftlinks.h5 --merge --prune --enable-error-stack TOOLTEST_DUMP textlink-mergeprune textlink.h5 --merge --prune --enable-error-stack ### HDFFV-11128 needs fixed to enable the following test |