VFD SWMR: normalization with develop (#1472)

Much normalization with develop. Still needs tools changes wrt VFD plugins.

1 files changed, 24 insertions, 9 deletions

diff --git a/test/vds.c b/test/vds.c
index ac9bb5d..4455ad4 100644
--- a/test/vds.c
+++ b/test/vds.c
@@ -196,7 +196,7 @@ vds_select_equal(hid_t space1, hid_t space2)
             if (nblocks1 != nblocks2)
                 return FALSE;
 
-            /* Allocate block lists.  Do not return directly afer
+            /* Allocate block lists.  Do not return directly after
              * allocating, to make sure buffers are freed. */
             if (NULL ==
                 (buf1 = (hsize_t *)HDmalloc((size_t)2 * (size_t)rank1 * (size_t)nblocks1 * sizeof(*buf1))))
@@ -479,7 +479,7 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl, hid_t *ex
 
     /* Verify examination DCPL is equal to original DCPL.  Do not compare the
      * plist to itself, and do not do the comparison if we reopened the file,
-     * because in that case the extent of the source dset will not be corrent.
+     * because in that case the extent of the source dset will not be current.
      */
     if ((*ex_dcpl != dcpl) && (config != TEST_API_REOPEN_FILE)) {
         if ((tri_ret = H5Pequal(dcpl, *ex_dcpl)) < 0)
@@ -1044,7 +1044,7 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
         if ((vspace[i] = H5Screate_simple(2, dims, NULL)) < 0)
             TEST_ERROR
 
-        /* Select row in virual dataspace */
+        /* Select row in virtual dataspace */
         start[0] = (hsize_t)i;
         if (H5Sselect_hyperslab(vspace[i], H5S_SELECT_SET, start, NULL, count, block) < 0)
             TEST_ERROR
@@ -1182,7 +1182,7 @@ test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl)
     hid_t       srcspace[4]             = {-1, -1, -1, -1}; /* Source dataspaces */
     hid_t       vspace[4]               = {-1, -1, -1, -1}; /* Virtual dset dataspaces */
     hid_t       memspace                = -1;               /* Memory dataspace */
-    hid_t       srcdset[4]              = {-1, -1, -1, -1}; /* Source datsets */
+    hid_t       srcdset[4]              = {-1, -1, -1, -1}; /* Source datasets */
     hid_t       vdset                   = -1;               /* Virtual dataset */
     hsize_t     dims[4]                 = {10, 26, 0, 0};   /* Data space current size */
     int         buf[10][26];                                /* Write and expected read buffer */
@@ -1461,7 +1461,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
     hid_t       srcspace[4]             = {-1, -1, -1, -1}; /* Source dataspaces */
     hid_t       vspace[4]               = {-1, -1, -1, -1}; /* Virtual dset dataspaces */
     hid_t       memspace                = -1;               /* Memory dataspace */
-    hid_t       srcdset[4]              = {-1, -1, -1, -1}; /* Source datsets */
+    hid_t       srcdset[4]              = {-1, -1, -1, -1}; /* Source datasets */
     hid_t       vdset                   = -1;               /* Virtual dataset */
     hsize_t     dims[4]                 = {10, 26, 0, 0};   /* Data space current size */
     hsize_t     start[4];                                   /* Hyperslab start */
@@ -4389,7 +4389,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
     hid_t          vspace[4]   = {-1, -1, -1, -1}; /* Virtual dset dataspaces */
     hid_t          memspace    = -1;               /* Memory dataspace */
     hid_t          filespace   = -1;               /* File dataspace */
-    hid_t          srcdset[4]  = {-1, -1, -1, -1}; /* Source datsets */
+    hid_t          srcdset[4]  = {-1, -1, -1, -1}; /* Source datasets */
     hid_t          vdset       = -1;               /* Virtual dataset */
     hsize_t        dims[2]     = {10, 10};         /* Data space current size */
     hsize_t        mdims[2]    = {10, 20};         /* Data space maximum size */
@@ -7403,7 +7403,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
     hid_t       vspace[2]                   = {-1, -1};                 /* Virtual dset dataspaces */
     hid_t       memspace                    = -1;                       /* Memory dataspace */
     hid_t       filespace                   = -1;                       /* File dataspace */
-    hid_t       srcdset[6]                  = {-1, -1, -1, -1, -1, -1}; /* Source datsets */
+    hid_t       srcdset[6]                  = {-1, -1, -1, -1, -1, -1}; /* Source datasets */
     hid_t       vdset                       = -1;                       /* Virtual dataset */
     hsize_t     dims[2]                     = {10, 0};                  /* Data space current size */
     hsize_t     mdims[2]                    = {10, 20};                 /* Data space maximum size */
@@ -11111,7 +11111,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
     hid_t   vspace[3]   = {-1, -1, -1};         /* Virtual dset dataspaces */
     hid_t   memspace    = -1;                   /* Memory dataspace */
     hid_t   filespace   = -1;                   /* File dataspace */
-    hid_t   srcdset[5]  = {-1, -1, -1, -1, -1}; /* Source datsets */
+    hid_t   srcdset[5]  = {-1, -1, -1, -1, -1}; /* Source datasets */
     hid_t   vdset       = -1;                   /* Virtual dataset */
     hsize_t dims[2]     = {6, 6};               /* Data space current size */
     hsize_t mdims[2]    = {10, 10};             /* Data space maximum size */
@@ -12288,9 +12288,24 @@ main(void)
     hid_t        src_fapl = -1; /* File access property list */
     int          test_api_config;
     unsigned     bit_config;
-    H5F_libver_t low, high; /* Low and high bounds */
+    H5F_libver_t low, high;   /* Low and high bounds */
+    const char * env_h5_drvr; /* File Driver value from environment */
     int          nerrors = 0;
 
+    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    if (env_h5_drvr == NULL)
+        env_h5_drvr = "nomatch";
+
+    /*
+     * Skip VDS tests for parallel-enabled and splitter VFDs. VDS currently
+     * doesn't support parallel reads and the splitter VFD has external
+     * link-related bugs.
+     */
+    if (h5_using_parallel_driver(env_h5_drvr) || !HDstrcmp(env_h5_drvr, "splitter")) {
+        HDputs(" -- SKIPPED for incompatible VFD --");
+        HDexit(EXIT_SUCCESS);
+    }
+
     /* Testing setup */
     h5_reset();
     fapl = h5_fileaccess();