Merge pull request #1652 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:check_passthrough_vol to develop

* commit '9ee3d472113fc3e66ef34e40a0990ed07a2824bc':
  Renamed the HDF5_TEST_VOL option to HDF5_TEST_PASSTHROUGH_VOL.
  Renamed the autotools check-vol target to check-passthrough-vol.

9 files changed, 34 insertions, 27 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1489c1..06ff1f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -772,11 +772,11 @@ if (BUILD_TESTING)
     mark_as_advanced (HDF5_TEST_FHEAP_VFD)
   endif ()
 
-  option (HDF5_TEST_VOL "Execute tests with different VOL connectors" OFF)
-  mark_as_advanced (HDF5_TEST_VOL)
-  if (HDF5_TEST_VOL)
-    option (HDF5_TEST_FHEAP_VOL "Execute fheap test with different VOL connectors" ON)
-    mark_as_advanced (HDF5_TEST_FHEAP_VOL)
+  option (HDF5_TEST_PASSTHROUGH_VOL "Execute tests with different passthrough VOL connectors" OFF)
+  mark_as_advanced (HDF5_TEST_PASSTHROUGH_VOL)
+  if (HDF5_TEST_PASSTHROUGH_VOL)
+    option (HDF5_TEST_FHEAP_PASSTHROUGH_VOL "Execute fheap test with different passthrough VOL connectors" ON)
+    mark_as_advanced (HDF5_TEST_FHEAP_PASSTHROUGH VOL)
   endif ()
 
   option (HDF_TEST_EXPRESS "Control testing framework (0-3)" "0")
diff --git a/MANIFEST b/MANIFEST
index 16f62b1..aa4c008 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3338,9 +3338,9 @@
 ./hl/tools/h5watch/CMakeTests.cmake
 ./src/CMakeLists.txt
 ./test/CMakeLists.txt
+./test/CMakePassthroughVOLTests.cmake
 ./test/CMakeTests.cmake
 ./test/CMakeVFDTests.cmake
-./test/CMakeVOLTests.cmake
 ./test/flushrefreshTest.cmake
 ./test/ShellTests.cmake
 ./testpar/CMakeLists.txt
diff --git a/Makefile.am b/Makefile.am
index b48bb30..7f872b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -186,8 +186,10 @@ check-vfd:
 	  fi;                                                          \
 	done
 
