Adjust CMake and Java for new API H5VLfapl_is_native

6 files changed, 6 insertions, 78 deletions

diff --git a/tools/test/h5diff/testh5diff.sh.in b/tools/test/h5diff/testh5diff.sh.in
index 84a3ebf..573d657 100644
--- a/tools/test/h5diff/testh5diff.sh.in
+++ b/tools/test/h5diff/testh5diff.sh.in
@@ -600,7 +600,7 @@ $CP -f $SRC_TOOLS_TESTFILES/tvlstr.h5 $TESTDIR/tvlstr2.h5
 # 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_elink_compat_vol tool from $(topdir)/utils
+# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils/test
 $VDS_ELINK_COMPAT_VOL_BIN
 COMPAT_VOL=$?
 
@@ -975,7 +975,6 @@ TOOLTEST h5diff_402.txt --follow-symlinks -v h5diff_softlinks.h5 h5diff_softlink
 TOOLTEST h5diff_403.txt --follow-symlinks -v h5diff_softlinks.h5 h5diff_softlinks.h5 /softlink_dset1_1 /softlink_dset2
 
 # extlink vs extlink (FILE)"
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_404.txt --follow-symlinks -v h5diff_extlink_src.h5 h5diff_extlink_src.h5"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -986,7 +985,6 @@ else
 fi
 
 # extlink vs dset"
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_405.txt --follow-symlinks -v h5diff_extlink_src.h5 h5diff_extlink_trg.h5 /ext_link_dset1 /target_group2/x_dset"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -997,7 +995,6 @@ else
 fi
 
 # dset vs extlink"
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_406.txt --follow-symlinks -v h5diff_extlink_trg.h5 h5diff_extlink_src.h5 /target_group2/x_dset /ext_link_dset1"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1008,7 +1005,6 @@ else
 fi
 
 # extlink vs extlink"
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_407.txt --follow-symlinks -v h5diff_extlink_src.h5 h5diff_extlink_src.h5 /ext_link_dset1 /ext_link_dset2"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1019,7 +1015,6 @@ else
 fi
 
 # softlink vs extlink"
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_408.txt --follow-symlinks -v h5diff_softlinks.h5 h5diff_extlink_src.h5 /softlink_dset1_1 /ext_link_dset2"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1030,7 +1025,6 @@ else
 fi
 
 # extlink vs softlink "
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_409.txt --follow-symlinks -v h5diff_extlink_src.h5 h5diff_softlinks.h5 /ext_link_dset2 /softlink_dset1_1"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1068,7 +1062,6 @@ TOOLTEST h5diff_417.txt --follow-symlinks -v h5diff_softlinks.h5 h5diff_softlink
 TOOLTEST h5diff_418.txt --follow-symlinks -v h5diff_softlinks.h5 h5diff_softlinks.h5 /softlink_dset2 /softlink_noexist
 
 # non-exist-extlink_file vs extlink"
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_419.txt --follow-symlinks -v h5diff_extlink_src.h5 h5diff_extlink_src.h5 /ext_link_noexist2 /ext_link_dset2"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1079,7 +1072,6 @@ else
 fi
 
 # exlink vs non-exist-extlink_file"
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_420.txt --follow-symlinks -v h5diff_extlink_src.h5 h5diff_extlink_src.h5 /ext_link_dset2 /ext_link_noexist2"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1090,7 +1082,6 @@ else
 fi
 
 # extlink vs non-exist-extlink_obj"
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_421.txt --follow-symlinks -v h5diff_extlink_src.h5 h5diff_extlink_src.h5 /ext_link_dset2 /ext_link_noexist1"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1101,7 +1092,6 @@ else
 fi
 
 # non-exist-extlink_obj vs extlink"
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_422.txt --follow-symlinks -v h5diff_extlink_src.h5 h5diff_extlink_src.h5 /ext_link_noexist1 /ext_link_dset2"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1112,7 +1102,6 @@ else
 fi
 
 # extlink_to_softlink_to_dset1 vs dset2"
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_423.txt --follow-symlinks -v h5diff_ext2softlink_src.h5 h5diff_ext2softlink_trg.h5 /ext_link_to_slink1 /dset2"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1123,7 +1112,6 @@ else
 fi
 
 # dset2 vs extlink_to_softlink_to_dset1"
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_424.txt --follow-symlinks -v h5diff_ext2softlink_trg.h5 h5diff_ext2softlink_src.h5 /dset2 /ext_link_to_slink1"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1134,7 +1122,6 @@ else
 fi
 
 # extlink_to_softlink_to_dset1 vs extlink_to_softlink_to_dset2"
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_425.txt --follow-symlinks -v h5diff_ext2softlink_src.h5 h5diff_ext2softlink_src.h5 /ext_link_to_slink1 /ext_link_to_slink2"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1148,7 +1135,6 @@ fi
 # # Dangling links compare (--follow-symlinks and --no-dangling-links)
 # ##############################################################################
 # dangling links --follow-symlinks (FILE to FILE)
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_450.txt  --follow-symlinks -v h5diff_danglelinks1.h5 h5diff_danglelinks2.h5"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1174,7 +1160,6 @@ TOOLTEST h5diff_454.txt  --follow-symlinks -v --no-dangling-links  h5diff_softli
 TOOLTEST h5diff_455.txt  --follow-symlinks -v --no-dangling-links  h5diff_softlinks.h5 h5diff_softlinks.h5 /softlink_noexist /softlink_noexist
 
 # dangling link found for ext links (FILE to FILE)
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_456.txt  --follow-symlinks -v --no-dangling-links  h5diff_extlink_src.h5 h5diff_extlink_src.h5"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1185,7 +1170,6 @@ else
 fi
 
 # dangling link found for ext links (obj to obj). target file exist
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_457.txt  --follow-symlinks -v --no-dangling-links  h5diff_extlink_src.h5 h5diff_extlink_src.h5 /ext_link_dset1 /ext_link_noexist1"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1196,7 +1180,6 @@ else
 fi
 
 # dangling link found for ext links (obj to obj). target file NOT exist
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_458.txt  --follow-symlinks -v --no-dangling-links  h5diff_extlink_src.h5 h5diff_extlink_src.h5 /ext_link_dset1 /ext_link_noexist2"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1220,7 +1203,6 @@ TOOLTEST h5diff_467.txt -v --follow-symlinks h5diff_danglelinks1.h5 h5diff_dangl
 # ext dangling vs. ext dangling
 TOOLTEST h5diff_468.txt -v --follow-symlinks h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /ext_link4
 # ext link vs. ext dangling
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_469.txt -v --follow-symlinks h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /ext_link2"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1246,7 +1228,6 @@ TOOLTEST h5diff_475.txt -v h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /ext_li
 # ##############################################################################
 # root
 TOOLTEST h5diff_500.txt -v h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 / /
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_501.txt -v --follow-symlinks h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 / /"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1271,7 +1252,6 @@ TOOLTEST h5diff_506.txt -v --follow-symlinks h5diff_grp_recurse1.h5 h5diff_grp_r
 
 # groups vs ext-link
 TOOLTEST h5diff_507.txt -v h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /grp1 /elink_grp1
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_508.txt -v --follow-symlinks h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /grp1 /elink_grp1"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1283,7 +1263,6 @@ fi
 
 # soft-link vs ext-link
 TOOLTEST h5diff_509.txt -v h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /slink_grp1 /elink_grp1
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_510.txt -v --follow-symlinks h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /slink_grp1 /elink_grp1"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1295,7 +1274,6 @@ fi
 
 # circled ext links
 TOOLTEST h5diff_511.txt -v h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /grp10 /grp11
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_512.txt -v --follow-symlinks h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /grp10 /grp11"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1307,7 +1285,6 @@ fi
 
 # circled soft2ext-link vs soft2ext-link
 TOOLTEST h5diff_513.txt -v h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /slink_grp10 /slink_grp11
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_514.txt -v --follow-symlinks h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /slink_grp10 /slink_grp11"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1324,7 +1301,6 @@ fi
 ###############################################################################
 # file vs file
 TOOLTEST h5diff_515.txt -v h5diff_grp_recurse_ext1.h5 h5diff_grp_recurse_ext2-1.h5
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_516.txt -v --follow-symlinks h5diff_grp_recurse_ext1.h5 h5diff_grp_recurse_ext2-1.h5"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1335,7 +1311,6 @@ else
 fi
 # group vs group
 TOOLTEST h5diff_517.txt -v h5diff_grp_recurse_ext1.h5 h5diff_grp_recurse_ext2-1.h5 /g1
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_518.txt -v --follow-symlinks h5diff_grp_recurse_ext1.h5 h5diff_grp_recurse_ext2-1.h5 /g1"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1419,8 +1394,6 @@ TOOLTEST h5diff_801.txt -v h5diff_dset1.h5 h5diff_dset3.h5 /g1/array /g1/array
 # ##############################################################################
 # VDS tests
 # ##############################################################################
