Add support for "make check-vol", along with a few minor cleanups, etc.

4 files changed, 14 insertions, 13 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index 61dcda8..d950297 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -144,6 +144,9 @@ if DIRECT_VFD_CONDITIONAL
   VFD_LIST += direct
 endif
 
+VOL_LIST = native "pass_through under_vol=0;under_info={}" \
+           "pass_through under_vol=505;under_info={under_vol=0;under_info={}}"
+
 # Additional target for running timing test
 timings _timings: testmeta
 	@for timing in $(TIMINGS) dummy; do                                   \
diff --git a/test/freespace.c b/test/freespace.c
index 0011bd2..947b2ce 100644
--- a/test/freespace.c
+++ b/test/freespace.c
@@ -2862,14 +2862,8 @@ main(void)
 {
     hid_t           fapl = -1;              /* File access property list for data files */
     unsigned        nerrors = 0;            /* Cumulative error count */
-    const char     *env_h5_drvr = NULL;     /* File Driver value from environment */
     hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
 
-    /* Get the VFD to use */
-    env_h5_drvr = HDgetenv("HDF5_DRIVER");
-    if(env_h5_drvr == NULL)
-        env_h5_drvr = "nomatch";
-
     h5_reset();
 
     if((fapl = h5_fileaccess()) < 0) {
diff --git a/test/h5test.c b/test/h5test.c
index 0453162..f3d1ffc 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -42,7 +42,16 @@
  *      use for HDF5 file access.  The first word in the
  *      value is the name of the driver and subsequent data
  *      is interpreted according to the driver.  See
- *      h5_fileaccess() for details.
+ *      h5_get_vfd_fapl() for details.
+ *
+ * HDF5_VOL_CONNECTOR:    This string describes what VOL connector to
+ *      use for HDF5 file access.  The first word in the
+ *      value is the name of the connector and subsequent data
+ *      is interpreted according to the driver.  See
+ *      h5_get_vol_fapl() for details.
+ *
+ * HDF5_LIBVER_BOUNDS:    This string describes what library version bounds to
+ *      use for HDF5 file access.  See h5_get_libver_fapl() for details.
  *
  * HDF5_PREFIX:    A string to add to the beginning of all serial test
  *      file names.  This can be used to run tests in a
@@ -1021,7 +1030,7 @@ done:
 
 error:
     return -1;
-} /* end h5_get_vfd_fapl() */
+} /* end h5_get_libver_fapl() */
 
 
 /*-------------------------------------------------------------------------
diff --git a/test/links_env.c b/test/links_env.c
index b32fb32..0cd690a 100644
--- a/test/links_env.c
+++ b/test/links_env.c
@@ -148,11 +148,6 @@ main(void)
 {
     hid_t fapl; 	/* File access property lists */
     int	nerrors = 0;	/* Error from tests */
-    const char  *env_h5_drvr;      /* File Driver value from environment */
-
-    env_h5_drvr = HDgetenv("HDF5_DRIVER");
-    if(env_h5_drvr == NULL)
-        env_h5_drvr = "nomatch";
 
     h5_reset();
     fapl = h5_fileaccess();