-# Run tests with different Virtual Object Layer Connectors.
-check-vol:
+# Run tests with different passthrough Virtual Object Layer Connectors.
+# NOTE: Will only succeed with passthrough VOL connectors that use
+#       the native VOL connector as the terminal connector.
+check-passthrough-vol:
 	for d in $(SUBDIRS); do                                \
 	  if test $$d != .; then                                       \
 	    (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;          \
diff --git a/bin/snapshot b/bin/snapshot
index 5900728..1218caa 100755
--- a/bin/snapshot
+++ b/bin/snapshot
@@ -130,10 +130,10 @@ DISPLAYUSAGE()
     set -
     cat <<EOF
 Usage: $PROGNAME [all] [checkout] [ftp <URL> [diff] [test] [srcdir] [release] [help]
-	[clean] [distclean] [echo] [deploy <dir>] [deploydir <dir>]
-	[zlib <zlib_path>] [releasedir <dir>] [srcdirname <dir>] [check-vfd]
-        [check-vol]
-	[exec <command>] [module-load <module-list>] [op-configure <option>] 
+        [clean] [distclean] [echo] [deploy <dir>] [deploydir <dir>]
+        [zlib <zlib_path>] [releasedir <dir>] [srcdirname <dir>] [check-vfd]
+        [check-passthrough-vol]
+        [exec <command>] [module-load <module-list>] [op-configure <option>]
         [--<option>]
     all:      Run all commands (checkout, test & release)
               [Default is all]
@@ -150,8 +150,8 @@ Usage: $PROGNAME [all] [checkout] [ftp <URL> [diff] [test] [srcdir] [release] [h
     setenv <name> <value>:
               Set environment variable <name> to <value>.
     setenvN <N> <name> <value> ...:
-	      Set environment variable with <N> values.
-	      E.g., setenvN 3 x a b c is same as setenv x="a b c".
+              Set environment variable with <N> values.
+              E.g., setenvN 3 x a b c is same as setenv x="a b c".
     srcdir:   Use srcdir option (does not imply other commands)
               "snapshot srcdir" is equivalent to "snapshot srcdir all"
               "snapshot srcdir checkout" is equivalent to "snapshot checkout"
@@ -169,9 +169,12 @@ Usage: $PROGNAME [all] [checkout] [ftp <URL> [diff] [test] [srcdir] [release] [h
               Use <dir> as the release directory
               [Default is $ReleaseDir_default]
     check-vfd:
-	      Run make check-vfd instead of just make check.
-    check-vol:
-	      Run make check-vol instead of just make check.
+              Run make check-vfd instead of just make check.
+    check-passthrough-vol:
+              Run make check-passthrough-vol instead of just make check.
+              NOTE: Will only succeed with passthrough VOL connectors
+              that use the native VOL connector as the terminal
+              connector.
     exttest <testscript>;
               Run testscript;
     exec <command>:
@@ -425,8 +428,8 @@ while [ $# -gt 0 ] ; do
 	check-vfd)
 	    CHECKVAL=check-vfd
 	    ;;
-	check-vol)
-	    CHECKVAL=check-vol
+	check-passthrough-vol)
+	    CHECKVAL=check-passthrough-vol
 	    ;;
         module-load)
             shift
diff --git a/config/commence.am b/config/commence.am
index 5d88a88..a16eee5 100644
--- a/config/commence.am
+++ b/config/commence.am
@@ -97,8 +97,8 @@ CHECK_CLEANFILES=*.chkexe *.chklog *.clog *.clog2
 # exists.
 .PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
         build-tests check-clean check-install check-p check-s check-vfd \
-        check-vol install-doc lib progs tests uninstall-doc _exec_check-s \
-        _test help
+        check-passthrough-vol install-doc lib progs tests uninstall-doc \
+        _exec_check-s _test help
 
 help:
 	@$(top_srcdir)/bin/makehelp
diff --git a/config/conclude.am b/config/conclude.am
index 9da1da5..2eec03a 100644
--- a/config/conclude.am
+++ b/config/conclude.am
@@ -282,8 +282,10 @@ check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
 	    fi;                                                               \
 	done
 
-# Run test with different Virtual Object Layer Connector
-check-vol: $(LIB) $(PROGS) $(chk_TESTS)
+# Run test with different passthrough Virtual Object Layer Connector
+# NOTE: Will only succeed with passthrough VOL connectors that use
+#       the native VOL connector as the terminal connector.
+check-passthrough-vol: $(LIB) $(PROGS) $(chk_TESTS)
 	@for vol in $(VOL_LIST) dummy; do                                     \
 	    if test "$$vol" != dummy; then                                    \
 	        echo "============================";                          \
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 7505196..f61f016 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -651,7 +651,7 @@ HDF5_PACKAGE_EXTLIBS           "CPACK - include external libraries"
 HDF5_STRICT_FORMAT_CHECKS      "Whether to perform strict file format checks"                 OFF
 HDF_TEST_EXPRESS               "Control testing framework (0-3)"                              "0"
 HDF5_TEST_VFD                  "Execute tests with different VFDs"                            OFF
-HDF5_TEST_VOL                  "Execute tests with different VOL connectors"                  OFF
+HDF5_TEST_PASSTHROUGH_VOL      "Execute tests with different passthrough VOL connectors"      OFF
 SKIP_ERROR_STACK_TESTS         "Skip tests that check the error stack"                        OFF
 HDF5_USE_16_API_DEFAULT        "Use the HDF5 1.6.x API by default"                            OFF
 HDF5_USE_18_API_DEFAULT        "Use the HDF5 1.8.x API by default"                            OFF
diff --git a/test/CMakeVOLTests.cmake b/test/CMakePassthroughVOLTests.cmake
index cf47291..8c7d797 100644
--- a/test/CMakeVOLTests.cmake
+++ b/test/CMakePassthroughVOLTests.cmake
@@ -340,7 +340,7 @@ endif ()
         set_tests_properties (VOL-${volname}-cache-shared PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
       endif ()
     endif ()
-    if (HDF5_TEST_FHEAP_VOL)
+    if (HDF5_TEST_FHEAP_PASSTHROUGH_VOL)
       add_test (
           NAME VOL-${volname}-fheap-clear-objects
           COMMAND    ${CMAKE_COMMAND}
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index c606eb1..fa6507a 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -1149,8 +1149,8 @@ endif ()
 ##############################################################################
 ##############################################################################
 
-if (HDF5_TEST_VOL)
-  include (CMakeVOLTests.cmake)
+if (HDF5_TEST_PASSTHROUGH_VOL)
+  include (CMakePassthroughVOLTests.cmake)
 endif ()
 
 ##############################################################################