-
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_v1.txt -v 1_vds.h5 2_vds.h5"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
@@ -1432,7 +1405,6 @@ fi
 
 TOOLTEST h5diff_v2.txt -r 1_vds.h5 2_vds.h5
 
-# Note: Requires VOL connector that supports external links
 ARGS="h5diff_v3.txt -c 1_vds.h5 2_vds.h5"
 if [ $COMPAT_VOL -eq $EXIT_SUCCESS ]; then
     TOOLTEST $ARGS
diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake
index 19b86b1..6a70b85 100644
--- a/tools/test/h5dump/CMakeVFDTests.cmake
+++ b/tools/test/h5dump/CMakeVFDTests.cmake
@@ -66,7 +66,7 @@ endmacro ()
 ##############################################################################
 
 # Run test with different Virtual File Driver
-foreach (vfd ${VFDP_LIST})
+foreach (vfd ${VFD_LIST})
   # test for signed/unsigned datasets
   ADD_VFD_H5DUMP_TEST (${vfd} packedbits 0 --enable-error-stack packedbits.h5)
 endforeach ()
diff --git a/tools/test/h5dump/testh5dumpvds.sh.in b/tools/test/h5dump/testh5dumpvds.sh.in
index 8f4f7a1..ba5723e 100644
--- a/tools/test/h5dump/testh5dumpvds.sh.in
+++ b/tools/test/h5dump/testh5dumpvds.sh.in
@@ -505,7 +505,7 @@ 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_elink_compat_vol tool from $(topdir)/utils
+# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils/test
 $VDS_ELINK_COMPAT_VOL_BIN
 COMPAT_VOL=$?
 
