VFD SWMR: Normalization with develop (#1506)

* Brought over plugin and test script changes

* Removes remaining register keywords (#1481)

* Fixed warnings in the aux process code

* Minor fixes from develop

* Minor changes from develop, fixed format warnings

* Formatted source

* Added HD prefix to timespec_get

* Cleanup in new files

* Removes the MANIFEST file and unused release files (#1497)

* Removes the MANIFEST file and unused release files

* Updated tar command

* checkposix corrections

* More checkposix fixes

* Ripped out unused instrumentation functionality

* Brought over cache tagging changes from develop

* Changes to tagged metadata expulsion iteration

* Fixed typo

* Brought over H5O__free() changes from develop

* Brings (unused) parallel page buffer test in line with develop

* Moved the functionality in supervise.subr to test_vfd_swmr.sh

* Tools VFD parameter updates

* Committing clang-format changes

* H5F VFD SWMR refactoring

* Committing clang-format changes

* Misc changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

5 files changed, 377 insertions, 354 deletions

diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 5258211..339b563 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -3914,9 +3914,9 @@ gent_multi(void)
 static void
 gent_large_objname(void)
 {
-    hid_t        fid, group, group2;
-    char         grp_name[128];
-    register int i;
+    hid_t fid, group, group2;
+    char  grp_name[128];
+    int   i;
 
     fid = H5Fcreate(FILE37, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
index e7cc21a..8b114e4 100644
--- a/tools/test/h5repack/h5repacktst.c
+++ b/tools/test/h5repack/h5repacktst.c
@@ -272,98 +272,100 @@ main(void)
         GOERROR;
     PASSED();
 
-    TESTING("    files with file space info setting-- options -S and -P are set & -L");
-    ++j; /* #3 */
-    HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
-    fname = H5REPACK_FSPACE_FNAMES[j];
-    if (h5repack_init(&pack_options, 0, TRUE) < 0)
-        GOERROR;
-    pack_options.fs_strategy = H5F_FSPACE_STRATEGY_PAGE; /* "PAGE" specified via -S */
-    pack_options.fs_persist  = TRUE;
-    if (h5repack(fname, FSPACE_OUT, &pack_options) < 0)
-        GOERROR;
-    if (h5diff(fname, FSPACE_OUT, NULL, NULL, &diff_options) > 0)
-        GOERROR;
-    if (h5repack_verify(fname, FSPACE_OUT, &pack_options) <= 0)
-        GOERROR;
-    if (h5repack_end(&pack_options) < 0)
-        GOERROR;
-    PASSED();
+    if (h5_using_default_driver(NULL)) {
+        TESTING("    files with file space info setting-- options -S and -P are set & -L");
+        ++j; /* #3 */
+        HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
+        fname = H5REPACK_FSPACE_FNAMES[j];
+        if (h5repack_init(&pack_options, 0, TRUE) < 0)
+            GOERROR;
+        pack_options.fs_strategy = H5F_FSPACE_STRATEGY_PAGE; /* "PAGE" specified via -S */
+        pack_options.fs_persist  = TRUE;
+        if (h5repack(fname, FSPACE_OUT, &pack_options) < 0)
+            GOERROR;
+        if (h5diff(fname, FSPACE_OUT, NULL, NULL, &diff_options) > 0)
+            GOERROR;
+        if (h5repack_verify(fname, FSPACE_OUT, &pack_options) <= 0)
+            GOERROR;
+        if (h5repack_end(&pack_options) < 0)
+            GOERROR;
+        PASSED();
 
-    TESTING("    files with file space info setting-- options -P and -T are set & -L");
-    ++j; /* #4 */
-    HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
-    fname = H5REPACK_FSPACE_FNAMES[j];
-    if (h5repack_init(&pack_options, 0, TRUE) < 0)
-        GOERROR;
-    pack_options.fs_persist   = -1; /* "FALSE" is set via -P 0 */
-    pack_options.fs_threshold = 2;
-    if (h5repack(fname, FSPACE_OUT, &pack_options) < 0)
-        GOERROR;
-    if (h5diff(fname, FSPACE_OUT, NULL, NULL, &diff_options) > 0)
-        GOERROR;
-    if (h5repack_verify(fname, FSPACE_OUT, &pack_options) <= 0)
-        GOERROR;
-    if (h5repack_end(&pack_options) < 0)
-        GOERROR;
-    PASSED();
+        TESTING("    files with file space info setting-- options -P and -T are set & -L");
+        ++j; /* #4 */
+        HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
+        fname = H5REPACK_FSPACE_FNAMES[j];
+        if (h5repack_init(&pack_options, 0, TRUE) < 0)
+            GOERROR;
+        pack_options.fs_persist   = -1; /* "FALSE" is set via -P 0 */
+        pack_options.fs_threshold = 2;
+        if (h5repack(fname, FSPACE_OUT, &pack_options) < 0)
+            GOERROR;
+        if (h5diff(fname, FSPACE_OUT, NULL, NULL, &diff_options) > 0)
+            GOERROR;
+        if (h5repack_verify(fname, FSPACE_OUT, &pack_options) <= 0)
+            GOERROR;
+        if (h5repack_end(&pack_options) < 0)
+            GOERROR;
+        PASSED();
 
-    TESTING("    files with file space info setting-- options -S and -G are set & -L");
-    ++j; /* #5 */
-    HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
-    fname = H5REPACK_FSPACE_FNAMES[j];
-    if (h5repack_init(&pack_options, 0, TRUE) < 0)
-        GOERROR;
-    pack_options.fs_strategy = H5F_FSPACE_STRATEGY_PAGE;
-    pack_options.fs_pagesize = 8192;
-    if (h5repack(fname, FSPACE_OUT, &pack_options) < 0)
-        GOERROR;
-    if (h5diff(fname, FSPACE_OUT, NULL, NULL, &diff_options) > 0)
-        GOERROR;
-    if (h5repack_verify(fname, FSPACE_OUT, &pack_options) <= 0)
-        GOERROR;
-    if (h5repack_end(&pack_options) < 0)
-        GOERROR;
-    PASSED();
+        TESTING("    files with file space info setting-- options -S and -G are set & -L");
+        ++j; /* #5 */
+        HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
+        fname = H5REPACK_FSPACE_FNAMES[j];
+        if (h5repack_init(&pack_options, 0, TRUE) < 0)
+            GOERROR;
+        pack_options.fs_strategy = H5F_FSPACE_STRATEGY_PAGE;
+        pack_options.fs_pagesize = 8192;
+        if (h5repack(fname, FSPACE_OUT, &pack_options) < 0)
+            GOERROR;
+        if (h5diff(fname, FSPACE_OUT, NULL, NULL, &diff_options) > 0)
+            GOERROR;
+        if (h5repack_verify(fname, FSPACE_OUT, &pack_options) <= 0)
+            GOERROR;
+        if (h5repack_end(&pack_options) < 0)
+            GOERROR;
+        PASSED();
 
-    TESTING("    files with file space info setting-- options -S, -P, -T, -G are set");
-    ++j; /* #6 */
-    HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
-    fname = H5REPACK_FSPACE_FNAMES[j];
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
-        GOERROR;
-    pack_options.fs_strategy  = H5F_FSPACE_STRATEGY_NONE;
-    pack_options.fs_persist   = -1; /* "FALSE" is set via -P 0 */
-    pack_options.fs_threshold = 1;
-    pack_options.fs_pagesize  = 8192;
-    if (h5repack(fname, FSPACE_OUT, &pack_options) < 0)
-        GOERROR;
-    if (h5diff(fname, FSPACE_OUT, NULL, NULL, &diff_options) > 0)
-        GOERROR;
-    if (h5repack_verify(fname, FSPACE_OUT, &pack_options) <= 0)
-        GOERROR;
-    if (h5repack_end(&pack_options) < 0)
-        GOERROR;
-    PASSED();
+        TESTING("    files with file space info setting-- options -S, -P, -T, -G are set");
+        ++j; /* #6 */
+        HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
+        fname = H5REPACK_FSPACE_FNAMES[j];
+        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+            GOERROR;
+        pack_options.fs_strategy  = H5F_FSPACE_STRATEGY_NONE;
+        pack_options.fs_persist   = -1; /* "FALSE" is set via -P 0 */
+        pack_options.fs_threshold = 1;
+        pack_options.fs_pagesize  = 8192;
+        if (h5repack(fname, FSPACE_OUT, &pack_options) < 0)
+            GOERROR;
+        if (h5diff(fname, FSPACE_OUT, NULL, NULL, &diff_options) > 0)
+            GOERROR;
+        if (h5repack_verify(fname, FSPACE_OUT, &pack_options) <= 0)
+            GOERROR;
+        if (h5repack_end(&pack_options) < 0)
+            GOERROR;
+        PASSED();
 
-    TESTING("    files with file space info setting-- options -S, -T, -G are set & -L");
-    ++j; /* #7 */
-    HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
-    fname = H5REPACK_FSPACE_FNAMES[j];
-    if (h5repack_init(&pack_options, 0, TRUE) < 0)
-        GOERROR;
-    pack_options.fs_strategy  = H5F_FSPACE_STRATEGY_AGGR;
-    pack_options.fs_threshold = 1;
-    pack_options.fs_pagesize  = 4096;
-    if (h5repack(fname, FSPACE_OUT, &pack_options) < 0)
-        GOERROR;
-    if (h5diff(fname, FSPACE_OUT, NULL, NULL, &diff_options) > 0)
-        GOERROR;
-    if (h5repack_verify(fname, FSPACE_OUT, &pack_options) <= 0)
-        GOERROR;
-    if (h5repack_end(&pack_options) < 0)
-        GOERROR;
-    PASSED();
+        TESTING("    files with file space info setting-- options -S, -T, -G are set & -L");
+        ++j; /* #7 */
+        HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
+        fname = H5REPACK_FSPACE_FNAMES[j];
+        if (h5repack_init(&pack_options, 0, TRUE) < 0)
+            GOERROR;
+        pack_options.fs_strategy  = H5F_FSPACE_STRATEGY_AGGR;
+        pack_options.fs_threshold = 1;
+        pack_options.fs_pagesize  = 4096;
+        if (h5repack(fname, FSPACE_OUT, &pack_options) < 0)
+            GOERROR;
+        if (h5diff(fname, FSPACE_OUT, NULL, NULL, &diff_options) > 0)
+            GOERROR;
+        if (h5repack_verify(fname, FSPACE_OUT, &pack_options) <= 0)
+            GOERROR;
+        if (h5repack_end(&pack_options) < 0)
+            GOERROR;
+        PASSED();
+    }
 
     /*-------------------------------------------------------------------------
      * file with fill values
@@ -389,20 +391,22 @@ main(void)
      * file with all kinds of dataset datatypes
      *-------------------------------------------------------------------------
      */
-    TESTING("    copy of datasets (all datatypes)");
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
-        GOERROR;
-    if (h5repack(FNAME1, FNAME1OUT, &pack_options) < 0)
-        GOERROR;
-    if (h5diff(FNAME1, FNAME1OUT, NULL, NULL, &diff_options) > 0)
-        GOERROR;
-    if (h5repack_verify(FNAME1, FNAME1OUT, &pack_options) <= 0)
-        GOERROR;
-    if (h5repack_cmp_pl(FNAME1, pack_options.fin_fapl, FNAME1OUT, pack_options.fout_fapl) <= 0)
-        GOERROR;
-    if (h5repack_end(&pack_options) < 0)
-        GOERROR;
-    PASSED();
+    if (!h5_using_parallel_driver(NULL)) {
+        TESTING("    copy of datasets (all datatypes)");
+        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+            GOERROR;
+        if (h5repack(FNAME1, FNAME1OUT, &pack_options) < 0)
+            GOERROR;
+        if (h5diff(FNAME1, FNAME1OUT, NULL, NULL, &diff_options) > 0)
+            GOERROR;
+        if (h5repack_verify(FNAME1, FNAME1OUT, &pack_options) <= 0)
+            GOERROR;
+        if (h5repack_cmp_pl(FNAME1, pack_options.fin_fapl, FNAME1OUT, pack_options.fout_fapl) <= 0)
+            GOERROR;
+        if (h5repack_end(&pack_options) < 0)
+            GOERROR;
+        PASSED();
+    }
 
     /*-------------------------------------------------------------------------
      * file with attributes
@@ -1487,49 +1491,53 @@ main(void)
         GOERROR;
     PASSED();
 
-    /*-------------------------------------------------------------------------
-     * test file with userblock
-     *-------------------------------------------------------------------------
-     */
-    TESTING("    file with userblock");
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
-        GOERROR;
-    if (h5repack(FNAME16, FNAME16OUT, &pack_options) < 0)
-        GOERROR;
-    if (h5diff(FNAME16, FNAME16OUT, NULL, NULL, &diff_options) > 0)
-        GOERROR;
-    if (h5repack_verify(FNAME16, FNAME16OUT, &pack_options) <= 0)
-        GOERROR;
-    if (verify_userblock(FNAME16OUT) < 0)
-        GOERROR;
-    if (h5repack_end(&pack_options) < 0)
-        GOERROR;
-    PASSED();
+    if (h5_using_default_driver(NULL)) {
+        /*-------------------------------------------------------------------------
+         * test file with userblock
+         *-------------------------------------------------------------------------
+         */
+        TESTING("    file with userblock");
+        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+            GOERROR;
+        if (h5repack(FNAME16, FNAME16OUT, &pack_options) < 0)
+            GOERROR;
+        if (h5diff(FNAME16, FNAME16OUT, NULL, NULL, &diff_options) > 0)
+            GOERROR;
+        if (h5repack_verify(FNAME16, FNAME16OUT, &pack_options) <= 0)
+            GOERROR;
+        if (verify_userblock(FNAME16OUT) < 0)
+            GOERROR;
+        if (h5repack_end(&pack_options) < 0)
+            GOERROR;
+        PASSED();
+    }
 
     /*-------------------------------------------------------------------------
      * test --latest options
      *-------------------------------------------------------------------------
      */
-    TESTING("    latest file format options");
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
-        GOERROR;
-    pack_options.latest      = 1;
-    pack_options.grp_compact = 10;
-    pack_options.grp_indexed = 5;
-    pack_options.msg_size[0] = 10;
-    pack_options.msg_size[1] = 20;
-    pack_options.msg_size[2] = 30;
-    pack_options.msg_size[3] = 40;
-    pack_options.msg_size[4] = 50;
-    if (h5repack(FNAME1, FNAME1OUT, &pack_options) < 0)
-        GOERROR;
-    if (h5diff(FNAME1, FNAME1OUT, NULL, NULL, &diff_options) > 0)
-        GOERROR;
-    if (h5repack_verify(FNAME1, FNAME1OUT, &pack_options) <= 0)
-        GOERROR;
-    if (h5repack_end(&pack_options) < 0)
-        GOERROR;
-    PASSED();
+    if (!h5_using_parallel_driver(NULL)) {
+        TESTING("    latest file format options");
+        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+            GOERROR;
+        pack_options.latest      = 1;
+        pack_options.grp_compact = 10;
+        pack_options.grp_indexed = 5;
+        pack_options.msg_size[0] = 10;
+        pack_options.msg_size[1] = 20;
+        pack_options.msg_size[2] = 30;
+        pack_options.msg_size[3] = 40;
+        pack_options.msg_size[4] = 50;
+        if (h5repack(FNAME1, FNAME1OUT, &pack_options) < 0)
+            GOERROR;
+        if (h5diff(FNAME1, FNAME1OUT, NULL, NULL, &diff_options) > 0)
+            GOERROR;
+        if (h5repack_verify(FNAME1, FNAME1OUT, &pack_options) <= 0)
+            GOERROR;
+        if (h5repack_end(&pack_options) < 0)
+            GOERROR;
+        PASSED();
+    }
 
     /*-------------------------------------------------------------------------
      * test several global filters
@@ -1560,36 +1568,38 @@ main(void)
     SKIPPED();
 #endif
 
-    /*-------------------------------------------------------------------------
-     * test file with userblock
-     *-------------------------------------------------------------------------
-     */
-    TESTING("    file with added userblock");
+    if (h5_using_default_driver(NULL)) {
+        /*-------------------------------------------------------------------------
+         * test file with userblock
+         *-------------------------------------------------------------------------
+         */
+        TESTING("    file with added userblock");
 
 #ifdef H5_HAVE_FILTER_DEFLATE
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
-        GOERROR;
+        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+            GOERROR;
 
-    /* add the options for a user block size and user block filename */
-    pack_options.ublock_size     = USERBLOCK_SIZE;
-    pack_options.ublock_filename = FNAME_UB;
+        /* add the options for a user block size and user block filename */
+        pack_options.ublock_size     = USERBLOCK_SIZE;
+        pack_options.ublock_filename = FNAME_UB;
 
-    if (h5repack(FNAME8, FNAME8OUT, &pack_options) < 0)
-        GOERROR;
-    if (h5diff(FNAME8, FNAME8OUT, NULL, NULL, &diff_options) > 0)
-        GOERROR;
-    if (h5repack_verify(FNAME8, FNAME8OUT, &pack_options) <= 0)
-        GOERROR;
-    if (verify_userblock(FNAME8OUT) < 0)
-        GOERROR;
-    if (h5repack_end(&pack_options) < 0)
-        GOERROR;
+        if (h5repack(FNAME8, FNAME8OUT, &pack_options) < 0)
+            GOERROR;
+        if (h5diff(FNAME8, FNAME8OUT, NULL, NULL, &diff_options) > 0)
+            GOERROR;
+        if (h5repack_verify(FNAME8, FNAME8OUT, &pack_options) <= 0)
+            GOERROR;
+        if (verify_userblock(FNAME8OUT) < 0)
+            GOERROR;
+        if (h5repack_end(&pack_options) < 0)
+            GOERROR;
 
-    PASSED();
+        PASSED();
 #else
-    SKIPPED();
+        SKIPPED();
 #endif
+    }
 
     /*-------------------------------------------------------------------------
      * test file with alignment
@@ -1664,48 +1674,50 @@ main(void)
 
     PASSED();
 
-    /*-------------------------------------------------------------------------
-     * test --metadata_block_size option
-     * Also verify that output file using the metadata_block_size option is
-     * larger than the output file one not using it.
-     * FNAME4 is used because it is the same as the test file used for the
-     * shell script version of this test (h5repack.sh).
-     *-------------------------------------------------------------------------
-     */
-    TESTING("    metadata block size option");
-    /* First run without metadata option. No need to verify the correctness */
-    /* since this has been verified by earlier tests. Just record the file */
-    /* size of the output file. */
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
-        GOERROR;
-    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
-        GOERROR;
-    if (HDstat(FNAME4OUT, &file_stat) < 0)
-        GOERROR;
-    fsize1 = file_stat.st_size;
-    if (h5repack_end(&pack_options) < 0)
-        GOERROR;
+    if (h5_using_default_driver(NULL)) {
+        /*-------------------------------------------------------------------------
+         * test --metadata_block_size option
+         * Also verify that output file using the metadata_block_size option is
+         * larger than the output file one not using it.
+         * FNAME4 is used because it is the same as the test file used for the
+         * shell script version of this test (h5repack.sh).
+         *-------------------------------------------------------------------------
+         */
+        TESTING("    metadata block size option");
+        /* First run without metadata option. No need to verify the correctness */
+        /* since this has been verified by earlier tests. Just record the file */
+        /* size of the output file. */
+        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+            GOERROR;
+        if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
+            GOERROR;
+        if (HDstat(FNAME4OUT, &file_stat) < 0)
+            GOERROR;
+        fsize1 = file_stat.st_size;
+        if (h5repack_end(&pack_options) < 0)
+            GOERROR;
 
-    /* run it again with metadata option */
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
-        GOERROR;
-    pack_options.meta_block_size = 8192;
-    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
-        GOERROR;
-    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
-        GOERROR;
-    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
-        GOERROR;
-    /* record the file size of the output file */
-    if (HDstat(FNAME4OUT, &file_stat) < 0)
-        GOERROR;
-    fsize2 = file_stat.st_size;
-    /* verify second file size is larger than the first one */
-    if (fsize2 <= fsize1)
-        GOERROR;
-    if (h5repack_end(&pack_options) < 0)
-        GOERROR;
-    PASSED();
+        /* run it again with metadata option */
+        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+            GOERROR;
+        pack_options.meta_block_size = 8192;
+        if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
+            GOERROR;
+        if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
+            GOERROR;
+        if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
+            GOERROR;
+        /* record the file size of the output file */
+        if (HDstat(FNAME4OUT, &file_stat) < 0)
+            GOERROR;
+        fsize2 = file_stat.st_size;
+        /* verify second file size is larger than the first one */
+        if (fsize2 <= fsize1)
+            GOERROR;
+        if (h5repack_end(&pack_options) < 0)
+            GOERROR;
+        PASSED();
+    }
 
     /*-------------------------------------------------------------------------
      * clean temporary test files
@@ -1725,7 +1737,10 @@ main(void)
     return 0;
 
 error:
+    h5tools_close();
+
     puts("***** H5REPACK TESTS FAILED *****");
+
     return 1;
 }
 
@@ -1760,12 +1775,14 @@ make_testfiles(void)
      * create another file for general copy test (all datatypes)
      *-------------------------------------------------------------------------
      */
-    if ((fid = H5Fcreate(FNAME1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        return -1;
-    if (make_all_objects(fid) < 0)
-        goto out;
-    if (H5Fclose(fid) < 0)
-        return -1;
+    if (!h5_using_parallel_driver(NULL)) {
+        if ((fid = H5Fcreate(FNAME1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            return -1;
+        if (make_all_objects(fid) < 0)
+            goto out;
+        if (H5Fclose(fid) < 0)
+            return -1;
+    }
 
     /*-------------------------------------------------------------------------
      * create a file for attributes copy test
@@ -1934,19 +1951,21 @@ make_testfiles(void)
     if (H5Fclose(fid) < 0)
         return -1;
 
-    /*-------------------------------------------------------------------------
-     * create a file with userblock
-     *-------------------------------------------------------------------------
-     */
-    if (make_userblock() < 0)
-        goto out;
+    if (h5_using_default_driver(NULL)) {
+        /*-------------------------------------------------------------------------
+         * create a file with userblock
+         *-------------------------------------------------------------------------
+         */
+        if (make_userblock() < 0)
+            goto out;
 
-    /*-------------------------------------------------------------------------
-     * create a userblock file
-     *-------------------------------------------------------------------------
-     */
-    if (make_userblock_file() < 0)
-        goto out;
+        /*-------------------------------------------------------------------------
+         * create a userblock file
+         *-------------------------------------------------------------------------
+         */
+        if (make_userblock_file() < 0)
+            goto out;
+    }
 
     /*-------------------------------------------------------------------------
      * create a file with named datatypes
@@ -1959,30 +1978,32 @@ make_testfiles(void)
     if (H5Fclose(fid) < 0)
         return -1;
 
-    /*-------------------------------------------------------------------------
-     * create obj and region reference type datasets (bug1814)
-     * add attribute with int type (bug1726)
-     * add attribute with obj and region reference type (bug1726)
-     *-------------------------------------------------------------------------
-     */
-    if ((fid = H5Fcreate(FNAME_REF, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        return -1;
-    /* create reference type datasets */
-    if (make_references(fid) < 0)
-        goto out;
-    if (H5Fclose(fid) < 0)
-        return -1;
+    if (!h5_using_parallel_driver(NULL)) {
+        /*-------------------------------------------------------------------------
+         * create obj and region reference type datasets (bug1814)
+         * add attribute with int type (bug1726)
+         * add attribute with obj and region reference type (bug1726)
+         *-------------------------------------------------------------------------
+         */
+        if ((fid = H5Fcreate(FNAME_REF, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            return -1;
+        /* create reference type datasets */
+        if (make_references(fid) < 0)
+            goto out;
+        if (H5Fclose(fid) < 0)
+            return -1;
 
-    /*-------------------------------------------------------------------------
-     * create a file with obj and region references in attribute of compound and
-     * vlen datatype
-     *-------------------------------------------------------------------------*/
-    if ((fid = H5Fcreate(FNAME_ATTR_REF, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        return -1;
-    if (make_complex_attr_references(fid) < 0)
-        goto out;
-    if (H5Fclose(fid) < 0)
-        return -1;
+        /*-------------------------------------------------------------------------
+         * create a file with obj and region references in attribute of compound and
+         * vlen datatype
+         *-------------------------------------------------------------------------*/
+        if ((fid = H5Fcreate(FNAME_ATTR_REF, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            return -1;
+        if (make_complex_attr_references(fid) < 0)
+            goto out;
+        if (H5Fclose(fid) < 0)
+            return -1;
+    }
 
     /*-------------------------------------------------------------------------
      * create 8 files with combinations ???
@@ -2018,111 +2039,113 @@ make_testfiles(void)
     if (H5Fclose(fid) < 0)
         return -1;
 
-    /*
-     * #2 -- h5repack_page_persist.h5
-     * Setting:
-     *    strategy=PAGE, persist=TRUE, threshold=1
-     *    inpage=512
-     *  latest format
-     */
-    /* Create file creation property list */
-    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
-        return -1;
-    if (H5Pset_file_space_page_size(fcpl, (hsize_t)512) < 0)
-        return -1;
-    if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1) < 0)
-        return -1;
-    HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
-    if ((fid = H5Fcreate(H5REPACK_FSPACE_FNAMES[++j], H5F_ACC_TRUNC, fcpl, fapl)) < 0)
-        return -1;
-    if (H5Fclose(fid) < 0)
-        return -1;
-    if (H5Pclose(fcpl) < 0)
-        return -1;
-
-    /*
-     * #3 -- h5repack_fsm_aggr_persist.h5
-     * Setting:
-     *    strategy=FSM_AGGR, persist=TRUE, threshold=1
-     *  default: inpage=4096
-     */
-    /* Create file creation property list */
-    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
-        return -1;
-    if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1) < 0)
-        return -1;
-    HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
-    if ((fid = H5Fcreate(H5REPACK_FSPACE_FNAMES[++j], H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0)
-        return -1;
-    if (H5Fclose(fid) < 0)
-        return -1;
-    if (H5Pclose(fcpl) < 0)
-        return -1;
-
-    /*
-     * #4 -- h5repack_page_threshold.h5
-     * Setting:
-     *    strategy=PAGE, persist=FALSE, threshold=3
-     *  inpage=8192
-     *  latest format
-     */
-
-    /* Create file creation property list */
-    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
-        return -1;
-    if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)3) < 0)
-        return -1;
-    if (H5Pset_file_space_page_size(fcpl, (hsize_t)8192) < 0)
-        return -1;
-    HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
-    if ((fid = H5Fcreate(H5REPACK_FSPACE_FNAMES[++j], H5F_ACC_TRUNC, fcpl, fapl)) < 0)
-        return -1;
-    if (H5Fclose(fid) < 0)
-        return -1;
-    if (H5Pclose(fcpl) < 0)
-        return -1;
-
-    /*
-     * #5 -- h5repack_fsm_aggr_threshold.h5
-     * Setting:
-     *    strategy=FSM_AGGR, persist=FALSE, threshold=3
-     *    inpage=4096
-     */
+    if (h5_using_default_driver(NULL)) {
+        /*
+         * #2 -- h5repack_page_persist.h5
+         * Setting:
+         *    strategy=PAGE, persist=TRUE, threshold=1
+         *    inpage=512
+         *  latest format
+         */
+        /* Create file creation property list */
+        if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+            return -1;
+        if (H5Pset_file_space_page_size(fcpl, (hsize_t)512) < 0)
+            return -1;
+        if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1) < 0)
+            return -1;
+        HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
+        if ((fid = H5Fcreate(H5REPACK_FSPACE_FNAMES[++j], H5F_ACC_TRUNC, fcpl, fapl)) < 0)
+            return -1;
+        if (H5Fclose(fid) < 0)
+            return -1;
+        if (H5Pclose(fcpl) < 0)
+            return -1;
+
+        /*
+         * #3 -- h5repack_fsm_aggr_persist.h5
+         * Setting:
+         *    strategy=FSM_AGGR, persist=TRUE, threshold=1
+         *  default: inpage=4096
+         */
+        /* Create file creation property list */
+        if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+            return -1;
+        if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1) < 0)
+            return -1;
+        HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
+        if ((fid = H5Fcreate(H5REPACK_FSPACE_FNAMES[++j], H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0)
+            return -1;
+        if (H5Fclose(fid) < 0)
+            return -1;
+        if (H5Pclose(fcpl) < 0)
+            return -1;
+
+        /*
+         * #4 -- h5repack_page_threshold.h5
+         * Setting:
+         *    strategy=PAGE, persist=FALSE, threshold=3
+         *  inpage=8192
+         *  latest format
+         */
 
-    /* Create file creation property list */
-    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
-        return -1;
-    if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, FALSE, (hsize_t)3) < 0)
-        return -1;
-    if (H5Pset_file_space_page_size(fcpl, (hsize_t)FS_PAGESIZE_DEF) < 0)
-        return -1;
-    HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
-    if ((fid = H5Fcreate(H5REPACK_FSPACE_FNAMES[++j], H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0)
-        return -1;
-    if (H5Fclose(fid) < 0)
-        return -1;
-    if (H5Pclose(fcpl) < 0)
-        return -1;
+        /* Create file creation property list */
+        if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+            return -1;
+        if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)3) < 0)
+            return -1;
+        if (H5Pset_file_space_page_size(fcpl, (hsize_t)8192) < 0)
+            return -1;
+        HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
+        if ((fid = H5Fcreate(H5REPACK_FSPACE_FNAMES[++j], H5F_ACC_TRUNC, fcpl, fapl)) < 0)
+            return -1;
+        if (H5Fclose(fid) < 0)
+            return -1;
+        if (H5Pclose(fcpl) < 0)
+            return -1;
+
+        /*
+         * #5 -- h5repack_fsm_aggr_threshold.h5
+         * Setting:
+         *    strategy=FSM_AGGR, persist=FALSE, threshold=3
+         *    inpage=4096
+         */
 
-    /*
-     * #6 -- h5repack_aggr.h5
-     * Setting:
-     *     strategy=AGGR, persist=FALSE, threshold=1
-     *  latest format
-     */
+        /* Create file creation property list */
+        if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+            return -1;
+        if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, FALSE, (hsize_t)3) < 0)
+            return -1;
+        if (H5Pset_file_space_page_size(fcpl, (hsize_t)FS_PAGESIZE_DEF) < 0)
+            return -1;
+        HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
+        if ((fid = H5Fcreate(H5REPACK_FSPACE_FNAMES[++j], H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0)
+            return -1;
+        if (H5Fclose(fid) < 0)
+            return -1;
+        if (H5Pclose(fcpl) < 0)
+            return -1;
+
+        /*
+         * #6 -- h5repack_aggr.h5
+         * Setting:
+         *     strategy=AGGR, persist=FALSE, threshold=1
+         *  latest format
+         */
 
-    /* Create file creation property list */
-    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
-        return -1;
-    if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_AGGR, FALSE, (hsize_t)1) < 0)
-        return -1;
-    HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
-    if ((fid = H5Fcreate(H5REPACK_FSPACE_FNAMES[++j], H5F_ACC_TRUNC, fcpl, fapl)) < 0)
-        return -1;
-    if (H5Fclose(fid) < 0)
-        return -1;
-    if (H5Pclose(fcpl) < 0)
-        return -1;
+        /* Create file creation property list */
+        if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+            return -1;
+        if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_AGGR, FALSE, (hsize_t)1) < 0)
+            return -1;
+        HDassert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
+        if ((fid = H5Fcreate(H5REPACK_FSPACE_FNAMES[++j], H5F_ACC_TRUNC, fcpl, fapl)) < 0)
+            return -1;
+        if (H5Fclose(fid) < 0)
+            return -1;
+        if (H5Pclose(fcpl) < 0)
+            return -1;
+    }
 
     /*
      * #7 -- h5repack_none.h5
diff --git a/tools/test/perform/pio_standalone.c b/tools/test/perform/pio_standalone.c
index 032bfba..a074d2c 100644
--- a/tools/test/perform/pio_standalone.c
+++ b/tools/test/perform/pio_standalone.c
@@ -92,7 +92,7 @@ get_option(int argc, const char **argv, const char *opts, const struct h5_long_o
         sp = 1;
     }
     else {
-        register char *cp; /* pointer into current token */
+        char *cp; /* pointer into current token */
 
         /* short command line option */
         opt_opt = argv[H5_optind][sp];
diff --git a/tools/test/perform/sio_standalone.c b/tools/test/perform/sio_standalone.c
index 7c22b53..353dad3 100644
--- a/tools/test/perform/sio_standalone.c
+++ b/tools/test/perform/sio_standalone.c
@@ -92,7 +92,7 @@ get_option(int argc, const char **argv, const char *opts, const struct h5_long_o
         sp = 1;
     }
     else {
-        register char *cp; /* pointer into current token */
+        char *cp; /* pointer into current token */
 
         /* short command line option */
         opt_opt = argv[H5_optind][sp];
diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c
index 74b1685..87a7122 100644
--- a/tools/test/perform/zip_perf.c
+++ b/tools/test/perform/zip_perf.c
@@ -336,8 +336,8 @@ parse_size_directive(const char *size)
 static void
 fill_with_random_data(Bytef *src, uLongf src_len)
 {
-    register unsigned u;
-    h5_stat_t         stat_buf;
+    unsigned  u;
+    h5_stat_t stat_buf;
 
     if (HDstat("/dev/urandom", &stat_buf) == 0) {
         uLongf len = src_len;
@@ -386,7 +386,7 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long
     Bytef *        src;
 
     for (src_len = min_buf_size; src_len <= max_buf_size; src_len <<= 1) {
-        register unsigned long i, iters;
+        unsigned long i, iters;
 
         iters = file_size / src_len;
         src   = (Bytef *)HDcalloc(1, sizeof(Bytef) * src_len);