@@ -513,43 +513,26 @@ COMPAT_VOL=$?
 
 # Data read
 if test $USE_FILTER_DEFLATE = "yes" ; then
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST tvds-1.ddl --enable-error-stack 1_vds.h5
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST tvds-2.ddl --enable-error-stack 2_vds.h5
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST tvds-3_1.ddl --enable-error-stack 3_1_vds.h5
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST tvds-3_2.ddl --enable-error-stack 3_2_vds.h5
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST tvds-4.ddl --enable-error-stack 4_vds.h5
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST tvds-5.ddl --enable-error-stack 5_vds.h5
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST vds-first.ddl --vds-view-first-missing --enable-error-stack vds-percival-unlim-maxmin.h5
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST vds-gap1.ddl -d /VDS-Eiger --vds-gap-size=1 --enable-error-stack vds-eiger.h5
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST vds-gap2.ddl --vds-gap-size=2 --enable-error-stack vds-eiger.h5
 fi
 
 # Layout read
 if test $USE_FILTER_DEFLATE = "yes" ; then
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST tvds_layout-1.ddl -p --enable-error-stack 1_vds.h5
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST tvds_layout-2.ddl -p --enable-error-stack 2_vds.h5
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST tvds_layout-3_1.ddl -p --enable-error-stack 3_1_vds.h5
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST tvds_layout-3_2.ddl -p --enable-error-stack 3_2_vds.h5
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST tvds_layout-4.ddl -p --enable-error-stack 4_vds.h5
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST tvds_layout-5.ddl -p --enable-error-stack 5_vds.h5
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST vds_layout-eiger.ddl -p --enable-error-stack vds-eiger.h5
-    # Note: Requires VOL connector that supports external links
     COMPAT_VOL_TEST vds_layout-maxmin.ddl -p --enable-error-stack vds-percival-unlim-maxmin.h5
 fi
 
diff --git a/tools/test/h5ls/testh5ls.sh.in b/tools/test/h5ls/testh5ls.sh.in
index e322d41..03af8c4 100644
--- a/tools/test/h5ls/testh5ls.sh.in
+++ b/tools/test/h5ls/testh5ls.sh.in
@@ -321,7 +321,7 @@ 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_elink_compat_vol tool from $(topdir)/utils
+# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils/test
 $VDS_ELINK_COMPAT_VOL_BIN
 COMPAT_VOL=$?
 
@@ -361,32 +361,21 @@ TOOLTEST tsoftlinks-5.ls 0 --follow-symlinks tsoftlinks.h5/soft_dset1
 
 # test for displaying external and user-defined links with --follow-symlinks
 TOOLTEST textlink-1.ls 0 -w80 -r textlink.h5
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST textlinksrc-1.ls 0 -w80 --follow-symlinks -r textlinksrc.h5
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST textlinksrc-2.ls 0 -w80 --follow-symlinks -rv textlinksrc.h5/ext_link5
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST textlinksrc-3.ls 0 -w80 --follow-symlinks -r textlinksrc.h5/ext_link1
 TOOLTEST textlinksrc-4.ls 0 -w80 -r textlinksrc.h5
 TOOLTEST textlinksrc-5.ls 0 -w80 -r textlinksrc.h5/ext_link1
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST textlinksrc-6.ls 0 -w80 --follow-symlinks textlinksrc.h5
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST textlinksrc-7.ls 0 -w80 --follow-symlinks textlinksrc.h5/ext_link1
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST tudlink-1.ls 0 -w80 -r tudlink.h5
 
 # test for displaying external links with -E
 # the option -E will be depriciated but keep it for backward compatibility
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST textlinksrc-1-old.ls 0 -w80 -Er textlinksrc.h5
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST textlinksrc-2-old.ls 0 -w80 -Erv textlinksrc.h5/ext_link5
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST textlinksrc-3-old.ls 0 -w80 -Er textlinksrc.h5/ext_link1
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST textlinksrc-6-old.ls 0 -w80 -E textlinksrc.h5
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST textlinksrc-7-old.ls 0 -w80 -E textlinksrc.h5/ext_link1
 
 # tests for no-dangling-links
@@ -394,7 +383,6 @@ COMPAT_VOL_TEST textlinksrc-7-old.ls 0 -w80 -E textlinksrc.h5/ext_link1
 # when used alone , expect to print out help and return exit code 1
 TOOLTEST textlinksrc-nodangle-1.ls 1 -w80 --no-dangling-links textlinksrc.h5
 # external dangling link - expected exit code 1
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST textlinksrc-nodangle-2.ls 1 -w80 --follow-symlinks --no-dangling-links textlinksrc.h5
 # soft dangling link - expected exit code 1
 TOOLTEST tsoftlinks-nodangle-1.ls 1 -w80 --follow-symlinks --no-dangling-links tsoftlinks.h5
diff --git a/tools/test/h5ls/testh5lsvds.sh.in b/tools/test/h5ls/testh5lsvds.sh.in
index 1b60cce..e9623b0 100644
--- a/tools/test/h5ls/testh5lsvds.sh.in
+++ b/tools/test/h5ls/testh5lsvds.sh.in
@@ -260,23 +260,17 @@ 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_elink_compat_vol tool from $(topdir)/utils
+# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils/test
 $VDS_ELINK_COMPAT_VOL_BIN
 COMPAT_VOL=$?
 
 ####### test for dataset vds ######
 
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST tvds-1.ls 0 -w80 -v -S 1_vds.h5
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST tvds-2.ls 0 -w80 -v -S 2_vds.h5
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST tvds-3_1.ls 0 -w80 -v -S 3_1_vds.h5
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST tvds-3_2.ls 0 -w80 -v -S 3_2_vds.h5
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST tvds-4.ls 0 -w80 -v -S 4_vds.h5
-# Note: Requires VOL connector that supports external links
 COMPAT_VOL_TEST tvds-5.ls 0 -w80 -v -S 5_vds.h5
 
 # Clean up temporary files/directories
diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in
index 27b08cb..ef89899 100644
--- a/tools/test/h5repack/h5repack.sh.in
+++ b/tools/test/h5repack/h5repack.sh.in
@@ -1342,7 +1342,7 @@ 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_elink_compat_vol tool from $(topdir)/utils
+# Note: Depends on vds_elink_compat_vol tool from $(topdir)/utils/test
 $VDS_ELINK_COMPAT_VOL_BIN
 COMPAT_VOL=$?
 
@@ -1762,35 +1762,30 @@ TOOLTEST_META meta_long h5repack_layout.h5 --metadata_block_size=8192
 if test  $USE_FILTER_DEFLATE != "yes" ; then
     SKIP vds_dset_chunk_20x10x5
 else
-    # 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
-    # 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
-    # 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
-    # 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
 else
-    # 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
 
@@ -1824,14 +1819,10 @@ 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
-# 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