Merge pull request #1938 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10

* commit '36fc437467630d59894deca7aff15b282cb938fb':
  Add clang toolchain
  Fix missing option and incorrect close
  small syntax addition
  Whitespace fix and HD prefix
  Whitespace updates
  Remove obsolete code
  Add missing class name
  Small syntax changes
  Remove unused command block
  Change unused variable to generic form
  HDFFV-10903 merge dev changes to 1.10
  Correct HDF5 options to tristate values
  HDFFV-10903 merge updated changes
  Add new tools lib test folder
  Merge S3 code from develop to 1.10

39 files changed, 7000 insertions, 539 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 85563fd..ef89fee 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -230,6 +230,9 @@ set (H5_TESTS
     enc_dec_plist_cross_platform
     getname
     vfd
+    ros3
+    s3comms
+    hdfs
     ntypes
     dangle
     dtransform
diff --git a/test/Makefile.am b/test/Makefile.am
index 8122a7d..276b262 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -37,8 +37,8 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_builddir)/src
 TEST_SCRIPT = testerror.sh testlibinfo.sh testcheck_version.sh testlinks_env.sh testexternal_env.sh \
     testswmr.sh testvds_env.sh testvdsswmr.sh testflushrefresh.sh test_usecases.sh testabort_fail.sh
 SCRIPT_DEPEND = error_test$(EXEEXT) err_compat$(EXEEXT) links_env$(EXEEXT) \
-    filenotclosed$(EXEEXT) del_many_dense_attrs$(EXEEXT) \
-    external_env$(EXEEXT) flushrefresh$(EXEEXT) use_append_chunk$(EXEEXT) use_append_mchunks$(EXEEXT) use_disable_mdc_flushes$(EXEEXT) \
+    external_env$(EXEEXT) filenotclosed$(EXEEXT) del_many_dense_attrs$(EXEEXT) \
+    flushrefresh$(EXEEXT) use_append_chunk$(EXEEXT) use_append_mchunks$(EXEEXT) use_disable_mdc_flushes$(EXEEXT) \
     swmr_generator$(EXEEXT) swmr_reader$(EXEEXT) swmr_writer$(EXEEXT) \
     swmr_remove_reader$(EXEEXT) swmr_remove_writer$(EXEEXT) swmr_addrem_writer$(EXEEXT) \
     swmr_sparse_reader$(EXEEXT) swmr_sparse_writer$(EXEEXT) swmr_start_write$(EXEEXT) \
@@ -55,15 +55,15 @@ check_SCRIPTS = $(TEST_SCRIPT)
 # As an exception, long-running tests should occur earlier in the list.
 # This gives them more time to run when tests are executing in parallel.
 TEST_PROG= testhdf5 \
-           cache cache_api cache_image cache_tagging lheap ohdr stab gheap \
-           evict_on_close farray earray btree2 fheap \
+           cache cache_api cache_image cache_tagging lheap ohdr \
+           stab gheap evict_on_close farray earray btree2 fheap \
            pool accum hyperslab istore bittests dt_arith page_buffer \
            dtypes dsets chunk_info cmpd_dset filter_fail extend direct_chunk \
            external efc objcopy links unlink twriteorder big mtime fillval mount \
            flush1 flush2 app_ref enum set_extent ttsafe enc_dec_plist \
-           enc_dec_plist_cross_platform getname vfd ntypes dangle dtransform \
-           reserved cross_read freespace mf vds file_image unregister \
-           cache_logging cork swmr
+           enc_dec_plist_cross_platform getname vfd ros3 s3comms hdfs ntypes \
+           dangle dtransform reserved cross_read freespace mf vds file_image \
+           unregister cache_logging cork swmr
 
 # List programs to be built when testing here.
 # error_test and err_compat are built at the same time as the other tests, but executed by testerror.sh.
@@ -87,7 +87,7 @@ check_PROGRAMS=$(TEST_PROG) error_test err_compat tcheck_version \
     use_append_chunk use_append_mchunks use_disable_mdc_flushes \
     swmr_generator swmr_start_write swmr_reader swmr_writer swmr_remove_reader \
     swmr_remove_writer swmr_addrem_writer swmr_sparse_reader swmr_sparse_writer \
-    swmr_check_compat_vfd vds_swmr_gen vds_env vds_swmr_reader vds_swmr_writer
+    swmr_check_compat_vfd vds_env vds_swmr_gen vds_swmr_reader vds_swmr_writer
 if HAVE_SHARED_CONDITIONAL
   check_PROGRAMS+= filter_plugin
 endif
@@ -190,8 +190,8 @@ CHECK_CLEANFILES+=accum.h5 cmpd_dset.h5 compact_dataset.h5 dataset.h5 dset_offse
     dtransform.h5 test_filters.h5 get_file_name.h5 tstint[1-2].h5    \
     unlink_chunked.h5 btree2.h5 btree2_tmp.h5 objcopy_src.h5 objcopy_dst.h5 \
     objcopy_ext.dat trefer1.h5 trefer2.h5 app_ref.h5 farray.h5 farray_tmp.h5 \
-    earray.h5 earray_tmp.h5 efc[0-5].h5 log_vfd_out.log              \
-    new_multi_file_v16-r.h5 new_multi_file_v16-s.h5                  \
+    earray.h5 earray_tmp.h5 efc[0-5].h5 log_vfd_out.log log_ros3_out.log    \
+    log_s3comms_out.log new_multi_file_v16-r.h5 new_multi_file_v16-s.h5     \
     split_get_file_image_test-m.h5 split_get_file_image_test-r.h5    \
     file_image_core_test.h5.copy unregister_filter_1.h5 unregister_filter_2.h5 \
     vds_virt.h5 vds_dapl.h5 vds_src_[0-1].h5 \
diff --git a/test/bittests.c b/test/bittests.c
index e29c188..046528a 100644
--- a/test/bittests.c
+++ b/test/bittests.c
@@ -895,13 +895,11 @@ test_clear (void)
 
 
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
  * Purpose:
  *
- * Return:	Success:
- *
- *		Failure:
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *
  * Programmer:	Robb Matzke
  *              Tuesday, June 16, 1998
@@ -911,7 +909,7 @@ test_clear (void)
 int
 main(void)
 {
-    int	nerrors = 0;
+    int nerrors = 0;
 
     /*
      * Open the library explicitly.
@@ -930,12 +928,12 @@ main(void)
     if(nerrors) {
         HDprintf("***** %u FAILURE%s! *****\n",
                nerrors, 1 == nerrors ? "" : "S");
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
     }
     HDprintf("All bit tests passed.\n");
 
     H5close();
 
-    return 0;
-}
+    HDexit(EXIT_SUCCESS);
+} /* end main() */
 
diff --git a/test/del_many_dense_attrs.c b/test/del_many_dense_attrs.c
index d88045c..ada7a6f 100644
--- a/test/del_many_dense_attrs.c
+++ b/test/del_many_dense_attrs.c
@@ -41,7 +41,7 @@ const char *FILENAME[] = {
  */
 static void catch_signal(int H5_ATTR_UNUSED signo)
 {
-    HDexit(1);
+    HDexit(EXIT_FAILURE);
 } /* catch_signal() */
 
 
diff --git a/test/dsets.c b/test/dsets.c
index 4302475..66313a5 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -13171,8 +13171,7 @@ error:
  *
  * Purpose:     Tests the dataset interface (H5D)
  *
- * Return:      Success:    exit(EXIT_SUCCESS)
- *              Failure:    exit(EXIT_FAILURE)
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *
  * Programmer:  Robb Matzke
  *              Tuesday, December  9, 1997
@@ -13392,12 +13391,12 @@ main(void)
 #endif /* H5_HAVE_FILTER_SZIP */
     h5_cleanup(FILENAME, fapl);
 
-    return EXIT_SUCCESS;
+    HDexit(EXIT_SUCCESS);
 
 error:
     nerrors = MAX(1, nerrors);
     HDprintf("***** %d DATASET TEST%s FAILED! *****\n",
             nerrors, 1 == nerrors ? "" : "S");
-    return EXIT_FAILURE;
+    HDexit(EXIT_FAILURE);
 } /* end main() */
 
diff --git a/test/dtypes.c b/test/dtypes.c
index f676ac9..a177026 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -134,10 +134,8 @@ typedef enum {
 static int num_opaque_conversions_g = 0;
 
 static int opaque_check(int tag_it);
-static herr_t convert_opaque(hid_t st, hid_t dt,
-               H5T_cdata_t *cdata,
-        size_t nelmts, size_t buf_stride,
-               size_t bkg_stride, void *_buf,
+static herr_t convert_opaque(hid_t st, hid_t dt, H5T_cdata_t *cdata,
+        size_t nelmts, size_t buf_stride, size_t bkg_stride, void *_buf,
         void *bkg, hid_t dset_xfer_plid);
 static int opaque_long(void);
 static int opaque_funcs(void);
@@ -146,16 +144,13 @@ static int opaque_funcs(void);
 /*-------------------------------------------------------------------------
  * Function:    reset_hdf5
  *
- * Purpose:    Reset the hdf5 library.  This causes statistics to be printed
- *        and counters to be reset.
+ * Purpose:     Reset the hdf5 library.  This causes statistics to be printed
+ *              and counters to be reset.
  *
- * Return:    void
+ * Return:      void
  *
- * Programmer:    Robb Matzke
+ * Programmer:  Robb Matzke
  *              Monday, November 16, 1998
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void
@@ -189,14 +184,10 @@ reset_hdf5(void)
  * Purpose:     Test type classes
  *
  * Return:      Success:        0
- *
  *              Failure:        number of errors
  *
  * Programmer:  Robb Matzke
  *              Tuesday, December  9, 1997
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -290,20 +281,16 @@ test_classes(void)
  * Purpose:     Are we able to copy a datatype?
  *
  * Return:      Success:        0
- *
  *              Failure:        number of errors
  *
  * Programmer:  Robb Matzke
  *              Tuesday, December  9, 1997
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
 test_copy(void)
 {
-    hid_t               a_copy;
+    hid_t         a_copy;
     herr_t        status;
 
     TESTING("H5Tcopy()");
@@ -313,12 +300,12 @@ test_copy(void)
 
     /* We should not be able to close a built-in byte */
     H5E_BEGIN_TRY {
-    status = H5Tclose (H5T_NATIVE_SCHAR);
+        status = H5Tclose (H5T_NATIVE_SCHAR);
     } H5E_END_TRY;
     if (status>=0) {
-    H5_FAILED();
-    HDputs ("    Should not be able to close a predefined type!");
-    goto error;
+        H5_FAILED();
+        HDputs ("    Should not be able to close a predefined type!");
+        goto error;
     }
 
     PASSED();
@@ -336,7 +323,6 @@ test_copy(void)
  *              in nested types)
  *
  * Return:      Success:        0
- *
  *              Failure:        number of errors
  *
  * Programmer:  Quincey Koziol
@@ -512,14 +498,10 @@ error:
  * Purpose:     Tests various things about compound datatypes.
  *
  * Return:      Success:        0
- *
  *              Failure:        number of errors
  *
  * Programmer:  Robb Matzke
  *              Wednesday, January  7, 1998
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -673,38 +655,34 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_compound_2
  *
- * Purpose:    Tests a compound type conversion where the source and
- *        destination are the same except for the order of the
- *        elements.
+ * Purpose:     Tests a compound type conversion where the source and
+ *              destination are the same except for the order of the
+ *              elements.
  *
  * Return:    Success:    0
+ *            Failure:    number of errors
  *
- *        Failure:    number of errors
- *
- * Programmer:    Robb Matzke
+ * Programmer:  Robb Matzke
  *              Thursday, June 17, 1999
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
 test_compound_2(void)
 {
     struct st {
-    int a, b, c[4], d, e;
+        int a, b, c[4], d, e;
     } *s_ptr;
     struct dt {
-    int e, d, c[4], b, a;
+        int e, d, c[4], b, a;
     } *d_ptr;
 
     const size_t    nelmts = NTESTELEM;
-    const hsize_t    four = 4;
-    unsigned char    *buf=NULL, *orig=NULL, *bkg=NULL;
-    hid_t        st=-1, dt=-1;
-    hid_t               array_dt;
-    int64_t        nmembs;
-    int            i;
+    const hsize_t   four = 4;
+    unsigned char  *buf=NULL, *orig=NULL, *bkg=NULL;
+    hid_t           st=-1, dt=-1;
+    hid_t           array_dt;
+    int64_t         nmembs;
+    int             i;
 
     TESTING("compound element reordering");
 
@@ -716,15 +694,15 @@ test_compound_2(void)
     bkg = (unsigned char*)HDmalloc(nelmts * sizeof(struct dt));
     orig = (unsigned char*)HDmalloc(nelmts * sizeof(struct st));
     for (i=0; i<(int)nelmts; i++) {
-    s_ptr = ((struct st*)((void *)orig)) + i;
-    s_ptr->a    = i*8+0;
-    s_ptr->b    = i*8+1;
-    s_ptr->c[0] = i*8+2;
-    s_ptr->c[1] = i*8+3;
-    s_ptr->c[2] = i*8+4;
-    s_ptr->c[3] = i*8+5;
-    s_ptr->d    = i*8+6;
-    s_ptr->e    = i*8+7;
+        s_ptr = ((struct st*)((void *)orig)) + i;
+        s_ptr->a    = i*8+0;
+        s_ptr->b    = i*8+1;
+        s_ptr->c[0] = i*8+2;
+        s_ptr->c[1] = i*8+3;
+        s_ptr->c[2] = i*8+4;
+        s_ptr->c[3] = i*8+5;
+        s_ptr->d    = i*8+6;
+        s_ptr->e    = i*8+7;
     }
     HDmemcpy(buf, orig, nelmts*sizeof(struct st));
 
@@ -754,26 +732,26 @@ test_compound_2(void)
 
     /* Compare results */
     for (i=0; i<(int)nelmts; i++) {
-    s_ptr = ((struct st*)((void *)orig)) + i;
-    d_ptr = ((struct dt*)((void *)buf))  + i;
-    if (s_ptr->a    != d_ptr->a    ||
-        s_ptr->b    != d_ptr->b    ||
-        s_ptr->c[0] != d_ptr->c[0] ||
-        s_ptr->c[1] != d_ptr->c[1] ||
-        s_ptr->c[2] != d_ptr->c[2] ||
-        s_ptr->c[3] != d_ptr->c[3] ||
-        s_ptr->d    != d_ptr->d    ||
-        s_ptr->e    != d_ptr->e) {
-        H5_FAILED();
-        HDprintf("    i=%d\n", i);
-        HDprintf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
-        s_ptr->a, s_ptr->b, s_ptr->c[0], s_ptr->c[1], s_ptr->c[2],
-        s_ptr->c[3], s_ptr->d, s_ptr->e);
-        HDprintf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
-        d_ptr->a, d_ptr->b, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2],
-        d_ptr->c[3], d_ptr->d, d_ptr->e);
-        goto error;
-    }
+        s_ptr = ((struct st*)((void *)orig)) + i;
+        d_ptr = ((struct dt*)((void *)buf))  + i;
+        if (s_ptr->a    != d_ptr->a    ||
+            s_ptr->b    != d_ptr->b    ||
+            s_ptr->c[0] != d_ptr->c[0] ||
+            s_ptr->c[1] != d_ptr->c[1] ||
+            s_ptr->c[2] != d_ptr->c[2] ||
+            s_ptr->c[3] != d_ptr->c[3] ||
+            s_ptr->d    != d_ptr->d    ||
+            s_ptr->e    != d_ptr->e) {
+            H5_FAILED();
+            HDprintf("    i=%d\n", i);
+            HDprintf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
+            s_ptr->a, s_ptr->b, s_ptr->c[0], s_ptr->c[1], s_ptr->c[2],
+            s_ptr->c[3], s_ptr->d, s_ptr->e);
+            HDprintf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
+            d_ptr->a, d_ptr->b, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2],
+            d_ptr->c[3], d_ptr->d, d_ptr->e);
+            goto error;
+        }
     }
 
     /* Release resources */
@@ -804,29 +782,25 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_compound_3
  *
- * Purpose:    Tests compound conversions where the source and destination
- *        are the same except the destination is missing a couple
- *        members which appear in the source.
- *
- * Return:    Success:    0
+ * Purpose:     Tests compound conversions where the source and destination
+ *              are the same except the destination is missing a couple
+ *              members which appear in the source.
  *
- *        Failure:    number of errors
+ * Return:      Success:    0
+ *              Failure:    number of errors
  *
- * Programmer:    Robb Matzke
+ * Programmer:  Robb Matzke
  *              Thursday, June 17, 1999
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
 test_compound_3(void)
 {
     struct st {
-    int a, b, c[4], d, e;
+        int a, b, c[4], d, e;
     } *s_ptr;
-    struct dt {
-    int a,    c[4],    e;
+        struct dt {
+        int a,    c[4],    e;
     } *d_ptr;
 
     const size_t    nelmts = NTESTELEM;
@@ -884,24 +858,24 @@ test_compound_3(void)
 
     /* Compare results */
     for (i=0; i<(int)nelmts; i++) {
-    s_ptr = ((struct st*)((void *)orig)) + i;
-    d_ptr = ((struct dt*)((void *)buf))  + i;
-    if (s_ptr->a    != d_ptr->a    ||
-        s_ptr->c[0] != d_ptr->c[0] ||
-        s_ptr->c[1] != d_ptr->c[1] ||
-        s_ptr->c[2] != d_ptr->c[2] ||
-        s_ptr->c[3] != d_ptr->c[3] ||
-        s_ptr->e    != d_ptr->e) {
-        H5_FAILED();
-        HDprintf("    i=%d\n", i);
-        HDprintf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
-        s_ptr->a, s_ptr->b, s_ptr->c[0], s_ptr->c[1], s_ptr->c[2],
-        s_ptr->c[3], s_ptr->d, s_ptr->e);
-        HDprintf("    dst={a=%d, c=[%d,%d,%d,%d], e=%d\n",
-        d_ptr->a, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2],
-        d_ptr->c[3], d_ptr->e);
-        goto error;
-    }
+        s_ptr = ((struct st*)((void *)orig)) + i;
+        d_ptr = ((struct dt*)((void *)buf))  + i;
+        if (s_ptr->a    != d_ptr->a    ||
+            s_ptr->c[0] != d_ptr->c[0] ||
+            s_ptr->c[1] != d_ptr->c[1] ||
+            s_ptr->c[2] != d_ptr->c[2] ||
+            s_ptr->c[3] != d_ptr->c[3] ||
+            s_ptr->e    != d_ptr->e) {
+            H5_FAILED();
+            HDprintf("    i=%d\n", i);
+            HDprintf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
+            s_ptr->a, s_ptr->b, s_ptr->c[0], s_ptr->c[1], s_ptr->c[2],
+            s_ptr->c[3], s_ptr->d, s_ptr->e);
+            HDprintf("    dst={a=%d, c=[%d,%d,%d,%d], e=%d\n",
+            d_ptr->a, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2],
+            d_ptr->c[3], d_ptr->e);
+            goto error;
+        }
     }
 
     /* Release resources */
@@ -931,19 +905,15 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_compound_4
  *
- * Purpose:    Tests compound conversions when the destination has the same
- *        fields as the source but one or more of the fields are
- *        smaller.
- *
- * Return:    Success:    0
+ * Purpose:     Tests compound conversions when the destination has the same
+ *              fields as the source but one or more of the fields are
+ *              smaller.
  *
- *        Failure:    number of errors
+ * Return:      Success:    0
+ *              Failure:    number of errors
  *
- * Programmer:    Robb Matzke
+ * Programmer:  Robb Matzke
  *              Thursday, June 17, 1999
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -951,13 +921,13 @@ test_compound_4(void)
 {
 
     struct st {
-    int a, b, c[4], d, e;
+        int a, b, c[4], d, e;
     } *s_ptr;
     struct dt {
-    short b;
-    int a, c[4];
-    short d;
-    int e;
+        short b;
+        int a, c[4];
+        short d;
+        int e;
     } *d_ptr;
 
     const size_t    nelmts = NTESTELEM;
@@ -1017,26 +987,26 @@ test_compound_4(void)
 
     /* Compare results */
     for (i=0; i<(int)nelmts; i++) {
-    s_ptr = ((struct st*)((void *)orig)) + i;
-    d_ptr = ((struct dt*)((void *)buf))  + i;
-    if (s_ptr->a    != d_ptr->a    ||
-        s_ptr->b    != d_ptr->b    ||
-        s_ptr->c[0] != d_ptr->c[0] ||
-        s_ptr->c[1] != d_ptr->c[1] ||
-        s_ptr->c[2] != d_ptr->c[2] ||
-        s_ptr->c[3] != d_ptr->c[3] ||
-        s_ptr->d    != d_ptr->d    ||
-        s_ptr->e    != d_ptr->e) {
-        H5_FAILED();
-        HDprintf("    i=%d\n", i);
-        HDprintf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
-        s_ptr->a, s_ptr->b, s_ptr->c[0], s_ptr->c[1], s_ptr->c[2],
-        s_ptr->c[3], s_ptr->d, s_ptr->e);
-        HDprintf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
-        d_ptr->a, d_ptr->b, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2],
-        d_ptr->c[3], d_ptr->d, d_ptr->e);
-        goto error;
-    }
+        s_ptr = ((struct st*)((void *)orig)) + i;
+        d_ptr = ((struct dt*)((void *)buf))  + i;
+        if (s_ptr->a    != d_ptr->a    ||
+            s_ptr->b    != d_ptr->b    ||
+            s_ptr->c[0] != d_ptr->c[0] ||
+            s_ptr->c[1] != d_ptr->c[1] ||
+            s_ptr->c[2] != d_ptr->c[2] ||
+            s_ptr->c[3] != d_ptr->c[3] ||
+            s_ptr->d    != d_ptr->d    ||
+            s_ptr->e    != d_ptr->e) {
+            H5_FAILED();
+            HDprintf("    i=%d\n", i);
+            HDprintf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
+            s_ptr->a, s_ptr->b, s_ptr->c[0], s_ptr->c[1], s_ptr->c[2],
+            s_ptr->c[3], s_ptr->d, s_ptr->e);
+            HDprintf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
+            d_ptr->a, d_ptr->b, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2],
+            d_ptr->c[3], d_ptr->d, d_ptr->e);
+            goto error;
+        }
     }
 
     /* Release resources */
@@ -1066,20 +1036,16 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_compound_5
  *
- * Purpose:    Many versions of HDF5 have a bug in the optimized compound
+ * Purpose:     Many versions of HDF5 have a bug in the optimized compound
  *              datatype conversion function, H5T_conv_struct_opt(), which
  *              is triggered when the top-level type contains a struct
  *              which must undergo a conversion.
  *
- * Return:    Success:    0
- *
- *        Failure:    number of errors
+ * Return:      Success:    0
+ *              Failure:    number of errors
  *
- * Programmer:    Robb Matzke
+ * Programmer:  Robb Matzke
  *              Thursday, June 17, 1999
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -1156,7 +1122,8 @@ test_compound_5(void)
         src[1].coll_ids[2]!=dst[1].coll_ids[2] ||
         src[1].coll_ids[3]!=dst[1].coll_ids[3]) {
         H5_FAILED();
-    } else {
+    }
+    else {
         PASSED();
         retval = 0;
     }
@@ -1171,19 +1138,15 @@ test_compound_5(void)
 /*-------------------------------------------------------------------------
  * Function:    test_compound_6
  *
- * Purpose:    Tests compound conversions when the destination has the same
- *        fields as the source but one or more of the fields are
- *        larger.
- *
- * Return:    Success:    0
+ * Purpose:     Tests compound conversions when the destination has the same
+ *              fields as the source but one or more of the fields are
+ *              larger.
  *
- *        Failure:    number of errors
+ * Return:      Success:    0
+ *              Failure:    number of errors
  *
- * Programmer:    Quincey Koziol
+ * Programmer:  Quincey Koziol
  *              Wednesday, December 13, 2000
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -1244,18 +1207,18 @@ test_compound_6(void)
 
     /* Compare results */
     for (i=0; i<(int)nelmts; i++) {
-    s_ptr = ((struct st*)((void *)orig)) + i;
-    d_ptr = ((struct dt*)((void *)buf))  + i;
-    if (s_ptr->b    != d_ptr->b    ||
-        s_ptr->d    != d_ptr->d) {
-        H5_FAILED();
-        HDprintf("    i=%d\n", i);
-        HDprintf("    src={b=%d, d=%d\n",
-           (int)s_ptr->b, (int)s_ptr->d);
-        HDprintf("    dst={b=%ld, d=%ld\n",
-           d_ptr->b, d_ptr->d);
-        goto error;
-    }
+        s_ptr = ((struct st*)((void *)orig)) + i;
+        d_ptr = ((struct dt*)((void *)buf))  + i;
+        if (s_ptr->b    != d_ptr->b    ||
+            s_ptr->d    != d_ptr->d) {
+            H5_FAILED();
+            HDprintf("    i=%d\n", i);
+            HDprintf("    src={b=%d, d=%d\n",
+            (int)s_ptr->b, (int)s_ptr->d);
+            HDprintf("    dst={b=%ld, d=%ld\n",
+            d_ptr->b, d_ptr->d);
+            goto error;
+        }
     }
 
     /* Release resources */
@@ -1284,15 +1247,14 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_compound_7
  *
- * Purpose:    Tests inserting fields into compound datatypes when the field
+ * Purpose:     Tests inserting fields into compound datatypes when the field
  *              overlaps the end of the compound datatype.  Also, tests
  *              increasing compound type size.
  *
- * Return:    Success:    0
- *
- *        Failure:    number of errors
+ * Return:      Success:    0
+ *              Failure:    number of errors
  *
- * Programmer:    Quincey Koziol
+ * Programmer:  Quincey Koziol
  *              Tuesday, December 18, 2001
  *
  * Modifications:
@@ -1686,9 +1648,6 @@ test_compound_8(void)
  *
  * Programmer:  Raymond Lu
  *              Wednesday, June 9, 2004
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -4758,17 +4717,13 @@ test_conv_enum_2(void)
 /*-------------------------------------------------------------------------
  * Function:    test_conv_bitfield
  *
- * Purpose:    Test bitfield conversions.
+ * Purpose:     Test bitfield conversions.
  *
- * Return:    Success:    0
- *
- *        Failure:    number of errors
+ * Return:      Success:    0
+ *              Failure:    number of errors
  *
- * Programmer:    Robb Matzke
+ * Programmer:  Robb Matzke
  *              Thursday, May 20, 1999
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -4790,10 +4745,9 @@ test_conv_bitfield(void)
     buf[2] = buf[3] = 0x55; /*irrelevant*/
     if (H5Tconvert(st, dt, (size_t)1, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (buf[0]!=0xAA || buf[1]!=0xAA || buf[2]!=0 || buf[3]!=0) {
-    H5_FAILED();
-    printf("    s=0xaaaa, d=0x%02x%02x%02x%02x (test 1)\n",
-        buf[3], buf[2], buf[1], buf[0]);
-    goto error;
+        H5_FAILED();
+        HDprintf("    s=0xaaaa, d=0x%02x%02x%02x%02x (test 1)\n", buf[3], buf[2], buf[1], buf[0]);
+        goto error;
     }
 
     /*
@@ -4809,10 +4763,9 @@ test_conv_bitfield(void)
     buf[0] = 0xA8; buf[1] = 0x2A; buf[2] = buf[3] = 0;
     if (H5Tconvert(st, dt, (size_t)1, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (buf[0]!=0 || buf[1]!=0xA8 || buf[2]!=0x2A || buf[3]!=0) {
-    H5_FAILED();
-    printf("    s=0x2AA8 d=0x%02x%02x%02x%02x (test 2)\n",
-        buf[3], buf[2], buf[1], buf[0]);
-    goto error;
+        H5_FAILED();
+        HDprintf("    s=0x2AA8 d=0x%02x%02x%02x%02x (test 2)\n", buf[3], buf[2], buf[1], buf[0]);
+        goto error;
     }
 
     /*
@@ -4823,10 +4776,9 @@ test_conv_bitfield(void)
     buf[0] = 0xA8; buf[1] = 0x2A; buf[2] = buf[3] = 0;
     if (H5Tconvert(st, dt, (size_t)1, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (buf[0]!=0xff || buf[1]!=0xAB || buf[2]!=0xEA || buf[3]!=0xff) {
-    H5_FAILED();
-    printf("    s=0x2AA8 d=0x%02x%02x%02x%02x (test 3)\n",
-        buf[3], buf[2], buf[1], buf[0]);
-    goto error;
+        H5_FAILED();
+        HDprintf("    s=0x2AA8 d=0x%02x%02x%02x%02x (test 3)\n", buf[3], buf[2], buf[1], buf[0]);
+        goto error;
     }
 
     H5Tclose(st);
@@ -4855,18 +4807,14 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_bitfield_funcs
  *
- * Purpose:    Test some datatype functions that are and aren't supposed
+ * Purpose:     Test some datatype functions that are and aren't supposed
  *              work for bitfield type.
  *
- * Return:    Success:    0
- *
- *        Failure:    number of errors
+ * Return:      Success:    0
+ *              Failure:    number of errors
  *
- * Programmer:    Raymond Lu
+ * Programmer:  Raymond Lu
  *              Wednesday, April 5, 2006
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -4984,17 +4932,13 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    convert_opaque
  *
- * Purpose:    A fake opaque conversion functions
- *
- * Return:    Success:    0
+ * Purpose:     A fake opaque conversion functions
  *
- *        Failure:    -1
+ * Return:      Success:    0
+ *              Failure:    -1
  *
- * Programmer:    Robb Matzke
+ * Programmer:  Robb Matzke
  *              Friday, June  4, 1999
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -5003,7 +4947,8 @@ convert_opaque(hid_t H5_ATTR_UNUSED st, hid_t H5_ATTR_UNUSED dt, H5T_cdata_t *cd
                size_t H5_ATTR_UNUSED bkg_stride, void H5_ATTR_UNUSED *_buf,
         void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dset_xfer_plid)
 {
-    if (H5T_CONV_CONV==cdata->command) num_opaque_conversions_g++;
+    if (H5T_CONV_CONV==cdata->command)
+        num_opaque_conversions_g++;
     return 0;
 }
 
@@ -5011,17 +4956,13 @@ convert_opaque(hid_t H5_ATTR_UNUSED st, hid_t H5_ATTR_UNUSED dt, H5T_cdata_t *cd
 /*-------------------------------------------------------------------------
  * Function:    test_opaque
  *
- * Purpose:    Driver function to test opaque datatypes
- *
- * Return:    Success:    0
+ * Purpose:     Driver function to test opaque datatypes
  *
- *        Failure:    number of errors
+ * Return:      Success:    0
+ *              Failure:    number of errors
  *
- * Programmer:    Raymond Lu
+ * Programmer:  Raymond Lu
  *              June 2, 2004
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -5054,25 +4995,23 @@ test_opaque(void)
 /*-------------------------------------------------------------------------
  * Function:    opaque_check
  *
- * Purpose:    Test opaque datatypes
+ * Purpose:     Test opaque datatypes
  *
- * Return:    Success:    0
- *
- *        Failure:    number of errors
+ * Return:      Success:    0
+ *              Failure:    number of errors
  *
- * Programmer:    Robb Matzke
+ * Programmer:  Robb Matzke
  *              Thursday, May 20, 1999
- *
  *-------------------------------------------------------------------------
  */
 static int
 opaque_check(int tag_it)
 {
 #define OPAQUE_NELMTS 1000
-    hid_t    st=-1, dt=-1;
+    hid_t     st=-1, dt=-1;
     herr_t    status;
-    char    buf[1]; /*not really used*/
-    int        saved;
+    char      buf[1]; /*not really used*/
+    int       saved;
 
     saved = num_opaque_conversions_g = 0;
 
@@ -5088,29 +5027,29 @@ opaque_check(int tag_it)
 
     /* Make sure that we can't convert between the types yet */
     H5E_BEGIN_TRY {
-    status = H5Tconvert(st, dt, (size_t)OPAQUE_NELMTS, buf, NULL, H5P_DEFAULT);
+        status = H5Tconvert(st, dt, (size_t)OPAQUE_NELMTS, buf, NULL, H5P_DEFAULT);
     } H5E_END_TRY;
     if (status>=0) {
-    H5_FAILED();
-    printf("    opaque conversion should have failed but succeeded\n");
-    goto error;
+        H5_FAILED();
+        HDprintf("    opaque conversion should have failed but succeeded\n");
+        goto error;
     }
 
     /* Register a conversion function */
     if (H5Tregister(H5T_PERS_HARD, "o_test", st, dt, convert_opaque) < 0)
-    goto error;
+        goto error;
 
     /* Try the conversion again, this time it should work */
     if (H5Tconvert(st, dt, (size_t)OPAQUE_NELMTS, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (saved+1 != num_opaque_conversions_g) {
-    H5_FAILED();
-    printf("    unexpected number of opaque conversions\n");
-    goto error;
+        H5_FAILED();
+        HDprintf("    unexpected number of opaque conversions\n");
+        goto error;
     }
 
     /* Unregister conversion function */
     if (H5Tunregister(H5T_PERS_HARD, "o_test", st, dt, convert_opaque) < 0)
-    goto error;
+        goto error;
 
     H5Tclose(st);
     H5Tclose(dt);
@@ -5127,12 +5066,12 @@ opaque_check(int tag_it)
 /*-------------------------------------------------------------------------
  * Function:    opaque_long
  *
- * Purpose:    Test named (committed) opaque datatypes w/very long tags
+ * Purpose:     Test named (committed) opaque datatypes w/very long tags
  *
- * Return:    Success:    0
- *        Failure:    number of errors
+ * Return:      Success:    0
+ *              Failure:    number of errors
  *
- * Programmer:    Quincey Koziol
+ * Programmer:  Quincey Koziol
  *              Tuesday, June 14, 2005
  *
  *-------------------------------------------------------------------------
@@ -5142,7 +5081,7 @@ opaque_long(void)
 {
     char     *long_tag = NULL;
     hid_t    dt = -1;
-    herr_t      ret;
+    herr_t   ret;
 
     /* Build opaque type */
     if((dt=H5Tcreate(H5T_OPAQUE, (size_t)4)) < 0) TEST_ERROR
@@ -5154,7 +5093,7 @@ opaque_long(void)
 
     /* Set opaque type's tag */
     H5E_BEGIN_TRY {
-    ret = H5Tset_tag(dt, long_tag);
+        ret = H5Tset_tag(dt, long_tag);
     } H5E_END_TRY;
     if(ret != FAIL) TEST_ERROR
 
@@ -5179,24 +5118,20 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    opaque_funcs
  *
- * Purpose:    Test some type functions that are and aren't supposed to
+ * Purpose:     Test some type functions that are and aren't supposed to
  *              work with opaque type.
  *
- * Return:    Success:    0
- *
- *        Failure:    number of errors
+ * Return:      Success:    0
+ *              Failure:    number of errors
  *
- * Programmer:    Raymond Lu
+ * Programmer:  Raymond Lu
  *              Wednesday, April 5, 2006
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
 opaque_funcs(void)
 {
-    hid_t    type = -1, super=-1;
+    hid_t       type = -1, super=-1;
     size_t      size;
     H5T_pad_t   inpad;
     H5T_cset_t  cset;
@@ -5803,7 +5738,7 @@ test_encode(void)
     }
 
     H5E_BEGIN_TRY {
-    ret = H5Tclose(decoded_tid3);
+        ret = H5Tclose(decoded_tid3);
     } H5E_END_TRY;
     if(ret!=FAIL) {
         H5_FAILED();
@@ -6102,14 +6037,13 @@ static int
 test_int_float_except(void)
 {
 #if H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4
-    float buf[CONVERT_SIZE] = {(float)INT_MIN - 172.0f, (float)INT_MAX - 32.0f,
-            (float)INT_MAX - 68.0f, (float)4.5f};
-    int buf_int[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX-127, 4};
+    float buf[CONVERT_SIZE] = {(float)INT_MIN - 172.0f, (float)INT_MAX - 32.0f, (float)INT_MAX - 68.0f, (float)4.5f};
+    int   buf_int[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX-127, 4};
     float buf_float[CONVERT_SIZE] = {(float)INT_MIN, (float)INT_MAX + 1.0f, (float)INT_MAX - 127.0f, 4};
-    int *intp;          /* Pointer to buffer, as integers */
-    int buf2[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX - 72, 0};
+    int  *intp;          /* Pointer to buffer, as integers */
+    int   buf2[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX - 72, 0};
     float buf2_float[CONVERT_SIZE] = {(float)INT_MIN, (float)INT_MAX, (float)INT_MAX - 127.0f, (float)0.0f};
-    int buf2_int[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX - 127, 0};
+    int   buf2_int[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX - 127, 0};
     float *floatp;      /* Pointer to buffer #2, as floats */
     hid_t dxpl;         /* Dataset transfer property list */
     except_info_t e;    /* Exception information */
@@ -6165,8 +6099,7 @@ test_int_float_except(void)
 
     /* Convert second buffer */
     HDmemset(&e, 0, sizeof(except_info_t));
-    if(H5Tconvert(H5T_NATIVE_INT, H5T_NATIVE_FLOAT, (size_t)CONVERT_SIZE,
-            buf2, NULL, dxpl) < 0) TEST_ERROR
+    if(H5Tconvert(H5T_NATIVE_INT, H5T_NATIVE_FLOAT, (size_t)CONVERT_SIZE, buf2, NULL, dxpl) < 0) TEST_ERROR
 
     /* Check the buffer after conversion, as floats */
     for(u = 0; u < CONVERT_SIZE; u++) {
@@ -6183,8 +6116,7 @@ test_int_float_except(void)
 
     /* Convert buffer */
     HDmemset(&e, 0, sizeof(except_info_t));
-    if(H5Tconvert(H5T_NATIVE_FLOAT, H5T_NATIVE_INT, (size_t)CONVERT_SIZE,
-            buf2, NULL, dxpl) < 0) TEST_ERROR
+    if(H5Tconvert(H5T_NATIVE_FLOAT, H5T_NATIVE_INT, (size_t)CONVERT_SIZE, buf2, NULL, dxpl) < 0) TEST_ERROR
 
     /* Check the buffer after conversion, as integers */
     for(u = 0; u < CONVERT_SIZE; u++) {
@@ -6415,7 +6347,7 @@ test_set_order_compound(hid_t fapl)
     hid_t       cmpd = -1, memb_cmpd = -1, memb_array1 = -1, memb_array2 = -1, cmpd_array = -1;
     hid_t       vl_id = -1;
     hsize_t     dims[2] = {3, 4};   /* Array dimenstions */
-    char    filename[1024];
+    char        filename[1024];
     herr_t      ret;                /* Generic return value */
 
     TESTING("H5Tset/get_order for compound type");
@@ -6521,18 +6453,14 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_named_indirect_reopen
  *
- * Purpose:    Tests that open named datatypes can be reopened indirectly
+ * Purpose:     Tests that open named datatypes can be reopened indirectly
  *              through H5Dget_type without causing problems.
  *
- * Return:    Success:    0
- *
- *        Failure:    number of errors
+ * Return:      Success:    0
+ *              Failure:    number of errors
  *
- * Programmer:    Neil Fortner
+ * Programmer:  Neil Fortner
  *              Thursday, June 4, 2009
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -6540,11 +6468,11 @@ test_named_indirect_reopen(hid_t fapl)
 {
     hid_t        file=-1, type=-1, reopened_type=-1, strtype=-1, dset=-1, space=-1;
     static hsize_t    dims[1] = {3};
-    size_t              dt_size;
-    int                 enum_value;
-    const char          *tag = "opaque_tag";
-    char                *tag_ret = NULL;
-    char        filename[1024];
+    size_t            dt_size;
+    int               enum_value;
+    const char       *tag = "opaque_tag";
+    char             *tag_ret = NULL;
+    char              filename[1024];
 
     TESTING("indirectly reopening committed datatypes");
 
@@ -6708,11 +6636,11 @@ test_named_indirect_reopen(hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-    H5Tclose(type);
-    H5Tclose(strtype);
-    H5Tclose(reopened_type);
-    H5Sclose(space);
-    H5Dclose(dset);
+        H5Tclose(type);
+        H5Tclose(strtype);
+        H5Tclose(reopened_type);
+        H5Sclose(space);
+        H5Dclose(dset);
     H5Fclose(file);
     } H5E_END_TRY;
     if(tag_ret)
@@ -6912,12 +6840,12 @@ test_delete_obj_named(hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-    H5Tclose(attr);
-    H5Dclose(dset);
-    H5Pclose(fapl2);
-    H5Fclose(filea1);
-    H5Fclose(filea2);
-    H5Fclose(fileb);
+        H5Tclose(attr);
+        H5Dclose(dset);
+        H5Pclose(fapl2);
+        H5Fclose(filea1);
+        H5Fclose(filea2);
+        H5Fclose(fileb);
     } H5E_END_TRY;
     return 1;
 } /* end test_delete_obj_named() */
@@ -7075,15 +7003,15 @@ test_delete_obj_named_fileid(hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-    H5Aclose(attr);
-    H5Tclose(type);
-    H5Dclose(dset);
-    H5Pclose(fapl2);
-    H5Fclose(filea1);
-    H5Fclose(filea2);
-    H5Fclose(fileb);
-    H5Fclose(attr_fid);
-    H5Fclose(type_fid);
+        H5Aclose(attr);
+        H5Tclose(type);
+        H5Dclose(dset);
+        H5Pclose(fapl2);
+        H5Fclose(filea1);
+        H5Fclose(filea2);
+        H5Fclose(fileb);
+        H5Fclose(attr_fid);
+        H5Fclose(type_fid);
     } H5E_END_TRY;
     return 1;
 } /* end test_delete_obj_named_fileid() */
@@ -7092,12 +7020,12 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_deprec
  *
- * Purpose:    Tests deprecated API routines for datatypes.
+ * Purpose:     Tests deprecated API routines for datatypes.
  *
- * Return:    Success:    0
- *        Failure:    number of errors
+ * Return:      Success:    0
+ *              Failure:    number of errors
  *
- * Programmer:    Quincey Koziol
+ * Programmer:  Quincey Koziol
  *              Thursday, September 27, 2007
  *
  *-------------------------------------------------------------------------
@@ -7167,31 +7095,31 @@ test_deprec(hid_t fapl)
 
     /* Predefined types cannot be committed */
     H5E_BEGIN_TRY {
-    status = H5Tcommit1(file, "test_named_1 (should not exist)", H5T_NATIVE_INT);
+        status = H5Tcommit1(file, "test_named_1 (should not exist)", H5T_NATIVE_INT);
     } H5E_END_TRY;
     if(status >= 0)
-    FAIL_PUTS_ERROR("    Predefined types should not be committable!")
+        FAIL_PUTS_ERROR("    Predefined types should not be committable!")
 
     /* Copy a predefined datatype and commit the copy */
     if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) FAIL_STACK_ERROR
     if(H5Tcommit1(file, "native-int", type) < 0) FAIL_STACK_ERROR
     if((status = H5Tcommitted(type)) < 0) FAIL_STACK_ERROR
     if(0 == status)
-    FAIL_PUTS_ERROR("    H5Tcommitted() returned false!")
+        FAIL_PUTS_ERROR("    H5Tcommitted() returned false!")
 
     /* We should not be able to modify a type after it has been committed. */
     H5E_BEGIN_TRY {
-    status = H5Tset_precision(type, (size_t)256);
+        status = H5Tset_precision(type, (size_t)256);
     } H5E_END_TRY;
     if(status >= 0)
-    FAIL_PUTS_ERROR("    Committed type is not constant!")
+        FAIL_PUTS_ERROR("    Committed type is not constant!")
 
     /* We should not be able to re-commit a committed type */
     H5E_BEGIN_TRY {
-    status = H5Tcommit1(file, "test_named_2 (should not exist)", type);
+        status = H5Tcommit1(file, "test_named_2 (should not exist)", type);
     } H5E_END_TRY;
     if(status >= 0)
-    FAIL_PUTS_ERROR("    Committed types should not be recommitted!")
+        FAIL_PUTS_ERROR("    Committed types should not be recommitted!")
 
     /*
      * Close the committed type and reopen it.  It should return a named type.
@@ -7200,7 +7128,7 @@ test_deprec(hid_t fapl)
     if((type = H5Topen1(file, "native-int")) < 0) FAIL_STACK_ERROR
     if((status = H5Tcommitted(type)) < 0) FAIL_STACK_ERROR
     if(!status)
-    FAIL_PUTS_ERROR("    Opened named types should be named types!")
+        FAIL_PUTS_ERROR("    Opened named types should be named types!")
 
     /* Close */
     if(H5Tclose(type) < 0) FAIL_STACK_ERROR
@@ -7230,8 +7158,8 @@ test_deprec(hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-    H5Tclose(type);
-    H5Fclose(file);
+        H5Tclose(type);
+        H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* end test_deprec() */
@@ -7241,13 +7169,13 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_utf_ascii_conv
  *
- * Purpose:    Make sure the library doesn't conversion strings between
+ * Purpose:     Make sure the library doesn't conversion strings between
  *              ASCII and UTF8.
  *
- * Return:    Success:    0
- *        Failure:    number of errors
+ * Return:      Success:    0
+ *              Failure:    number of errors
  *
- * Programmer:    Raymond Lu
+ * Programmer:  Raymond Lu
  *              10 November 2011
  *-------------------------------------------------------------------------
  */
@@ -7437,13 +7365,13 @@ test_utf_ascii_conv(void)
 
 error:
     H5E_BEGIN_TRY {
-    H5Tclose(utf8_vtid);
-    H5Tclose(ascii_vtid);
-    H5Tclose(utf8_tid);
-    H5Tclose(ascii_tid);
-    H5Dclose(did);
-    H5Sclose(sid);
-    H5Fclose(fid);
+        H5Tclose(utf8_vtid);
+        H5Tclose(ascii_vtid);
+        H5Tclose(utf8_tid);
+        H5Tclose(ascii_tid);
+        H5Dclose(did);
+        H5Sclose(sid);
+        H5Fclose(fid);
     } H5E_END_TRY;
     return 1;
 }
@@ -7824,15 +7752,12 @@ error:
  *
  * Programmer:  Robb Matzke
  *              Tuesday, December  9, 1997
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 int
 main(void)
 {
-    long    nerrors = 0;
+    long     nerrors = 0;
     hid_t    fapl = -1;
 
     /* Set the random # seed */
@@ -7842,7 +7767,7 @@ main(void)
     fapl = h5_fileaccess();
 
     if(ALIGNMENT)
-    printf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT);
+        HDprintf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT);
 
     /* Do the tests */
     nerrors += test_classes();
@@ -7897,8 +7822,7 @@ main(void)
     nerrors += test_versionbounds();
 
     if(nerrors) {
-        HDprintf("***** %lu FAILURE%s! *****\n",
-               nerrors, 1==nerrors?"":"S");
+        HDprintf("***** %lu FAILURE%s! *****\n", nerrors, 1==nerrors?"":"S");
         HDexit(EXIT_FAILURE);
     }
 
diff --git a/test/extend.c b/test/extend.c
index f8c091b..a31ac0e 100644
--- a/test/extend.c
+++ b/test/extend.c
@@ -219,23 +219,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	Tests extendible datasets
+ * Purpose:     Tests extendible datasets
  *
- * Return:	Success:	exit(0)
- *
- *		Failure:	exit(non-zero)
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *
  * Programmer:	Robb Matzke
  *              Friday, January 30, 1998
  *
- * Modifications:
- *              Took main data code out into write_data() routine, to allow
- *              different dataset creation property list settings to be tested.
- *              Quincey Koziol
- *              Tuesday, June 10, 2003
- *
  *-------------------------------------------------------------------------
  */
 int
@@ -290,16 +282,16 @@ main (void)
 
     if(nerrors) {
         HDprintf("***** %d FAILURE%s! *****\n", nerrors, (1 == nerrors) ? "" : "S");
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     HDprintf("All extend tests passed.\n");
     h5_cleanup(FILENAME, fapl);
 
-    return 0;
+    HDexit(EXIT_SUCCESS);
 
 error:
     HDprintf("*** One or more extend tests failed ***\n");
-    return 1;
-}
+    HDexit(EXIT_FAILURE);
+} /* end main() */
 
diff --git a/test/filenotclosed.c b/test/filenotclosed.c
index 2c5c8dc..2d050eb 100644
--- a/test/filenotclosed.c
+++ b/test/filenotclosed.c
@@ -35,7 +35,7 @@
  */
 static void catch_signal(int H5_ATTR_UNUSED signo)
 {
-    HDexit(1);
+    HDexit(EXIT_FAILURE);
 } /* catch_signal() */
 
 
diff --git a/test/filter_fail.c b/test/filter_fail.c
index 2acce01..4be2547 100644
--- a/test/filter_fail.c
+++ b/test/filter_fail.c
@@ -347,17 +347,15 @@ error:
  * Purpose:     Tests the library's behavior when a mandate filter returns 
  *              failure.
  *
- * Return:      Success:        exit(EXIT_SUCCESS)
- *              Failure:        exit(EXIT_FAILURE)
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  * 
  * Programmer:  Raymond Lu
  *              25 August 2010
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-int main(void)
+int
+main(void)
 {
     hid_t       fapl;
     int         mdc_nelmts  = 0;
@@ -398,7 +396,7 @@ int main(void)
 
     if (nerrors) TEST_ERROR
 
-    return 0;
+    HDexit(EXIT_SUCCESS);
 
 error:
     if (nerrors) {
@@ -406,4 +404,4 @@ error:
                nerrors, 1==nerrors?"":"S");
         HDexit(EXIT_FAILURE);
     }
-}
+} /* end main() */
diff --git a/test/gen_cross.c b/test/gen_cross.c
index f7a1938..105895d 100644
--- a/test/gen_cross.c
+++ b/test/gen_cross.c
@@ -1255,13 +1255,11 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    main
  *
- * Purpose:     Create a file for cross_read.c test.
+ * Purpose:     Create a file for cross_read.c test
  *
- * Return:      Success:        exit(EXIT_SUCCESS)
- *              Failure:        exit(EXIT_FAILURE)
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *
  * Programmer:  Raymond Lu
- *              Some time ago
  *
  *-------------------------------------------------------------------------
  */
@@ -1279,9 +1277,8 @@ main (void)
      * default file creation properties, and default file
      * access properties.
      */
-    if((file = H5Fcreate(H5FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT))
-            < 0)
-        {H5_FAILED(); AT(); return 1;}
+    if((file = H5Fcreate(H5FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        TEST_ERROR;
 
     /*
      * Describe the size of the array and create the data space for fixed
@@ -1291,82 +1288,84 @@ main (void)
     dimsf[0] = NX + 1;
     dimsf[1] = NY;
     if((filespace = H5Screate_simple(RANK, dimsf, NULL)) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
     dimsf[0] = NX;
-    if(H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, dimsf, NULL)
-            < 0)
-        {H5_FAILED(); AT(); return 1;}
+    if(H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, dimsf, NULL) < 0)
+        TEST_ERROR;
 
     /* Create memory space.  This does not include the extra row for fill
      * values. */
     HDassert(dimsf[0] == NX);
     HDassert(dimsf[1] == NY);
     if((memspace = H5Screate_simple(RANK, dimsf, NULL)) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
 
     /* Create a regular dataset */
     if(create_normal_dset(file, filespace, memspace) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
 
     /* Create a dataset of FLOAT with scale-offset filter */
     if(create_scale_offset_dsets_float(file, filespace, memspace) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
 
     /* Create a dataset of DOUBLE with scale-offset filter */
     if(create_scale_offset_dsets_double(file, filespace, memspace) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
 
     /* Create a dataset of CHAR with scale-offset filter */
     if(create_scale_offset_dsets_char(file, filespace, memspace) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
 
     /* Create a dataset of SHORT with scale-offset filter */
     if(create_scale_offset_dsets_short(file, filespace, memspace) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
 
     /* Create a dataset of INT with scale-offset filter */
     if(create_scale_offset_dsets_int(file, filespace, memspace) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
 
     /* Create a dataset of LONG LONG with scale-offset filter */
     if(create_scale_offset_dsets_long_long(file, filespace, memspace) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
 
     /* Create a dataset of FLOAT with fletcher filter */
     if(create_fletcher_dsets_float(file, filespace, memspace) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
 
     /* Create a dataset of FLOAT with deflate filter */
     if(create_deflate_dsets_float(file, filespace, memspace) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
 
 #ifdef H5_HAVE_FILTER_SZIP
     /* Create a dataset of FLOAT with szip filter */
     if(create_szip_dsets_float(file, filespace, memspace) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
 #else /* H5_HAVE_FILTER_SZIP */
-    puts("Szip filter is not enabled. Can't create the dataset.");
+    HDputs("Szip filter is not enabled. Can't create the dataset.");
 #endif /* H5_HAVE_FILTER_SZIP */
 
     /* Create a dataset of FLOAT with shuffle filter */
     if(create_shuffle_dsets_float(file, filespace, memspace) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
 
     /* Create a dataset of FLOAT with nbit filter */
     if(create_nbit_dsets_float(file, filespace, memspace) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
 
 
     /*
      * Close/release resources.
      */
     if(H5Sclose(memspace) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
     if(H5Sclose(filespace) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
     if(H5Fclose(file) < 0)
-        {H5_FAILED(); AT(); return 1;}
+        TEST_ERROR;
 
-    return 0;
-}
+    HDexit(EXIT_SUCCESS);
+
+error:
+    HDexit(EXIT_FAILURE);
+} /* end main() */
 
diff --git a/test/hdfs.c b/test/hdfs.c
new file mode 100644
index 0000000..ab39da6
--- /dev/null
+++ b/test/hdfs.c
@@ -0,0 +1,1767 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * Read-Only HDFS Virtual File Driver (VFD)
+ *
+ * Purpose:
+ *
+ *     Verify behavior for Read-Only HDFS VFD.
+ *
+ *     Demonstrates basic use cases and fapl interaction.
+ *
+ * Programmer: Jacob Smith <jake.smith@hdfgroup.org>
+ *             2018-04-23
+ */
+
+#include "h5test.h"      /* testing utilities */
+#include "H5FDhdfs.h"    /* this file driver's utilities */
+
+
+#ifdef H5_HAVE_LIBHDFS
+#define HDFS_TEST_DEBUG 0
+#define HDFS_TEST_MAX_BUF_SIZE 256
+#endif /* H5_HAVE_LIBHDFS */
+
+/*****************************************************************************
+ *
+ * FILE-LOCAL TESTING MACROS
+ *
+ * Purpose:
+ *
+ *     1) Upon test failure, goto-jump to single-location teardown in test
+ *        function. E.g., `error:` (consistency with HDF corpus) or
+ *        `failed:` (reflects purpose).
+ *            >>> using "error", in part because `H5E_BEGIN_TRY` expects it.
+ *     2) Increase clarity and reduce overhead found with `TEST_ERROR`.
+ *        e.g., "if(somefunction(arg, arg2) < 0) TEST_ERROR:"
+ *        requires reading of entire line to know whether this if/call is
+ *        part of the test setup, test operation, or a test unto itself.
+ *     3) Provide testing macros with optional user-supplied failure message;
+ *        if not supplied (NULL), generate comparison output in the spirit of
+ *        test-driven development. E.g., "expected 5 but was -3"
+ *        User messages clarify test's purpose in code, encouraging description
+ *        without relying on comments.
+ *     4) Configurable expected-actual order in generated comparison strings.
+ *        Some prefer `VERIFY(expected, actual)`, others
+ *        `VERIFY(actual, expected)`. Provide preprocessor ifdef switch
+ *        to satifsy both parties, assuming one paradigm per test file.
+ *        (One could #undef and redefine the flag through the file as desired,
+ *         but _why_.)
+ *
+ *     Provided as courtesy, per consideration for inclusion in the library
+ *     proper.
+ *
+ *     Macros:
+ *
+ *         JSVERIFY_EXP_ACT - ifdef flag, configures comparison order
+ *         FAIL_IF()        - check condition
+ *         FAIL_UNLESS()    - check _not_ condition
+ *         JSVERIFY()       - long-int equality check; prints reason/comparison
+ *         JSVERIFY_NOT()   - long-int inequality check; prints
+ *         JSVERIFY_STR()   - string equality check; prints
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *****************************************************************************/
+
+
+/*----------------------------------------------------------------------------
+ *
+ * ifdef flag: JSVERIFY_EXP_ACT
+ *
+ * JSVERIFY macros accept arguments as (EXPECTED, ACTUAL[, reason])
+ *   default, if this is undefined, is (ACTUAL, EXPECTED[, reason])
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY_EXP_ACT 1L
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSFAILED_AT()
+ *
+ * Purpose:
+ *
+ *     Preface a test failure by printing "*FAILED*" and location to stdout
+ *     Similar to `H5_FAILED(); AT();` from h5test.h
+ *
+ *     *FAILED* at somefile.c:12 in function_name()...
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSFAILED_AT() {                                                   \
+    HDprintf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, FUNC); \
+}
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: FAIL_IF()
+ *
+ * Purpose:
+ *
+ *     Make tests more accessible and less cluttered than
+ *         `if (thing == otherthing()) TEST_ERROR`
+ *         paradigm.
+ *
+ *     The following lines are roughly equivalent:
+ *
+ *         `if (myfunc() < 0) TEST_ERROR;` (as seen elsewhere in HDF tests)
+ *         `FAIL_IF(myfunc() < 0)`
+ *
+ *     Prints a generic "FAILED AT" line to stdout and jumps to `error`,
+ *     similar to `TEST_ERROR` in h5test.h
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-23
+ *
+ *----------------------------------------------------------------------------
+ */
+#define FAIL_IF(condition) \
+if (condition) {           \
+    JSFAILED_AT()          \
+    goto error;           \
+}
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: FAIL_UNLESS()
+ *
+ * Purpose:
+ *
+ *     TEST_ERROR wrapper to reduce cognitive overhead from "negative tests",
+ *     e.g., "a != b".
+ *
+ *     Opposite of FAIL_IF; fails if the given condition is _not_ true.
+ *
+ *     `FAIL_IF( 5 != my_op() )`
+ *     is equivalent to
+ *     `FAIL_UNLESS( 5 == my_op() )`
+ *     However, `JSVERIFY(5, my_op(), "bad return")` may be even clearer.
+ *         (see JSVERIFY)
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#if 0 /* UNUSED */
+#define FAIL_UNLESS(condition) \
+if (!(condition)) {            \
+    JSFAILED_AT()              \
+    goto error;                \
+}
+#endif /* UNUSED */
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSERR_LONG()
+ *
+ * Purpose:
+ *
+ *     Print an failure message for long-int arguments.
+ *     ERROR-AT printed first.
+ *     If `reason` is given, it is printed on own line and newlined after
+ *     else, prints "expected/actual" aligned on own lines.
+ *
+ *     *FAILED* at myfile.c:488 in somefunc()...
+ *     forest must be made of trees.
+ *
+ *     or
+ *
+ *     *FAILED* at myfile.c:488 in somefunc()...
+ *       ! Expected 425
+ *       ! Actual   3
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSERR_LONG(expected, actual, reason) {           \
+    JSFAILED_AT()                                        \
+    if (reason!= NULL) {                                 \
+        HDprintf("%s\n", (reason));                      \
+    } else {                                             \
+        HDprintf("  ! Expected %ld\n  ! Actual   %ld\n", \
+                  (long)(expected), (long)(actual));     \
+    }                                                    \
+}
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSERR_STR()
+ *
+ * Purpose:
+ *
+ *     Print an failure message for string arguments.
+ *     ERROR-AT printed first.
+ *     If `reason` is given, it is printed on own line and newlined after
+ *     else, prints "expected/actual" aligned on own lines.
+ *
+ *     *FAILED*  at myfile.c:421 in myfunc()...
+ *     Blue and Red strings don't match!
+ *
+ *     or
+ *
+ *     *FAILED*  at myfile.c:421 in myfunc()...
+ *     !!! Expected:
+ *     this is my expected
+ *     string
+ *     !!! Actual:
+ *     not what I expected at all
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSERR_STR(expected, actual, reason) {           \
+    JSFAILED_AT()                                       \
+    if ((reason) != NULL) {                             \
+        HDprintf("%s\n", (reason));                     \
+    } else {                                            \
+        HDprintf("!!! Expected:\n%s\n!!!Actual:\n%s\n", \
+                 (expected), (actual));                 \
+    }                                                   \
+}
+
+
+
+#ifdef JSVERIFY_EXP_ACT
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSVERIFY()
+ *
+ * Purpose:
+ *
+ *     Verify that two long integers are equal.
+ *     If unequal, print failure message
+ *     (with `reason`, if not NULL; expected/actual if NULL)
+ *     and jump to `error` at end of function
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY(expected, actual, reason)     \
+if ((long)(actual) != (long)(expected)) {      \
+    JSERR_LONG((expected), (actual), (reason)) \
+    goto error;                                \
+} /* JSVERIFY */
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSVERIFY_NOT()
+ *
+ * Purpose:
+ *
+ *     Verify that two long integers are _not_ equal.
+ *     If equal, print failure message
+ *     (with `reason`, if not NULL; expected/actual if NULL)
+ *     and jump to `error` at end of function
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY_NOT(expected, actual, reason) \
+if ((long)(actual) == (long)(expected)) {      \
+    JSERR_LONG((expected), (actual), (reason)) \
+    goto error;                                \
+} /* JSVERIFY_NOT */
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSVERIFY_STR()
+ *
+ * Purpose:
+ *
+ *     Verify that two strings are equal.
+ *     If unequal, print failure message
+ *     (with `reason`, if not NULL; expected/actual if NULL)
+ *     and jump to `error` at end of function
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY_STR(expected, actual, reason) \
+if (strcmp((actual), (expected)) != 0) {       \
+    JSERR_STR((expected), (actual), (reason)); \
+    goto error;                                \
+} /* JSVERIFY_STR */
+
+
+#else
+/* JSVERIFY_EXP_ACT not defined
+ *
+ * Repeats macros above, but with actual/expected parameters reversed.
+ */
+
+
+/*----------------------------------------------------------------------------
+ * Macro: JSVERIFY()
+ * See: JSVERIFY documentation above.
+ * Programmer: Jacob Smith
+ *             2017-10-14
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY(actual, expected, reason)      \
+if ((long)(actual) != (long)(expected)) {       \
+    JSERR_LONG((expected), (actual), (reason)); \
+    goto error;                                 \
+} /* JSVERIFY */
+
+
+/*----------------------------------------------------------------------------
+ * Macro: JSVERIFY_NOT()
+ * See: JSVERIFY_NOT documentation above.
+ * Programmer: Jacob Smith
+ *             2017-10-14
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY_NOT(actual, expected, reason) \
+if ((long)(actual) == (long)(expected)) {      \
+    JSERR_LONG((expected), (actual), (reason)) \
+    goto error;                                \
+} /* JSVERIFY_NOT */
+
+
+/*----------------------------------------------------------------------------
+ * Macro: JSVERIFY_STR()
+ * See: JSVERIFY_STR documentation above.
+ * Programmer: Jacob Smith
+ *             2017-10-14
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY_STR(actual, expected, reason) \
+if (strcmp((actual), (expected)) != 0) {       \
+    JSERR_STR((expected), (actual), (reason)); \
+    goto error;                                \
+} /* JSVERIFY_STR */
+
+#endif /* ifdef/else JSVERIFY_EXP_ACT */
+
+/********************************
+ * OTHER MACROS AND DEFINITIONS *
+ ********************************/
+
+/* copied from src/hdfs.c
+ */
+#ifdef H5_HAVE_LIBHDFS
+#define MAXADDR (((haddr_t)1<<(8*sizeof(HDoff_t)-1))-1)
+#endif /*  H5_HAVE_LIBHDFS */
+
+#define HDFS_NAMENODE_NAME_MAX_SIZE 128
+
+/*******************************
+ * FILE-LOCAL GLOBAL VARIABLES *
+ *******************************/
+
+#ifdef H5_HAVE_LIBHDFS
+static const char filename_missing[]    = "/tmp/missing.txt";
+static const char filename_bard[]       = "/tmp/t8.shakespeare.txt";
+static const char filename_raven[]      = "/tmp/Poe_Raven.txt";
+static const char filename_example_h5[] = "/tmp/t.h5";
+#endif /*  H5_HAVE_LIBHDFS */
+
+static H5FD_hdfs_fapl_t default_fa      = {
+    1,    /* fa version */
+    "localhost",   /* namenode name */
+    0,    /* namenode port */
+    "",   /* user name */
+    "",   /* kerberos path */
+    1024, /* buffer size */
+};
+
+/******************
+ * TEST FUNCTIONS *
+ ******************/
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_fapl_config_validation()
+ *
+ * Purpose:
+ *
+ *     Test data consistency of fapl configuration.
+ *     Tests `H5FD_hdfs_validate_config` indirectly through `H5Pset_fapl_hdfs`.
+ *
+ * Return:
+ *
+ *     PASSED : 0
+ *     FAILED : 1
+ *
+ * Programmer:  Jacob Smith
+ *              2018-04-25
+ *
+ * Changes:     None.
+ *
+ *---------------------------------------------------------------------------
+ */
+static int
+test_fapl_config_validation(void)
+{
+    /*********************
+     * test-local macros *
+     *********************/
+
+    /*************************
+     * test-local structures *
+     *************************/
+
+    struct testcase {
+        const char       *msg;
+        herr_t            expected;
+        H5FD_hdfs_fapl_t  config;
+    };
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    hid_t            fapl_id     = -1;   /* file access property list ID */
+    H5FD_hdfs_fapl_t config;
+    H5FD_hdfs_fapl_t fa_fetch;
+    herr_t           success     = SUCCEED;
+    unsigned int     i           = 0;
+    unsigned int     ncases      = 6;    /* should equal number of cases */
+    struct testcase *case_ptr    = NULL; /* dumb work-around for possible     */
+                                         /* dynamic cases creation because    */
+                                         /* of compiler warnings Wlarger-than */
+    struct testcase  cases_arr[] = {
+        {   "default config fapl",
+            SUCCEED,
+            {   1,           /* version */
+                "localhost", /* namenode_name */
+                0,           /* namenode_port number */
+                "some_user", /* user_name */
+                "",          /* kerberos_ticket_cache path */
+                -1,          /* stream_buffer_size */
+            },
+        },
+        {   "invalid version number (2)",
+            FAIL,
+            {   2,           /* version */
+                "localhost", /* namenode_name */
+                0,           /* namenode_port number */
+                "some_user", /* user_name */
+                "",          /* kerberos_ticket_cache path */
+                -1,          /* stream_buffer_size */
+            },
+        },
+        {   "invalid version number (0)",
+            FAIL,
+            {   0,           /* version */
+                "localhost", /* namenode_name */
+                0,           /* namenode_port number */
+                "some_user", /* user_name */
+                "",          /* kerberos_ticket_cache path */
+                -1,          /* stream_buffer_size */
+            },
+        },
+        {   "nonsense kerberos path still ok?",
+            SUCCEED,
+            {   1,           /* version */
+                "localhost", /* namenode_name */
+                0,           /* namenode_port number */
+                "some_user", /* user_name */
+                "pathToSomewhere", /* kerberos_ticket_cache path */
+                -1,          /* stream_buffer_size */
+            },
+        },
+        {   "namenode port number too high",
+            FAIL,
+            {   1,           /* version */
+                "localhost", /* namenode_name */
+                88000,       /* namenode_port number */
+                "some_user", /* user_name */
+                "",          /* kerberos_ticket_cache path */
+                -1,          /* stream_buffer_size */
+            },
+        },
+        {   "negative namenode port number",
+            FAIL,
+            {   1,           /* version */
+                "localhost", /* namenode_name */
+                -1,          /* namenode_port number */
+                "some_user", /* user_name */
+                "",          /* kerberos_ticket_cache path */
+                -1,          /* stream_buffer_size */
+            },
+        },
+    };
+
+    TESTING("HDFS fapl configuration validation");
+
+    /*********
+     * TESTS *
+     *********/
+
+    for (i = 0; i < ncases; i++) {
+
+        /*---------------
+         * per-test setup
+         *---------------
+         */
+        case_ptr = &cases_arr[i];
+        fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+        FAIL_IF( fapl_id < 0 ) /* sanity-check */
+
+        /*-----------------------------------
+         * Actually test -- set fapl.
+         * Mute stack trace in failure cases.
+         *-----------------------------------
+         */
+        H5E_BEGIN_TRY {
+            /* `H5FD_hdfs_validate_config(...)` is static/private
+             * to src/hdfs.c and cannot (and should not?) be tested directly?
+             * Instead, validate config through public api.
+             */
+            success = H5Pset_fapl_hdfs(fapl_id, &case_ptr->config);
+        } H5E_END_TRY;
+
+        JSVERIFY( case_ptr->expected, success, case_ptr->msg )
+
+        /* Make sure we can get back what we put in.
+         * Only valid if the fapl configuration does not result in error.
+         */
+        if (success == SUCCEED) {
+            config = case_ptr->config;
+            JSVERIFY( SUCCEED,
+                      H5Pget_fapl_hdfs(fapl_id, &fa_fetch),
+                      "unable to get fapl" )
+            JSVERIFY( H5FD__CURR_HDFS_FAPL_T_VERSION,
+                      fa_fetch.version,
+                      "invalid version number" )
+            JSVERIFY( config.version,
+                      fa_fetch.version,
+                      "version number mismatch" )
+            JSVERIFY( config.namenode_port,
+                      fa_fetch.namenode_port,
+                      "namenode port mismatch" )
+            JSVERIFY( config.stream_buffer_size,
+                      fa_fetch.stream_buffer_size,
+                      "streambuffer size mismatch" )
+            JSVERIFY_STR( config.namenode_name,
+                          fa_fetch.namenode_name,
+                          NULL )
+            JSVERIFY_STR( config.user_name,
+                          fa_fetch.user_name,
+                          NULL )
+            JSVERIFY_STR( config.kerberos_ticket_cache,
+                          fa_fetch.kerberos_ticket_cache,
+                          NULL )
+        }
+
+        /*-----------------------------
+         * per-test sanitation/teardown
+         *-----------------------------
+         */
+        FAIL_IF( FAIL == H5Pclose(fapl_id) )
+        fapl_id = -1;
+
+    } /* for each test case */
+
+    PASSED();
+    return 0;
+
+error:
+    /***********
+     * CLEANUP *
+     ***********/
+
+    if (fapl_id < 0) {
+        H5E_BEGIN_TRY {
+            (void)H5Pclose(fapl_id);
+        } H5E_END_TRY;
+    }
+    return 1;
+
+} /* end test_fapl_config_validation() */
+
+
+/*-------------------------------------------------------------------------
+ *
+ * Function:    test_hdfs_fapl()
+ *
+ * Purpose:     Tests the file handle interface for the HDFS driver.
+ *
+ *              For now, test only fapl & flags.  Extend as the
+ *              work on the VFD continues.
+ *
+ * Return:      Success:        0
+ *              Failure:        1
+ *
+ * Programmer:  Jacob Smith
+ *              2018-04-25
+ *
+ * Changes:     None.
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+test_hdfs_fapl(void)
+{
+    /************************
+     * test-local variables *
+     ************************/
+
+    hid_t             fapl_id        = -1;  /* file access property list ID */
+    hid_t             driver_id      = -1;  /* ID for this VFD              */
+    unsigned long     driver_flags   =  0;  /* VFD feature flags            */
+    H5FD_hdfs_fapl_t  hdfs_fa_0      = {
+        1,    /* version*/
+        "",   /* node name */
+        9000, /* node port */
+        "",   /* username */
+        "",   /* kerb cache path */
+        1024, /* stream buffer size */
+    };
+
+    TESTING("HDFS fapl ");
+
+    /* Set property list and file name for HDFS driver.
+     */
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( fapl_id < 0 )
+
+    FAIL_IF( FAIL == H5Pset_fapl_hdfs(fapl_id, &hdfs_fa_0) )
+
+    driver_id = H5Pget_driver(fapl_id);
+    FAIL_IF( driver_id < 0 )
+
+    /****************
+     * Check that the VFD feature flags are correct
+     * SPEC MAY CHANGE
+     ******************/
+
+    FAIL_IF( H5FDdriver_query(driver_id, &driver_flags) < 0 )
+
+    JSVERIFY_NOT( 0, (driver_flags & H5FD_FEAT_DATA_SIEVE),
+                  "bit(s) in `driver_flags` must align with "
+                  "H5FD_FEAT_DATA_SIEVE" )
+
+    JSVERIFY( H5FD_FEAT_DATA_SIEVE, driver_flags,
+              "H5FD_FEAT_DATA_SIEVE should be the only supported flag")
+
+    PASSED();
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        (void)H5Pclose(fapl_id);
+    } H5E_END_TRY;
+
+    return 1;
+
+} /* end test_hdfs_fapl() */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_vfd_open()
+ *
+ * Purpose:
+ *
+ *     Demonstrate/specify VFD-level "Open" failure cases
+ *
+ * Return:
+ *
+ *     PASSED : 0
+ *     FAILED : 1
+ *
+ * Programmer: Jacob Smith
+ *             2018-06-07
+ *
+ *---------------------------------------------------------------------------
+ */
+static int
+test_vfd_open(void)
+{
+
+#ifndef H5_HAVE_LIBHDFS
+    TESTING("HDFS VFD-level open");
+    SKIPPED();
+    puts("    HDFS VFD is not enabled");
+    fflush(stdout);
+    return 0;
+
+#else
+
+    /*********************
+     * test-local macros *
+     *********************/
+
+/* selectors for which fapl to use in testcase */
+#define FAPL_H5P_DEFAULT  -2
+#define FAPL_UNCONFIGURED -3 /* H5P_FILE_ACCESS */
+#define FAPL_HDFS         -4
+
+    /*************************
+     * test-local structures *
+     *************************/
+
+    struct test_condition {
+        const char *message;
+        const char *url;
+        unsigned    flags;
+        int         which_fapl;
+        haddr_t     maxaddr;
+        hbool_t     might_use_other_driver;
+    };
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    struct test_condition failing_conditions[] = {
+        {   "default property list (H5P_DEFAULT) is invalid",
+            filename_bard,
+            H5F_ACC_RDONLY,
+            FAPL_H5P_DEFAULT,
+            MAXADDR,
+            TRUE,
+        },
+        {   "generic file access property list is invalid",
+            filename_bard,
+            H5F_ACC_RDONLY,
+            FAPL_UNCONFIGURED,
+            MAXADDR,
+            TRUE,
+        },
+        {   "filename cannot be null",
+            NULL,
+            H5F_ACC_RDONLY,
+            FAPL_HDFS,
+            MAXADDR,
+            FALSE,
+        },
+        {   "filename cannot be empty",
+            "",
+            H5F_ACC_RDONLY,
+            FAPL_HDFS,
+            MAXADDR,
+            FALSE,
+        },
+        {   "file at filename must exist",
+            filename_missing,
+            H5F_ACC_RDONLY,
+            FAPL_HDFS,
+            MAXADDR,
+            FALSE,
+        },
+        {   "read-write flag not supported",
+            filename_bard,
+            H5F_ACC_RDWR,
+            FAPL_HDFS,
+            MAXADDR,
+            FALSE,
+        },
+        {   "truncate flag not supported",
+            filename_bard,
+            H5F_ACC_TRUNC,
+            FAPL_HDFS,
+            MAXADDR,
+            FALSE,
+        },
+        {   "create flag not supported",
+            filename_bard,
+            H5F_ACC_CREAT,
+            FAPL_HDFS,
+            MAXADDR,
+            FALSE,
+        },
+        {   "EXCL flag not supported",
+            filename_bard,
+            H5F_ACC_EXCL,
+            FAPL_HDFS,
+            MAXADDR,
+            FALSE,
+        },
+        {   "maxaddr cannot be 0 (caught in `H5FD_open()`)",
+            filename_bard,
+            H5F_ACC_RDONLY,
+            FAPL_HDFS,
+            0,
+            FALSE,
+        },
+    };
+    unsigned  i                        = 0;
+    unsigned  failing_conditions_count = 10;
+    H5FD_t   *fd                       = NULL;
+    hid_t     fapl_hdfs                = -1;
+    hid_t     fapl_unconfigured        = -1;
+
+    TESTING("HDFS VFD-level open");
+
+    fapl_unconfigured = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( fapl_unconfigured < 0 )
+
+    fapl_hdfs = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( fapl_hdfs < 0 )
+    FAIL_IF( FAIL == H5Pset_fapl_hdfs(fapl_hdfs, &default_fa) )
+
+    /*********
+     * TESTS *
+     *********/
+
+    /* all the test cases that will _not_ open
+     */
+    for (i = 0; i < failing_conditions_count; i++) {
+        struct test_condition T       = failing_conditions[i];
+        hid_t                 fapl_id = H5P_DEFAULT;
+
+        fd = NULL;
+
+        if (T.which_fapl == FAPL_UNCONFIGURED) {
+            fapl_id = fapl_unconfigured;
+        }
+        else
+        if (T.which_fapl == FAPL_HDFS) {
+            fapl_id = fapl_hdfs;
+        }
+
+#if HDFS_TEST_DEBUG
+        HDfprintf(stderr, "testing: %s\n", T.message);
+#endif /* HDFS_TEST_DEBUG */
+
+        H5E_BEGIN_TRY {
+            fd = H5FDopen(T.url, T.flags, fapl_id, T.maxaddr);
+        } H5E_END_TRY;
+        if (NULL != fd) {
+            if (TRUE == T.might_use_other_driver &&
+                H5FD_HDFS != fd->driver_id)
+            {
+                HDfprintf(stderr, "\n!!!!! WARNING !!!!!\n"              \
+                          "    Successful open of file on local system " \
+                          "with non-HDFS VFD.\n");
+                JSVERIFY(SUCCEED, H5FDclose(fd),
+                         "unable to close errant open");
+                fd = NULL;
+            }
+            else {
+                JSVERIFY(1, 0, T.message); /* print message and fail */
+            }
+        }
+    }
+
+    FAIL_IF( NULL != fd ) /* sanity check */
+
+#if HDFS_TEST_DEBUG
+        HDfprintf(stderr, "nominal open\n");
+#endif /* HDFS_TEST_DEBUG */
+
+    /* finally, show that a file can be opened
+     */
+    fd = H5FDopen(
+            filename_bard,
+            H5F_ACC_RDONLY,
+            fapl_hdfs,
+            MAXADDR);
+    FAIL_IF( NULL == fd )
+
+    /************
+     * TEARDOWN *
+     ************/
+
+#if HDFS_TEST_DEBUG
+        HDfprintf(stderr, "teardown...\n");
+#endif /* HDFS_TEST_DEBUG */
+
+    FAIL_IF( FAIL == H5FDclose(fd) )
+    fd = NULL;
+
+    FAIL_IF( FAIL == H5Pclose(fapl_hdfs) )
+    fapl_hdfs = -1;
+
+    FAIL_IF( FAIL == H5Pclose(fapl_unconfigured) )
+    fapl_unconfigured = -1;
+
+    PASSED();
+    return 0;
+
+error:
+
+    /***********
+     * CLEANUP *
+     ***********/
+
+    if (fd) {
+        (void)H5FDclose(fd);
+    }
+    H5E_BEGIN_TRY {
+        if (fapl_hdfs >= 0) {
+            (void)H5Pclose(fapl_hdfs);
+        }
+        if (fapl_unconfigured >= 0) {
+            (void)H5Pclose(fapl_unconfigured);
+        }
+    } H5E_END_TRY;
+
+    return 1;
+
+#undef FAPL_H5P_DEFAULT
+#undef FAPL_UNCONFIGURED
+#undef FAPL_HDFS
+
+#endif /* H5_HAVE_LIBHDFS */
+
+} /* end test_vfd_open() */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_eof_eoa()
+ *
+ * Purpose:
+ *
+ *     Demonstrate behavior of get_eof, get_eoa, and set_eoa.
+ *
+ * Return:
+ *
+ *     PASSED : 0
+ *     FAILED : 1
+ *
+ * Programmer: Jacob Smith
+ *             2018-06-07
+ *
+ *---------------------------------------------------------------------------
+ */
+static int
+test_eof_eoa(void)
+{
+#ifndef H5_HAVE_LIBHDFS
+    TESTING("HDFS eof/eoa gets and sets");
+    SKIPPED();
+    puts("    HDFS VFD is not enabled");
+    fflush(stdout);
+    return 0;
+
+#else
+
+    /*********************
+     * test-local macros *
+     *********************/
+
+    /*************************
+     * test-local structures *
+     *************************/
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    H5FD_t  *fd_shakespeare  = NULL;
+    hid_t    fapl_id         = -1;
+
+    TESTING("HDFS eof/eoa gets and sets");
+
+    /*********
+     * SETUP *
+     *********/
+
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( 0 > fapl_id )
+    FAIL_IF( FAIL == H5Pset_fapl_hdfs(fapl_id, &default_fa) )
+
+    fd_shakespeare = H5FDopen(
+             filename_bard,
+             H5F_ACC_RDONLY,
+             fapl_id,
+             HADDR_UNDEF);
+    FAIL_IF( NULL == fd_shakespeare )
+
+    /*********
+     * TESTS *
+     *********/
+
+    /* verify as found
+     */
+    JSVERIFY( 5458199, H5FDget_eof(fd_shakespeare, H5FD_MEM_DEFAULT), NULL )
+    JSVERIFY( H5FDget_eof(fd_shakespeare, H5FD_MEM_DEFAULT),
+              H5FDget_eof(fd_shakespeare, H5FD_MEM_DRAW),
+              "mismatch between DEFAULT and RAW memory types" )
+    JSVERIFY( 0,
+              H5FDget_eoa(fd_shakespeare, H5FD_MEM_DEFAULT),
+              "EoA should be unset by H5FDopen" )
+
+    /* set EoA below EoF
+     */
+    JSVERIFY( SUCCEED,
+              H5FDset_eoa(fd_shakespeare, H5FD_MEM_DEFAULT, 44442202),
+              "unable to set EoA (lower)" )
+    JSVERIFY( 5458199,
+              H5FDget_eof(fd_shakespeare, H5FD_MEM_DEFAULT),
+              "EoF changed" )
+    JSVERIFY( 44442202,
+              H5FDget_eoa(fd_shakespeare, H5FD_MEM_DEFAULT),
+              "EoA unchanged" )
+
+    /* set EoA above EoF
+     */
+    JSVERIFY( SUCCEED,
+              H5FDset_eoa(fd_shakespeare, H5FD_MEM_DEFAULT, 6789012),
+              "unable to set EoA (higher)" )
+    JSVERIFY( 5458199,
+              H5FDget_eof(fd_shakespeare, H5FD_MEM_DEFAULT),
+              "EoF changed" )
+    JSVERIFY( 6789012,
+              H5FDget_eoa(fd_shakespeare, H5FD_MEM_DEFAULT),
+              "EoA unchanged" )
+
+    /************
+     * TEARDOWN *
+     ************/
+
+    FAIL_IF( FAIL == H5FDclose(fd_shakespeare) )
+    fd_shakespeare = NULL;
+
+    FAIL_IF( FAIL == H5Pclose(fapl_id) )
+    fapl_id = -1;
+
+    PASSED();
+    return 0;
+
+error:
+
+    /***********
+     * CLEANUP *
+     ***********/
+
+    if (fd_shakespeare != NULL) {
+        (void)H5FDclose(fd_shakespeare);
+    }
+    if (fapl_id >= 0) {
+        H5E_BEGIN_TRY {
+            (void)H5Pclose(fapl_id);
+        } H5E_END_TRY;
+    }
+
+    return 1;
+
+#endif /* H5_HAVE_LIBHDFS */
+
+} /* end test_eof_eoa() */
+
+
+/*-----------------------------------------------------------------------------
+ *
+ * Function: test_H5FDread_without_eoa_set_fails()
+ *
+ * Purpose:
+ *
+ *     Demonstrate a not-obvious constraint by the library, preventing
+ *     file read before EoA is set
+ *
+ * Programmer: Jacob Smith
+ *             2018-06-08
+ *
+ *-----------------------------------------------------------------------------
+ */
+static int
+test_H5FDread_without_eoa_set_fails(void)
+{
+#ifndef H5_HAVE_LIBHDFS
+    TESTING("HDFS VFD read-eoa temporal coupling library limitation");
+    SKIPPED();
+    puts("    HDFS VFD is not enabled");
+    fflush(stdout);
+    return 0;
+
+#else
+
+    char          buffer[HDFS_TEST_MAX_BUF_SIZE];
+    unsigned int  i                = 0;
+    H5FD_t       *file_shakespeare = NULL;
+    hid_t         fapl_id          = -1;
+
+    TESTING("HDFS VFD read-eoa temporal coupling library limitation");
+
+    /*********
+     * SETUP *
+     *********/
+
+    /* create HDFS fapl
+     */
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( fapl_id < 0 )
+    FAIL_IF( FAIL == H5Pset_fapl_hdfs(fapl_id, &default_fa) )
+
+    file_shakespeare = H5FDopen(
+            filename_bard,
+            H5F_ACC_RDONLY,
+            fapl_id,
+            MAXADDR);
+    FAIL_IF( NULL == file_shakespeare )
+
+    JSVERIFY( 0, H5FDget_eoa(file_shakespeare, H5FD_MEM_DEFAULT),
+              "EoA should remain unset by H5FDopen" )
+
+    /* zero buffer contents */
+    for (i = 0; i < HDFS_TEST_MAX_BUF_SIZE; i++) {
+        buffer[i] = 0;
+    }
+
+    /********
+     * TEST *
+     ********/
+
+    H5E_BEGIN_TRY { /* mute stack trace on expected failure */
+        JSVERIFY( FAIL,
+                  H5FDread(file_shakespeare,
+                       H5FD_MEM_DRAW,
+                       H5P_DEFAULT,
+                       1200699,
+                       102,
+                       buffer),
+                  "cannot read before eoa is set" )
+    } H5E_END_TRY;
+    for (i = 0; i < HDFS_TEST_MAX_BUF_SIZE; i++) {
+        JSVERIFY( 0, (unsigned)buffer[i], "buffer was modified by write!" )
+    }
+
+    /************
+     * TEARDOWN *
+     ************/
+
+    FAIL_IF( FAIL == H5FDclose(file_shakespeare) )
+    file_shakespeare = NULL;
+
+    FAIL_IF( FAIL == H5Pclose(fapl_id) )
+    fapl_id = -1;
+
+    PASSED();
+    return 0;
+
+error:
+
+    /***********
+     * CLEANUP *
+     ***********/
+
+    if (file_shakespeare) {
+        (void)H5FDclose(file_shakespeare);
+    }
+    if (fapl_id >= 0) {
+        H5E_BEGIN_TRY {
+           (void)H5Pclose(fapl_id);
+        } H5E_END_TRY;
+    }
+
+    return 1;
+
+#endif /* H5_HAVE_LIBHDFS */
+
+} /* end test_H5FDread_without_eoa_set_fails() */
+
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_read()
+ *
+ * Purpose:
+ *
+ * Return:
+ *
+ *     PASSED : 0
+ *     FAILED : 1
+ *
+ * Programmer: Jacob Smith
+ *             2018-06-08
+ *
+ *---------------------------------------------------------------------------
+ */
+static int
+test_read(void)
+{
+#ifndef H5_HAVE_LIBHDFS
+    TESTING("HDFS VFD read/range-gets");
+    SKIPPED();
+    puts("    HDFS VFD is not enabled");
+    fflush(stdout);
+    return 0;
+
+#else
+
+    /*********************
+     * test-local macros *
+     *********************/
+
+    /*************************
+     * test-local structures *
+     *************************/
+    struct testcase {
+        const char *message;  /* purpose of test case */
+        haddr_t     eoa_set;  /* set file EOA to this prior to read */
+        size_t      addr;     /* offset of read in file */
+        size_t      len;      /* length of read in file */
+        herr_t      success;  /* expected return value of read function */
+        const char *expected; /* expected contents of buffer; failure ignores */
+    };
+
+    /************************
+     * test-local variables *
+     ************************/
+    struct testcase cases[] = {
+        {   "successful range-get",
+            6464,
+            5691,
+            32, /* fancy quotes are three bytes each(?) */
+            SUCCEED,
+            "Quoth the Raven “Nevermore.”",
+        },
+        {   "read past EOA fails (EOA < EOF < addr)",
+            3000,
+            4000,
+            100,
+            FAIL,
+            NULL,
+        },
+        {   "read overlapping EOA fails (EOA < addr < EOF < (addr+len))",
+            3000,
+            8000,
+            100,
+            FAIL,
+            NULL,
+        },
+        {   "read past EOA/EOF fails ((EOA==EOF) < addr)",
+            6464,
+            7000,
+            100,
+            FAIL,
+            NULL,
+        },
+        {   "read overlapping EOA/EOF fails (addr < (EOA==EOF) < (addr+len))",
+            6464,
+            6400,
+            100,
+            FAIL,
+            NULL,
+        },
+        {   "read between EOF and EOA fails (EOF < addr < (addr+len) < EOA)",
+            8000,
+            7000,
+            100,
+            FAIL,
+            NULL,
+        },
+    };
+    unsigned          testcase_count   = 6;
+    unsigned          test_i           = 0;
+    struct testcase   test;
+    herr_t            open_return      = FAIL;
+    char              buffer[HDFS_TEST_MAX_BUF_SIZE];
+    unsigned int      i                = 0;
+    H5FD_t           *file_raven       = NULL;
+    hid_t             fapl_id          = -1;
+
+    TESTING("HDFS VFD read/range-gets");
+
+    /*********
+     * SETUP *
+     *********/
+
+    /* create HDFS fapl
+     */
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( fapl_id < 0 )
+    FAIL_IF( FAIL == H5Pset_fapl_hdfs(fapl_id, &default_fa) )
+
+    /* zero buffer contents */
+    for (i = 0; i < HDFS_TEST_MAX_BUF_SIZE; i++) {
+        buffer[i] = 0;
+    }
+
+    /* open file
+     */
+    file_raven = H5FDopen(
+            filename_raven,
+            H5F_ACC_RDONLY,
+            fapl_id,
+            HADDR_UNDEF); /* Demonstrate success with "automatic" value */
+    FAIL_IF( NULL == file_raven )
+
+    JSVERIFY( 6464, H5FDget_eof(file_raven, H5FD_MEM_DEFAULT), NULL )
+
+    /*********
+     * TESTS *
+     *********/
+
+    for (test_i = 0; test_i < testcase_count; test_i++) {
+
+        /* -------------- *
+         * per-test setup *
+         * -------------- */
+
+        test        = cases[test_i];
+        open_return = FAIL;
+
+        FAIL_IF( HDFS_TEST_MAX_BUF_SIZE < test.len ) /* buffer too small! */
+
+        FAIL_IF( FAIL ==
+                 H5FDset_eoa( file_raven, H5FD_MEM_DEFAULT, test.eoa_set) )
+
+        /* zero buffer contents */
+        for (i = 0; i < HDFS_TEST_MAX_BUF_SIZE; i++) {
+            buffer[i] = 0;
+        }
+
+        /* ------------ *
+         * conduct test *
+         * ------------ */
+
+        H5E_BEGIN_TRY {
+            open_return = H5FDread(
+                    file_raven,
+                    H5FD_MEM_DRAW,
+                    H5P_DEFAULT,
+                    test.addr,
+                    test.len,
+                    buffer);
+        } H5E_END_TRY;
+
+        JSVERIFY( test.success,
+                  open_return,
+                  test.message )
+
+        if (open_return == SUCCEED) {
+            JSVERIFY_STR( test.expected, buffer, NULL )
+        }
+
+    } /* for each testcase */
+
+    /************
+     * TEARDOWN *
+     ************/
+
+    FAIL_IF( FAIL == H5FDclose(file_raven) )
+    file_raven = NULL;
+
+    FAIL_IF( FAIL == H5Pclose(fapl_id) )
+    fapl_id = -1;
+
+    PASSED();
+    return 0;
+
+error:
+
+    /***********
+     * CLEANUP *
+     ***********/
+
+    if (file_raven != 0)  {
+        (void)H5FDclose(file_raven);
+    }
+    if (fapl_id >= 0) {
+        H5E_BEGIN_TRY {
+           (void)H5Pclose(fapl_id);
+        } H5E_END_TRY;
+    }
+
+    return 1;
+
+#endif /* H5_HAVE_LIBHDFS */
+
+} /* end test_read() */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_noops_and_autofails()
+ *
+ * Purpose:
+ *
+ *     Demonstrate the unavailable and do-nothing routines unique to
+ *     Read-Only VFD.
+ *
+ * Return:
+ *
+ *     PASSED : 0
+ *     FAILED : 1
+ *
+ * Programmer: Jacob Smith
+ *             2017-11-06
+ *
+ * Changes:
+ *     + modify from S3VFD codebase to HDFS; Minor changes, mostly.
+ *         + Jacob Smith 2018-06-08
+ *
+ *---------------------------------------------------------------------------
+ */
+static int
+test_noops_and_autofails(void)
+{
+#ifndef H5_HAVE_LIBHDFS
+    TESTING("HDFS VFD always-fail and no-op routines");
+    SKIPPED();
+    puts("    HDFS VFD is not enabled");
+    fflush(stdout);
+    return 0;
+
+#else
+
+    /*********************
+     * test-local macros *
+     *********************/
+
+    /*************************
+     * test-local structures *
+     *************************/
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    hid_t             fapl_id    = -1;
+    H5FD_t           *file       = NULL;
+    const char        data[36]   = "The Force shall be with you, always";
+
+    TESTING("HDFS VFD always-fail and no-op routines");
+
+    /*********
+     * SETUP *
+     *********/
+
+    /* create HDFS fapl
+     */
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( fapl_id < 0 )
+    FAIL_IF( FAIL == H5Pset_fapl_hdfs(fapl_id, &default_fa) )
+
+    /* open file
+     */
+    file = H5FDopen(
+            filename_bard,
+            H5F_ACC_RDONLY,
+            fapl_id,
+            HADDR_UNDEF);
+    FAIL_IF( NULL == file )
+
+    /*********
+     * TESTS *
+     *********/
+
+    /* auto-fail calls to write and truncate
+     */
+    H5E_BEGIN_TRY {
+        JSVERIFY( FAIL,
+                  H5FDwrite(file, H5FD_MEM_DRAW, H5P_DEFAULT, 1000, 35, data),
+                  "write must fail" )
+    } H5E_END_TRY;
+
+    H5E_BEGIN_TRY {
+        JSVERIFY( FAIL,
+                  H5FDtruncate(file, H5P_DEFAULT, FALSE),
+                  "truncate must fail" )
+    } H5E_END_TRY;
+
+    H5E_BEGIN_TRY {
+        JSVERIFY( FAIL,
+                  H5FDtruncate(file, H5P_DEFAULT, TRUE),
+                  "truncate must fail (closing)" )
+    } H5E_END_TRY;
+
+    /* no-op calls to `lock()` and `unlock()`
+     */
+    JSVERIFY( SUCCEED,
+              H5FDlock(file, TRUE),
+              "lock always succeeds; has no effect" )
+    JSVERIFY( SUCCEED,
+              H5FDlock(file, FALSE),
+              NULL )
+    JSVERIFY( SUCCEED,
+              H5FDunlock(file),
+              NULL )
+    /* Lock/unlock with null file or similar error crashes tests.
+     * HDassert in calling heirarchy, `H5FD[un]lock()` and `H5FD_[un]lock()`
+     */
+
+    /************
+     * TEARDOWN *
+     ************/
+
+    FAIL_IF( FAIL == H5FDclose(file) )
+    file = NULL;
+
+    FAIL_IF( FAIL == H5Pclose(fapl_id) )
+    fapl_id = -1;
+
+    PASSED();
+    return 0;
+
+error:
+
+    /***********
+     * CLEANUP *
+     ***********/
+
+    if (fapl_id >= 0) {
+        H5E_BEGIN_TRY {
+           (void)H5Pclose(fapl_id);
+        } H5E_END_TRY;
+    }
+    if (file != NULL) {
+        (void)H5FDclose(file);
+    }
+
+    return 1;
+
+#endif /* H5_HAVE_LIBHDFS */
+
+} /* end test_noops_and_autofails() */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_cmp()
+ *
+ * Purpose:
+ *
+ *     Verify "file comparison" behavior.
+ *
+ * Return:
+ *
+ *     PASSED : 0
+ *     FAILED : 1
+ *
+ * Programmer: Jacob Smith
+ *             2017-11-06
+ *
+ *---------------------------------------------------------------------------
+ */
+static int
+test_cmp(void)
+{
+    TESTING("HDFS cmp (comparison)");
+    SKIPPED();
+    HDfprintf(
+            stderr,
+            "    TODO: Distinct valid fapls to open the same file.\n");
+
+    return 0;
+
+} /* end test_cmp() */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_H5F_integration()
+ *
+ * Purpose:
+ *
+ *     Demonstrate H5F (File interface) behavior with files on HDFS.
+ *
+ * Return:
+ *
+ *     PASSED : 0
+ *     FAILED : 1
+ *
+ * Programmer: Jacob Smith
+ *             2017-11-07
+ *
+ * Changes:
+ *     + modify from S3VFD codebase to HDFS; Minor changes, mostly.
+ *         + Jacob Smith 2018-06-08
+ *
+ *---------------------------------------------------------------------------
+ */
+static int
+test_H5F_integration(void)
+{
+#ifndef H5_HAVE_LIBHDFS
+    TESTING("HDFS file access through HD5F library (H5F API)");
+    SKIPPED();
+    puts("    HDFS VFD is not enabled");
+    fflush(stdout);
+    return 0;
+
+#else
+
+    /*********************
+     * test-local macros *
+     *********************/
+
+    /*************************
+     * test-local structures *
+     *************************/
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    hid_t file    = -1;
+    hid_t fapl_id = -1;
+
+    TESTING("HDFS file access through HD5F library (H5F API)");
+
+    /*********
+     * SETUP *
+     *********/
+
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( 0 > fapl_id )
+    FAIL_IF( FAIL == H5Pset_fapl_hdfs(fapl_id, &default_fa) )
+
+    /*********
+     * TESTS *
+     *********/
+
+    /* Read-Write Open access is not allowed with this file driver.
+     */
+    H5E_BEGIN_TRY {
+        FAIL_IF( 0 <= H5Fopen(
+                      filename_example_h5,
+                      H5F_ACC_RDWR,
+                      fapl_id) )
+    } H5E_END_TRY;
+
+    /* H5Fcreate() is not allowed with this file driver.
+     */
+    H5E_BEGIN_TRY {
+        FAIL_IF( 0 <= H5Fcreate(
+                      filename_missing,
+                      H5F_ACC_RDONLY,
+                      H5P_DEFAULT,
+                      fapl_id) )
+    } H5E_END_TRY;
+
+    /* Successful open.
+     */
+    file = H5Fopen(
+            filename_example_h5,
+            H5F_ACC_RDONLY,
+            fapl_id);
+    FAIL_IF( file < 0 )
+
+    /************
+     * TEARDOWN *
+     ************/
+
+    FAIL_IF( FAIL == H5Fclose(file) )
+    file = -1;
+
+    FAIL_IF( FAIL == H5Pclose(fapl_id) )
+    fapl_id = -1;
+
+    PASSED();
+    return 0;
+
+error:
+    /***********
+     * CLEANUP *
+     ***********/
+
+#if HDFS_TEST_DEBUG
+    HDprintf("\nerror!"); fflush(stdout);
+#endif /* HDFS_TEST_DEBUG */
+
+    if (fapl_id >= 0) {
+        H5E_BEGIN_TRY {
+           (void)H5Pclose(fapl_id);
+        } H5E_END_TRY;
+    }
+    if (file > 0) {
+        (void)H5Fclose(file);
+    }
+
+    return 1;
+
+#endif /* H5_HAVE_LIBHDFS */
+
+} /* test_H5F_integration */
+
+
+/*-------------------------------------------------------------------------
+ *
+ * Function:    main
+ *
+ * Purpose:     Tests the basic features of Virtual File Drivers
+ *
+ * Return:      Success: 0
+ *              Failure: 1
+ *
+ * Programmer:  Jacob Smith
+ *              2017-10-23
+ *
+ *-------------------------------------------------------------------------
+ */
+int
+main(void)
+{
+    int nerrors = 0;
+
+    /******************
+     * commence tests *
+     ******************/
+
+    static char hdfs_namenode_name[HDFS_NAMENODE_NAME_MAX_SIZE] = "";
+    const char *hdfs_namenode_name_env = NULL;
+
+    hdfs_namenode_name_env = HDgetenv("HDFS_TEST_NAMENODE_NAME");
+    if (hdfs_namenode_name_env == NULL || hdfs_namenode_name_env[0] == '\0') {
+        HDstrncpy(hdfs_namenode_name, "localhost", HDFS_NAMENODE_NAME_MAX_SIZE);
+    }
+    else {
+        HDstrncpy( /* TODO: error-check? */
+                default_fa.namenode_name,
+                hdfs_namenode_name_env,
+                HDFS_NAMENODE_NAME_MAX_SIZE);
+    }
+
+    h5_reset();
+
+    HDprintf("Testing hdfs VFD functionality.\n");
+
+    nerrors += test_fapl_config_validation();
+    nerrors += test_hdfs_fapl();
+    nerrors += test_vfd_open();
+    nerrors += test_eof_eoa();
+    nerrors += test_H5FDread_without_eoa_set_fails();
+    nerrors += test_read();
+    nerrors += test_noops_and_autofails();
+    nerrors += test_cmp();
+    nerrors += test_H5F_integration();
+
+    if (nerrors > 0) {
+        HDprintf("***** %d hdfs TEST%s FAILED! *****\n",
+                 nerrors,
+                 nerrors > 1 ? "S" : "");
+        nerrors = 1;
+    }
+    else {
+        HDprintf("All hdfs tests passed.\n");
+    }
+    return nerrors; /* 0 if no errors, 1 if any errors */
+
+} /* end main() */
+
+
diff --git a/test/hyperslab.c b/test/hyperslab.c
index 9e17a2f..d22a689 100644
--- a/test/hyperslab.c
+++ b/test/hyperslab.c
@@ -1180,13 +1180,11 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    main
  *
- * Purpose:    Test various hyperslab operations.  Give the words
- *        `small' and/or `medium' on the command line or only `small'
- *        is assumed.
+ * Purpose:     Test various hyperslab operations.  Give the words
+ *              'small' and/or 'medium' on the command line or only 'small'
+ *              is assumed.
  *
- * Return:    Success:    exit(EXIT_SUCCESS)
- *
- *        Failure:    exit(EXIT_FAILURE)
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *
  * Programmer:    Robb Matzke
  *        Friday, October 10, 1997
@@ -1442,6 +1440,6 @@ main(int argc, char *argv[])
     H5close();
 #endif  /* H5_HAVE_THREADSAFE */
 
-    return 0;
+    HDexit(EXIT_SUCCESS);
 }
 
diff --git a/test/istore.c b/test/istore.c
index 8759be3..c8fe866 100644
--- a/test/istore.c
+++ b/test/istore.c
@@ -579,17 +579,13 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    main
  *
- * Purpose:    Tests indexed storage stuff.
+ * Purpose:     Tests indexed storage
  *
- * Return:    Success:    exit(EXIT_SUCCESS)
- *
- *        Failure:    exit(EXIT_FAILURE)
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *
  * Programmer:    Robb Matzke
  *        Wednesday, October 15, 1997
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 int
@@ -618,9 +614,6 @@ main(int argc, char *argv[])
                 size_of_test |= TEST_LARGE;
             } else {
                 HDprintf("unrecognized argument: %s\n", argv[i]);
-#if 0
-                exit(EXIT_FAILURE);
-#endif
             }
         }
     }
@@ -654,7 +647,7 @@ main(int argc, char *argv[])
     h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
     if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) {
         HDprintf("Cannot create file %s; test aborted\n", filename);
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
     }
 
     /* Initialize chunk dimensions */
@@ -722,13 +715,13 @@ main(int argc, char *argv[])
     if (nerrors) {
         HDprintf("***** %d I-STORE TEST%s FAILED! *****\n",
                 nerrors, 1 == nerrors ? "" : "S");
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
     }
 
     HDprintf("All i-store tests passed.\n");
 
     h5_cleanup(FILENAME, fapl);
 
-    return 0;
+    HDexit(EXIT_SUCCESS);
 }
 
diff --git a/test/links.c b/test/links.c
index 8c0eea7..0bdb3f0 100644
--- a/test/links.c
+++ b/test/links.c
@@ -13894,8 +13894,7 @@ error:
  *
  * Purpose:     Test links
  *
- * Return:      Success:    exit(EXIT_SUCCESS)
- *              Failure:    exit(EXIT_FAILURE)
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *-------------------------------------------------------------------------
  */
 int
@@ -14124,10 +14123,10 @@ main(void)
     HDrmdir(TMPDIR);
     HDrmdir(TMPDIR2);
 
-    return SUCCEED;
+    HDexit(EXIT_SUCCESS);
 
 error:
     HDputs("*** TESTS FAILED ***");
-    return 1;
+    HDexit(EXIT_FAILURE);
 }
 
diff --git a/test/links_env.c b/test/links_env.c
index dff185c..efb8cfd 100644
--- a/test/links_env.c
+++ b/test/links_env.c
@@ -134,10 +134,9 @@ external_link_env(hid_t fapl, hbool_t new_format)
 /*-------------------------------------------------------------------------
  * Function:    main
  *
- * Purpose:    Test external link with environment variable HDF5_EXT_PREFIX
+ * Purpose:     Test external link with environment variable HDF5_EXT_PREFIX
  *
- * Return:    Success:    exit(EXIT_SUCCESS)
- *        Failure:    exit(EXIT_FAILURE)
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *
  * Programmer:    Vailin Choi; Nov 2010
  *
@@ -175,9 +174,10 @@ main(void)
     /* clean up tmp_links_env directory created by external link tests */
     HDrmdir(TMPDIR);
 
-    return 0;
+    HDexit(EXIT_SUCCESS);
 
 error:
     HDputs("*** TESTS FAILED ***");
-    return 1;
-}
+    HDexit(EXIT_FAILURE);
+} /* end main() */
+
diff --git a/test/objcopy.c b/test/objcopy.c
index b11352b..3c5981c 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -14074,7 +14074,7 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function:       main
+ * Function:    main
  *
  * Purpose:     Test H5Ocopy()
  *
@@ -14082,7 +14082,7 @@ error:
  *              new or old format, messages can be shared in either,
  *              both, or neither of the source and destination files.
  *
- * Return:      Non-negative on success/Negative on failure
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
@@ -14360,7 +14360,7 @@ main(void)
     if(nerrors) {
         HDprintf("***** %d OBJECT COPY TEST%s FAILED! *****\n",
                 nerrors, (1 == nerrors ? "" : "S"));
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     HDputs ("All object copying tests passed.");
@@ -14390,9 +14390,9 @@ main(void)
 
     h5_cleanup(FILENAME, fapl);
 
-    return 0;
+    HDexit(EXIT_SUCCESS);
 
 error:
-    return 1;
+    HDexit(EXIT_FAILURE);
 } /* main */
 
diff --git a/test/ros3.c b/test/ros3.c
new file mode 100644
index 0000000..73b6ac2
--- /dev/null
+++ b/test/ros3.c
@@ -0,0 +1,1937 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * Read-Only S3 Virtual File Driver (VFD)
+ *
+ * Purpose:
+ *
+ *     Verify behavior for Read-Only S3 VFD
+ *     at the VFL (virtual file layer) level.
+ *
+ *     Demonstrates basic use cases and fapl/dxpl interaction.
+ *
+ * Programmer: Jacob Smith <jake.smith@hdfgroup.org>
+ *             2017-10-11
+ */
+
+#include "h5test.h"
+
+#include "H5FDprivate.h" /* Virtual File Driver utilities */
+#include "H5FDros3.h"    /* this file driver's utilities */
+#include "H5FDs3comms.h" /* for loading of credentials */
+
+#ifdef H5_HAVE_ROS3_VFD
+
+/* only include the testing macros if needed */
+
+/*****************************************************************************
+ *
+ * FILE-LOCAL TESTING MACROS
+ *
+ * Purpose:
+ *
+ *     1) Upon test failure, goto-jump to single-location teardown in test
+ *        function. E.g., `error:` (consistency with HDF corpus) or
+ *        `failed:` (reflects purpose).
+ *            >>> using "error", in part because `H5E_BEGIN_TRY` expects it.
+ *     2) Increase clarity and reduce overhead found with `TEST_ERROR`.
+ *        e.g., "if(somefunction(arg, arg2) < 0) TEST_ERROR:"
+ *        requires reading of entire line to know whether this if/call is
+ *        part of the test setup, test operation, or a test unto itself.
+ *     3) Provide testing macros with optional user-supplied failure message;
+ *        if not supplied (NULL), generate comparison output in the spirit of
+ *        test-driven development. E.g., "expected 5 but was -3"
+ *        User messages clarify test's purpose in code, encouraging description
+ *        without relying on comments.
+ *     4) Configurable expected-actual order in generated comparison strings.
+ *        Some prefer `VERIFY(expected, actual)`, others
+ *        `VERIFY(actual, expected)`. Provide preprocessor ifdef switch
+ *        to satifsy both parties, assuming one paradigm per test file.
+ *        (One could #undef and redefine the flag through the file as desired,
+ *         but _why_.)
+ *
+ *     Provided as courtesy, per consideration for inclusion in the library
+ *     proper.
+ *
+ *     Macros:
+ *
+ *         JSVERIFY_EXP_ACT - ifdef flag, configures comparison order
+ *         FAIL_IF()        - check condition
+ *         FAIL_UNLESS()    - check _not_ condition
+ *         JSVERIFY()       - long-int equality check; prints reason/comparison
+ *         JSVERIFY_NOT()   - long-int inequality check; prints
+ *         JSVERIFY_STR()   - string equality check; prints
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *****************************************************************************/
+
+
+/*----------------------------------------------------------------------------
+ *
+ * ifdef flag: JSVERIFY_EXP_ACT
+ *
+ * JSVERIFY macros accept arguments as (EXPECTED, ACTUAL[, reason])
+ *   default, if this is undefined, is (ACTUAL, EXPECTED[, reason])
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY_EXP_ACT 1L
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSFAILED_AT()
+ *
+ * Purpose:
+ *
+ *     Preface a test failure by printing "*FAILED*" and location to stdout
+ *     Similar to `H5_FAILED(); AT();` from h5test.h
+ *
+ *     *FAILED* at somefile.c:12 in function_name()...
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSFAILED_AT() {                                                   \
+    HDprintf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, FUNC); \
+}
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: FAIL_IF()
+ *
+ * Purpose:
+ *
+ *     Make tests more accessible and less cluttered than
+ *         `if (thing == otherthing()) TEST_ERROR`
+ *         paradigm.
+ *
+ *     The following lines are roughly equivalent:
+ *
+ *         `if (myfunc() < 0) TEST_ERROR;` (as seen elsewhere in HDF tests)
+ *         `FAIL_IF(myfunc() < 0)`
+ *
+ *     Prints a generic "FAILED AT" line to stdout and jumps to `error`,
+ *     similar to `TEST_ERROR` in h5test.h
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-23
+ *
+ *----------------------------------------------------------------------------
+ */
+#define FAIL_IF(condition) \
+if (condition) {           \
+    JSFAILED_AT()          \
+    goto error;           \
+}
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: FAIL_UNLESS()
+ *
+ * Purpose:
+ *
+ *     TEST_ERROR wrapper to reduce cognitive overhead from "negative tests",
+ *     e.g., "a != b".
+ *
+ *     Opposite of FAIL_IF; fails if the given condition is _not_ true.
+ *
+ *     `FAIL_IF( 5 != my_op() )`
+ *     is equivalent to
+ *     `FAIL_UNLESS( 5 == my_op() )`
+ *     However, `JSVERIFY(5, my_op(), "bad return")` may be even clearer.
+ *         (see JSVERIFY)
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#if 0 /* UNUSED */
+#define FAIL_UNLESS(condition) \
+if (!(condition)) {            \
+    JSFAILED_AT()              \
+    goto error;                \
+}
+#endif
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSERR_LONG()
+ *
+ * Purpose:
+ *
+ *     Print an failure message for long-int arguments.
+ *     ERROR-AT printed first.
+ *     If `reason` is given, it is printed on own line and newlined after
+ *     else, prints "expected/actual" aligned on own lines.
+ *
+ *     *FAILED* at myfile.c:488 in somefunc()...
+ *     forest must be made of trees.
+ *
+ *     or
+ *
+ *     *FAILED* at myfile.c:488 in somefunc()...
+ *       ! Expected 425
+ *       ! Actual   3
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSERR_LONG(expected, actual, reason) {           \
+    JSFAILED_AT()                                        \
+    if (reason!= NULL) {                                 \
+        HDprintf("%s\n", (reason));                      \
+    } else {                                             \
+        HDprintf("  ! Expected %ld\n  ! Actual   %ld\n", \
+                  (long)(expected), (long)(actual));     \
+    }                                                    \
+}
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSERR_STR()
+ *
+ * Purpose:
+ *
+ *     Print an failure message for string arguments.
+ *     ERROR-AT printed first.
+ *     If `reason` is given, it is printed on own line and newlined after
+ *     else, prints "expected/actual" aligned on own lines.
+ *
+ *     *FAILED*  at myfile.c:421 in myfunc()...
+ *     Blue and Red strings don't match!
+ *
+ *     or
+ *
+ *     *FAILED*  at myfile.c:421 in myfunc()...
+ *     !!! Expected:
+ *     this is my expected
+ *     string
+ *     !!! Actual:
+ *     not what I expected at all
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSERR_STR(expected, actual, reason) {           \
+    JSFAILED_AT()                                       \
+    if ((reason) != NULL) {                             \
+        HDprintf("%s\n", (reason));                     \
+    } else {                                            \
+        HDprintf("!!! Expected:\n%s\n!!!Actual:\n%s\n", \
+                 (expected), (actual));                 \
+    }                                                   \
+}
+
+
+
+#ifdef JSVERIFY_EXP_ACT
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSVERIFY()
+ *
+ * Purpose:
+ *
+ *     Verify that two long integers are equal.
+ *     If unequal, print failure message
+ *     (with `reason`, if not NULL; expected/actual if NULL)
+ *     and jump to `error` at end of function
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY(expected, actual, reason)     \
+if ((long)(actual) != (long)(expected)) {      \
+    JSERR_LONG((expected), (actual), (reason)) \
+    goto error;                                \
+} /* JSVERIFY */
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSVERIFY_NOT()
+ *
+ * Purpose:
+ *
+ *     Verify that two long integers are _not_ equal.
+ *     If equal, print failure message
+ *     (with `reason`, if not NULL; expected/actual if NULL)
+ *     and jump to `error` at end of function
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY_NOT(expected, actual, reason) \
+if ((long)(actual) == (long)(expected)) {      \
+    JSERR_LONG((expected), (actual), (reason)) \
+    goto error;                                \
+} /* JSVERIFY_NOT */
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSVERIFY_STR()
+ *
+ * Purpose:
+ *
+ *     Verify that two strings are equal.
+ *     If unequal, print failure message
+ *     (with `reason`, if not NULL; expected/actual if NULL)
+ *     and jump to `error` at end of function
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY_STR(expected, actual, reason) \
+if (strcmp((actual), (expected)) != 0) {       \
+    JSERR_STR((expected), (actual), (reason)); \
+    goto error;                                \
+} /* JSVERIFY_STR */
+
+
+#else
+/* JSVERIFY_EXP_ACT not defined
+ *
+ * Repeats macros above, but with actual/expected parameters reversed.
+ */
+
+
+/*----------------------------------------------------------------------------
+ * Macro: JSVERIFY()
+ * See: JSVERIFY documentation above.
+ * Programmer: Jacob Smith
+ *             2017-10-14
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY(actual, expected, reason)      \
+if ((long)(actual) != (long)(expected)) {       \
+    JSERR_LONG((expected), (actual), (reason)); \
+    goto error;                                 \
+} /* JSVERIFY */
+
+
+/*----------------------------------------------------------------------------
+ * Macro: JSVERIFY_NOT()
+ * See: JSVERIFY_NOT documentation above.
+ * Programmer: Jacob Smith
+ *             2017-10-14
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY_NOT(actual, expected, reason) \
+if ((long)(actual) == (long)(expected)) {      \
+    JSERR_LONG((expected), (actual), (reason)) \
+    goto error;                                \
+} /* JSVERIFY_NOT */
+
+
+/*----------------------------------------------------------------------------
+ * Macro: JSVERIFY_STR()
+ * See: JSVERIFY_STR documentation above.
+ * Programmer: Jacob Smith
+ *             2017-10-14
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY_STR(actual, expected, reason) \
+if (strcmp((actual), (expected)) != 0) {       \
+    JSERR_STR((expected), (actual), (reason)); \
+    goto error;                                \
+} /* JSVERIFY_STR */
+
+#endif /* ifdef/else JSVERIFY_EXP_ACT */
+
+/********************************
+ * OTHER MACROS AND DEFINITIONS *
+ ********************************/
+
+#define MAXADDR (((haddr_t)1<<(8*sizeof(HDoff_t)-1))-1)
+
+#define S3_TEST_PROFILE_NAME "ros3_vfd_test"
+
+#define S3_TEST_MAX_URL_SIZE 256
+
+#define S3_TEST_RESOURCE_TEXT_RESTRICTED "t8.shakespeare.txt"
+#define S3_TEST_RESOURCE_TEXT_PUBLIC "Poe_Raven.txt"
+#define S3_TEST_RESOURCE_H5_PUBLIC "GMODO-SVM01.h5"
+#define S3_TEST_RESOURCE_MISSING "missing.csv"
+
+static char    url_text_restricted[S3_TEST_MAX_URL_SIZE] = "";
+static char    url_text_public[S3_TEST_MAX_URL_SIZE]     = "";
+static char    url_h5_public[S3_TEST_MAX_URL_SIZE]       = "";
+static char    url_missing[S3_TEST_MAX_URL_SIZE]         = "";
+static char    s3_test_bucket_url[S3_TEST_MAX_URL_SIZE]  = "";
+static hbool_t s3_test_bucket_defined                    = FALSE;
+
+/* Global variables for aws test profile.
+ * An attempt is made to read ~/.aws/credentials and ~/.aws/config upon test
+ * startup -- if unable to open either file or cannot load region, id, and key,
+ * tests connecting with S3 will not be run
+ */
+static int  s3_test_credentials_loaded = 0;
+static char s3_test_aws_region[16];
+static char s3_test_aws_access_key_id[64];
+static char s3_test_aws_secret_access_key[128];
+
+H5FD_ros3_fapl_t restricted_access_fa = {
+            H5FD_CURR_ROS3_FAPL_T_VERSION, /* fapl version      */
+            TRUE,                           /* authenticate      */
+            "",             /* aws region        */
+            "",      /* access key id     */
+            ""}; /* secret access key */
+
+H5FD_ros3_fapl_t anonymous_fa = {
+            H5FD_CURR_ROS3_FAPL_T_VERSION,
+            FALSE, "", "", "" };
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_fapl_config_validation()
+ *
+ * Purpose:
+ *
+ *     Test data consistency of fapl configuration.
+ *     Tests `H5FD_ros3_validate_config` indirectly through `H5Pset_fapl_ros3`.
+ *
+ * Return:
+ *
+ *     PASSED : 0
+ *     FAILED : 1
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-23
+ *
+ *---------------------------------------------------------------------------
+ */
+static int
+test_fapl_config_validation(void)
+{
+
+    /*********************
+     * test-local macros *
+     *********************/
+
+    /*************************
+     * test-local structures *
+     *************************/
+
+    struct testcase {
+        const char       *msg;
+        herr_t            expected;
+        H5FD_ros3_fapl_t  config;
+    };
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    hid_t            fapl_id     = -1;   /* file access property list ID */
+    H5FD_ros3_fapl_t config;
+    H5FD_ros3_fapl_t fa_fetch;
+    herr_t           success     = SUCCEED;
+    unsigned int     i           = 0;
+    unsigned int     ncases      = 8;    /* should equal number of cases */
+    struct testcase *case_ptr    = NULL; /* dumb work-around for possible     */
+                                         /* dynamic cases creation because    */
+                                         /* of compiler warnings Wlarger-than */
+    struct testcase  cases_arr[] = {
+        {   "non-authenticating config allows empties.\n",
+            SUCCEED,
+            {   H5FD_CURR_ROS3_FAPL_T_VERSION, /* version      */
+                FALSE,                          /* authenticate */
+                "",                             /* aws_region   */
+                "",                             /* secret_id    */
+                "",                             /* secret_key   */
+            },
+        },
+        {   "authenticating config asks for populated strings.\n",
+            FAIL,
+            {   H5FD_CURR_ROS3_FAPL_T_VERSION,
+                TRUE,
+                "",
+                "",
+                "",
+            },
+        },
+        {   "populated strings; key is the empty string?\n",
+            SUCCEED,
+            {   H5FD_CURR_ROS3_FAPL_T_VERSION,
+                TRUE,
+                "region",
+                "me",
+                "",
+            },
+        },
+        {   "id cannot be empty.\n",
+            FAIL,
+            {   H5FD_CURR_ROS3_FAPL_T_VERSION,
+                TRUE,
+                "",
+                "me",
+                "",
+            },
+        },
+        {   "region cannot be empty.\n",
+            FAIL,
+            {   H5FD_CURR_ROS3_FAPL_T_VERSION,
+                TRUE,
+                "where",
+                "",
+                "",
+            },
+        },
+        {   "all strings populated.\n",
+            SUCCEED,
+            {   H5FD_CURR_ROS3_FAPL_T_VERSION,
+                TRUE,
+                "where",
+                "who",
+                "thisIsA GREAT seeeecrit",
+            },
+        },
+        {   "incorrect version should fail\n",
+            FAIL,
+            {   12345,
+                FALSE,
+                "",
+                "",
+                "",
+            },
+        },
+        {   "non-authenticating config cares not for (de)population"
+            "of strings.\n",
+            SUCCEED,
+            {   H5FD_CURR_ROS3_FAPL_T_VERSION,
+                FALSE,
+                "someregion",
+                "someid",
+                "somekey",
+            },
+        },
+    };
+
+    TESTING("ROS3 fapl configuration validation");
+
+    /*********
+     * TESTS *
+     *********/
+
+    if (FALSE == s3_test_bucket_defined) {
+        SKIPPED();
+        puts("    environment variable HDF5_ROS3_TEST_BUCKET_URL not defined");
+        fflush(stdout);
+        return 0;
+    }
+
+    for (i = 0; i < ncases; i++) {
+
+        /*---------------
+         * per-test setup
+         *---------------
+         */
+        case_ptr = &cases_arr[i];
+        fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+        FAIL_IF( fapl_id < 0 ) /* sanity-check */
+
+        /*-----------------------------------
+         * Actually test.
+         * Mute stack trace in failure cases.
+         *-----------------------------------
+         */
+        H5E_BEGIN_TRY {
+            /* `H5FD_ros3_validate_config(...)` is static/private
+             * to src/ros3.c and cannot (and should not?) be tested directly?
+             * Instead, validate config through public api.
+             */
+            success = H5Pset_fapl_ros3(fapl_id, &case_ptr->config);
+        } H5E_END_TRY;
+
+        JSVERIFY( case_ptr->expected, success, case_ptr->msg )
+
+        /* Make sure we can get back what we put in.
+         * Only valid if the fapl configuration does not result in error.
+         */
+        if (success == SUCCEED) {
+            config = case_ptr->config;
+            JSVERIFY( SUCCEED,
+                      H5Pget_fapl_ros3(fapl_id, &fa_fetch),
+                      "unable to get fapl" )
+
+            JSVERIFY( H5FD_CURR_ROS3_FAPL_T_VERSION,
+                      fa_fetch.version,
+                      "invalid version number" )
+            JSVERIFY( config.version,
+                      fa_fetch.version,
+                      "version number mismatch" )
+            JSVERIFY( config.authenticate,
+                      fa_fetch.authenticate,
+                      "authentication flag mismatch" )
+            JSVERIFY_STR( config.aws_region,
+                          fa_fetch.aws_region,
+                          NULL )
+            JSVERIFY_STR( config.secret_id,
+                          fa_fetch.secret_id,
+                          NULL )
+            JSVERIFY_STR( config.secret_key,
+                          fa_fetch.secret_key,
+                          NULL )
+        }
+
+        /*-----------------------------
+         * per-test sanitation/teardown
+         *-----------------------------
+         */
+        FAIL_IF( FAIL == H5Pclose(fapl_id) )
+        fapl_id = -1;
+
+    } /* for each test case */
+
+    PASSED();
+    return 0;
+
+error:
+    /***********
+     * CLEANUP *
+     ***********/
+
+    if (fapl_id < 0) {
+        H5E_BEGIN_TRY {
+            (void)H5Pclose(fapl_id);
+        } H5E_END_TRY;
+    }
+    return 1;
+} /* test_fapl_config_validation */
+
+
+/*-------------------------------------------------------------------------
+ *
+ * Function:    test_ros3_fapl()
+ *
+ * Purpose:     Tests the file handle interface for the ROS3 driver
+ *
+ *              As the ROS3 driver is 1) read only, 2) requires access
+ *              to an S3 server, this test is quite
+ *              different from the other tests.
+ *
+ *              For now, test only fapl & flags.  Extend as the
+ *              work on the VFD continues.
+ *
+ * Return:      Success:        0
+ *              Failure:        1
+ *
+ * Programmer:  John Mainzer
+ *              7/12/17
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+test_ros3_fapl(void)
+{
+    /************************
+     * test-local variables *
+     ************************/
+
+    hid_t             fapl_id        = -1;  /* file access property list ID */
+    hid_t             driver_id      = -1;  /* ID for this VFD              */
+    unsigned long     driver_flags   =  0;  /* VFD feature flags            */
+    H5FD_ros3_fapl_t  ros3_fa_0      = {
+        H5FD_CURR_ROS3_FAPL_T_VERSION, /* version       */
+        FALSE,                          /* authenticate  */
+        "",                             /* aws_region    */
+        "",                             /* secret_id     */
+        "plugh",                        /* secret_key    */
+    };
+
+    TESTING("ROS3 fapl ");
+
+    /* Set property list and file name for ROS3 driver.
+     */
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( fapl_id < 0 )
+
+    FAIL_IF( FAIL == H5Pset_fapl_ros3(fapl_id, &ros3_fa_0) )
+
+    driver_id = H5Pget_driver(fapl_id);
+    FAIL_IF( driver_id < 0 )
+
+    /****************
+     * Check that the VFD feature flags are correct
+     * SPEC MAY CHANGE
+     ******************/
+
+    FAIL_IF( H5FDdriver_query(driver_id, &driver_flags) < 0 )
+
+    JSVERIFY_NOT( 0, (driver_flags & H5FD_FEAT_DATA_SIEVE),
+                  "bit(s) in `driver_flags` must align with "
+                  "H5FD_FEAT_DATA_SIEVE" )
+
+    JSVERIFY( H5FD_FEAT_DATA_SIEVE, driver_flags,
+              "H5FD_FEAT_DATA_SIEVE should be the only supported flag")
+
+    PASSED();
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        (void)H5Pclose(fapl_id);
+    } H5E_END_TRY;
+
+    return 1;
+
+} /* test_ros3_fapl() */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_vfd_open()
+ *
+ * Purpose:
+ *
+ *     Demonstrate/specify VFD-level "Open" failure cases
+ *
+ * Return:
+ *
+ *     PASSED : 0
+ *     FAILED : 1
+ *
+ * Programmer: Jacob Smith
+ *             1027-11-03
+ *
+ *---------------------------------------------------------------------------
+ */
+static int
+test_vfd_open(void)
+{
+
+    /*********************
+     * test-local macros *
+     *********************/
+
+
+#define FAPL_H5P_DEFAULT -2
+#define FAPL_FILE_ACCESS -3
+#define FAPL_ROS3_ANON   -4
+
+    /*************************
+     * test-local structures *
+     *************************/
+
+    struct test_condition {
+        const char *message;
+        const char *url;
+        unsigned    flags;
+        int         which_fapl;
+        haddr_t     maxaddr;
+    };
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    struct test_condition tests[] = {
+        {   "default property list (H5P_DEFAULT) is invalid",
+            url_text_public,
+            H5F_ACC_RDONLY,
+            FAPL_H5P_DEFAULT,
+            MAXADDR,
+        },
+        {   "generic file access property list is invalid",
+            url_text_public,
+            H5F_ACC_RDONLY,
+            FAPL_FILE_ACCESS,
+            MAXADDR,
+        },
+        {   "filename cannot be null",
+            NULL,
+            H5F_ACC_RDONLY,
+            FAPL_ROS3_ANON,
+            MAXADDR,
+        },
+        {   "filename cannot be empty",
+            "",
+            H5F_ACC_RDONLY,
+            FAPL_ROS3_ANON,
+            MAXADDR,
+        },
+        {   "filename must exist",
+            url_missing,
+            H5F_ACC_RDONLY,
+            FAPL_ROS3_ANON,
+            MAXADDR,
+        },
+        {   "read-write flag not supported",
+            url_text_public,
+            H5F_ACC_RDWR,
+            FAPL_ROS3_ANON,
+            MAXADDR,
+        },
+        {   "truncate flag not supported",
+            url_text_public,
+            H5F_ACC_TRUNC,
+            FAPL_ROS3_ANON,
+            MAXADDR,
+        },
+        {   "create flag not supported",
+            url_text_public,
+            H5F_ACC_CREAT,
+            FAPL_ROS3_ANON,
+            MAXADDR,
+        },
+        {   "EXCL flag not supported",
+            url_text_public,
+            H5F_ACC_EXCL,
+            FAPL_ROS3_ANON,
+            MAXADDR,
+        },
+        {   "maxaddr cannot be 0 (caught in `H5FD_open()`)",
+            url_text_public,
+            H5F_ACC_RDONLY,
+            FAPL_ROS3_ANON,
+            0,
+        },
+    };
+    H5FD_t   *fd         = NULL;
+    hbool_t   curl_ready = FALSE;
+    hid_t     fapl_id    = -1;
+    hid_t     fapl_file_access = -1;
+    unsigned  i                = 0;
+    unsigned  tests_count      = 10;
+
+    TESTING("ROS3 VFD-level open");
+
+    if (FALSE == s3_test_bucket_defined) {
+        SKIPPED();
+        puts("    environment variable HDF5_ROS3_TEST_BUCKET_URL not defined");
+        fflush(stdout);
+        return 0;
+    }
+
+    FAIL_IF( CURLE_OK != curl_global_init(CURL_GLOBAL_DEFAULT) )
+    curl_ready = TRUE;
+
+    fapl_file_access = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( fapl_file_access < 0 )
+
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( fapl_id < 0 )
+    FAIL_IF( FAIL == H5Pset_fapl_ros3(fapl_id, &anonymous_fa) )
+
+    /*********
+     * TESTS *
+     *********/
+
+    /* all the test cases that will _not_ open
+     */
+    for (i = 0; i < tests_count; i++) {
+        struct test_condition T = tests[i];
+        hid_t _fapl_id = H5P_DEFAULT;
+
+        fd = NULL;
+
+        if (T.which_fapl == FAPL_FILE_ACCESS)
+            _fapl_id = fapl_file_access;
+        else if (T.which_fapl == FAPL_ROS3_ANON)
+            _fapl_id = fapl_id;
+
+        H5E_BEGIN_TRY {
+            fd = H5FDopen(T.url, T.flags, _fapl_id, T.maxaddr);
+        } H5E_END_TRY;
+        if (NULL != fd)
+            JSVERIFY(1, 0, T.message); /* wrapper to print message and fail */
+    }
+
+    FAIL_IF( NULL != fd )
+
+    /* finally, show that a file can be opened
+     */
+    fd = H5FDopen(
+            url_text_public,
+            H5F_ACC_RDONLY,
+            fapl_id,
+            MAXADDR);
+    FAIL_IF( NULL == fd )
+
+    /************
+     * TEARDOWN *
+     ************/
+
+    FAIL_IF( FAIL == H5FDclose(fd) )
+    fd = NULL;
+
+    FAIL_IF( FAIL == H5Pclose(fapl_id) )
+    fapl_id = -1;
+
+    FAIL_IF( FAIL == H5Pclose(fapl_file_access) )
+    fapl_file_access = -1;
+
+    curl_global_cleanup();
+    curl_ready = FALSE;
+
+    PASSED();
+    return 0;
+
+error:
+    /***********
+     * CLEANUP *
+     ***********/
+
+    if (fd) {
+        (void)H5FDclose(fd);
+    }
+    if (fapl_id >= 0) {
+        H5E_BEGIN_TRY {
+            (void)H5Pclose(fapl_id);
+        } H5E_END_TRY;
+    }
+    if (fapl_file_access >= 0) {
+        H5E_BEGIN_TRY {
+            (void)H5Pclose(fapl_file_access);
+        } H5E_END_TRY;
+    }
+    if (curl_ready == TRUE) {
+        curl_global_cleanup();
+    }
+
+    return 1;
+
+#undef FAPL_FILE_ACCESS
+#undef FAPL_H5P_DEFAULT
+#undef FAPL_ROS3_ANON
+
+} /* test_vfd_open */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_eof_eoa()
+ *
+ * Purpose:
+ *
+ *     Demonstrate behavior of get_eof, get_eoa, and set_eoa.
+ *
+ * Return:
+ *
+ *     PASSED : 0
+ *     FAILED : 1
+ *
+ * Programmer: Jacob Smith
+ *             2017-11-08
+ *
+ *---------------------------------------------------------------------------
+ */
+static int
+test_eof_eoa(void)
+{
+
+    /*********************
+     * test-local macros *
+     *********************/
+
+    /*************************
+     * test-local structures *
+     *************************/
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    H5FD_t  *fd_shakespeare  = NULL;
+    hbool_t  curl_ready      = FALSE;
+    hid_t    fapl_id         = -1;
+
+    TESTING("ROS3 eof/eoa gets and sets");
+
+    if (s3_test_credentials_loaded == 0) {
+        SKIPPED();
+        puts("    s3 credentials are not loaded");
+        fflush(stdout);
+        return 0;
+    }
+
+    if (FALSE == s3_test_bucket_defined) {
+        SKIPPED();
+        puts("    environment variable HDF5_ROS3_TEST_BUCKET_URL not defined");
+        fflush(stdout);
+        return 0;
+    }
+
+    /*********
+     * SETUP *
+     *********/
+
+    FAIL_IF( CURLE_OK != curl_global_init(CURL_GLOBAL_DEFAULT) )
+    curl_ready = TRUE;
+
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( 0 > fapl_id )
+    FAIL_IF( FAIL == H5Pset_fapl_ros3(fapl_id, &restricted_access_fa) )
+
+    fd_shakespeare = H5FDopen(
+             url_text_restricted,
+             H5F_ACC_RDONLY,
+             fapl_id,
+             HADDR_UNDEF);
+    FAIL_IF( NULL == fd_shakespeare )
+
+    /*********
+     * TESTS *
+     *********/
+
+    /* verify as found
+     */
+    JSVERIFY( 5458199, H5FDget_eof(fd_shakespeare, H5FD_MEM_DEFAULT), NULL )
+    JSVERIFY( H5FDget_eof(fd_shakespeare, H5FD_MEM_DEFAULT),
+              H5FDget_eof(fd_shakespeare, H5FD_MEM_DRAW),
+              "mismatch between DEFAULT and RAW memory types" )
+    JSVERIFY( 0,
+              H5FDget_eoa(fd_shakespeare, H5FD_MEM_DEFAULT),
+              "EoA should be unset by H5FDopen" )
+
+    /* set EoA below EoF
+     */
+    JSVERIFY( SUCCEED,
+              H5FDset_eoa(fd_shakespeare, H5FD_MEM_DEFAULT, 44442202),
+              "unable to set EoA (lower)" )
+    JSVERIFY( 5458199,
+              H5FDget_eof(fd_shakespeare, H5FD_MEM_DEFAULT),
+              "EoF changed" )
+    JSVERIFY( 44442202,
+              H5FDget_eoa(fd_shakespeare, H5FD_MEM_DEFAULT),
+              "EoA unchanged" )
+
+    /* set EoA above EoF
+     */
+    JSVERIFY( SUCCEED,
+              H5FDset_eoa(fd_shakespeare, H5FD_MEM_DEFAULT, 6789012),
+              "unable to set EoA (higher)" )
+    JSVERIFY( 5458199,
+              H5FDget_eof(fd_shakespeare, H5FD_MEM_DEFAULT),
+              "EoF changed" )
+    JSVERIFY( 6789012,
+              H5FDget_eoa(fd_shakespeare, H5FD_MEM_DEFAULT),
+              "EoA unchanged" )
+
+    /************
+     * TEARDOWN *
+     ************/
+
+    FAIL_IF( FAIL == H5FDclose(fd_shakespeare) )
+
+    FAIL_IF( FAIL == H5Pclose(fapl_id) )
+    fapl_id = -1;
+
+    curl_global_cleanup();
+    curl_ready = FALSE;
+
+    PASSED();
+    return 0;
+
+error:
+    /***********
+     * CLEANUP *
+     ***********/
+
+    if (fd_shakespeare)     (void)H5FDclose(fd_shakespeare);
+    if (TRUE == curl_ready) curl_global_cleanup();
+    if (fapl_id >= 0) {
+        H5E_BEGIN_TRY {
+            (void)H5Pclose(fapl_id);
+        } H5E_END_TRY;
+    }
+
+    return 1;
+
+} /* test_eof_eoa */
+
+
+/*-----------------------------------------------------------------------------
+ *
+ * Function: test_H5FDread_without_eoa_set_fails()
+ *
+ * Purpose:
+ *
+ *     Demonstrate a not-obvious constraint by the library, preventing
+ *     file read before EoA is set
+ *
+ * Programmer: Jacob Smith
+ *             2018-01-26
+ *
+ *-----------------------------------------------------------------------------
+ */
+static int
+test_H5FDread_without_eoa_set_fails(void)
+{
+    char              buffer[256];
+    unsigned int      i                = 0;
+    H5FD_t           *file_shakespeare = NULL;
+    hid_t             fapl_id          = -1;
+
+    TESTING("ROS3 VFD read-eoa temporal coupling library limitation ");
+
+    if (s3_test_credentials_loaded == 0) {
+        SKIPPED();
+        puts("    s3 credentials are not loaded");
+        fflush(stdout);
+        return 0;
+    }
+
+    if (FALSE == s3_test_bucket_defined) {
+        SKIPPED();
+        puts("    environment variable HDF5_ROS3_TEST_BUCKET_URL not defined");
+        fflush(stdout);
+        return 0;
+    }
+
+    /*********
+     * SETUP *
+     *********/
+
+    /* create ROS3 fapl
+     */
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( fapl_id < 0 )
+    FAIL_IF( FAIL == H5Pset_fapl_ros3(fapl_id, &restricted_access_fa) )
+
+    file_shakespeare = H5FDopen(
+            url_text_restricted,
+            H5F_ACC_RDONLY,
+            fapl_id,
+            MAXADDR);
+    FAIL_IF( NULL == file_shakespeare )
+
+    JSVERIFY( 0, H5FDget_eoa(file_shakespeare, H5FD_MEM_DEFAULT),
+              "EoA should remain unset by H5FDopen" )
+
+    for (i = 0; i < 256; i++)
+        buffer[i] = 0; /* zero buffer contents */
+
+    /********
+     * TEST *
+     ********/
+
+    H5E_BEGIN_TRY { /* mute stack trace on expected failure */
+        JSVERIFY( FAIL,
+                  H5FDread(file_shakespeare,
+                       H5FD_MEM_DRAW,
+                       H5P_DEFAULT,
+                       1200699,
+                       102,
+                       buffer),
+                  "cannot read before eoa is set" )
+    } H5E_END_TRY;
+    JSVERIFY_STR( "", buffer, "buffer should remain untouched" )
+
+    /************
+     * TEARDOWN *
+     ************/
+
+    FAIL_IF( FAIL == H5FDclose(file_shakespeare) )
+    file_shakespeare = NULL;
+
+    FAIL_IF( FAIL == H5Pclose(fapl_id) )
+    fapl_id = -1;
+
+    PASSED();
+    return 0;
+
+error:
+    /***********
+     * CLEANUP *
+     ***********/
+
+    if (file_shakespeare)   { (void)H5FDclose(file_shakespeare); }
+    if (fapl_id >= 0) {
+        H5E_BEGIN_TRY {
+           (void)H5Pclose(fapl_id);
+        } H5E_END_TRY;
+    }
+
+    return 1;
+
+} /* test_H5FDread_without_eoa_set_fails */
+
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_read()
+ *
+ * Purpose:
+ *
+ * Return:
+ *
+ *     PASSED : 0
+ *     FAILED : 1
+ *
+ * Programmer: Jacob Smith
+ *             2017-11-06
+ *
+ *---------------------------------------------------------------------------
+ */
+static int
+test_read(void)
+{
+
+    /*********************
+     * test-local macros *
+     *********************/
+
+    /*************************
+     * test-local structures *
+     *************************/
+    struct testcase {
+        const char *message;  /* purpose of test case */
+        haddr_t     eoa_set;  /* set file EOA to this prior to read */
+        size_t      addr;     /* offset of read in file */
+        size_t      len;      /* length of read in file */
+        herr_t      success;  /* expected return value of read function */
+        const char *expected; /* expected contents of buffer; failure ignores */
+    };
+
+    /************************
+     * test-local variables *
+     ************************/
+    struct testcase cases[] = {
+        {   "successful range-get",
+            6464,
+            5691,
+            32, /* fancy quotes are three bytes each(?) */
+            SUCCEED,
+            "Quoth the Raven “Nevermore.”",
+        },
+        {   "read past EOA fails (EOA < EOF < addr)",
+            3000,
+            4000,
+            100,
+            FAIL,
+            NULL,
+        },
+        {   "read overlapping EOA fails (EOA < addr < EOF < (addr+len))",
+            3000,
+            8000,
+            100,
+            FAIL,
+            NULL,
+        },
+        {   "read past EOA/EOF fails ((EOA==EOF) < addr)",
+            6464,
+            7000,
+            100,
+            FAIL,
+            NULL,
+        },
+        {   "read overlapping EOA/EOF fails (addr < (EOA==EOF) < (addr+len))",
+            6464,
+            6400,
+            100,
+            FAIL,
+            NULL,
+        },
+        {   "read between EOF and EOA fails (EOF < addr < (addr+len) < EOA)",
+            8000,
+            7000,
+            100,
+            FAIL,
+            NULL,
+        },
+    };
+    unsigned          testcase_count   = 6;
+    unsigned          test_i           = 0;
+    struct testcase   test;
+    herr_t            open_return      = FAIL;
+    char              buffer[S3_TEST_MAX_URL_SIZE];
+    unsigned int      i                = 0;
+    H5FD_t           *file_raven       = NULL;
+    hid_t             fapl_id          = -1;
+
+    TESTING("ROS3 VFD read/range-gets");
+
+    if (s3_test_credentials_loaded == 0) {
+        SKIPPED();
+        puts("    s3 credentials are not loaded");
+        fflush(stdout);
+        return 0;
+    }
+
+    if (FALSE == s3_test_bucket_defined) {
+        SKIPPED();
+        puts("    environment variable HDF5_ROS3_TEST_BUCKET_URL not defined");
+        fflush(stdout);
+        return 0;
+    }
+
+    /*********
+     * SETUP *
+     *********/
+
+    /* create ROS3 fapl
+     */
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( fapl_id < 0 )
+    FAIL_IF( FAIL == H5Pset_fapl_ros3(fapl_id, &restricted_access_fa) )
+
+    /* open file
+     */
+    file_raven = H5FDopen( /* will open with "authenticating" fapl */
+            url_text_public, /* TODO: check return state: anon access of restricted says OK? (not NULL) */
+            H5F_ACC_RDONLY,
+            fapl_id,
+            HADDR_UNDEF); /* Demonstrate success with "automatic" value */
+    FAIL_IF( NULL == file_raven )
+
+    JSVERIFY( 6464, H5FDget_eof(file_raven, H5FD_MEM_DEFAULT), NULL )
+
+    /*********
+     * TESTS *
+     *********/
+
+    for (test_i = 0; test_i < testcase_count; test_i++) {
+
+        /* -------------- *
+         * per-test setup *
+         * -------------- */
+
+        test        = cases[test_i];
+        open_return = FAIL;
+
+        FAIL_IF( S3_TEST_MAX_URL_SIZE < test.len ) /* buffer too small! */
+
+        FAIL_IF( FAIL ==
+                 H5FD_set_eoa( file_raven, H5FD_MEM_DEFAULT, test.eoa_set) )
+
+        for (i = 0; i < S3_TEST_MAX_URL_SIZE; i++) /* zero buffer contents */
+            buffer[i] = 0;
+
+        /* ------------ *
+         * conduct test *
+         * ------------ */
+
+        H5E_BEGIN_TRY {
+            open_return = H5FDread(
+                    file_raven,
+                    H5FD_MEM_DRAW,
+                    H5P_DEFAULT,
+                    test.addr,
+                    test.len,
+                    buffer);
+        } H5E_END_TRY;
+
+        JSVERIFY( test.success,
+                  open_return,
+                  test.message )
+        if (open_return == SUCCEED)
+            JSVERIFY_STR( test.expected, buffer, NULL )
+
+    } /* for each testcase */
+
+    /************
+     * TEARDOWN *
+     ************/
+
+    FAIL_IF( FAIL == H5FDclose(file_raven) )
+    file_raven = NULL;
+
+    FAIL_IF( FAIL == H5Pclose(fapl_id) )
+    fapl_id = -1;
+
+    PASSED();
+    return 0;
+
+error:
+    /***********
+     * CLEANUP *
+     ***********/
+
+    if (file_raven)
+        (void)H5FDclose(file_raven);
+    if (fapl_id >= 0) {
+        H5E_BEGIN_TRY {
+           (void)H5Pclose(fapl_id);
+        } H5E_END_TRY;
+    }
+
+    return 1;
+
+} /* test_read */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_noops_and_autofails()
+ *
+ * Purpose:
+ *
+ *     Demonstrate the unavailable and do-nothing routines unique to
+ *     Read-Only VFD.
+ *
+ * Return:
+ *
+ *     PASSED : 0
+ *     FAILED : 1
+ *
+ * Programmer: Jacob Smith
+ *             2017-11-06
+ *
+ *---------------------------------------------------------------------------
+ */
+static int
+test_noops_and_autofails(void)
+{
+    /*********************
+     * test-local macros *
+     *********************/
+
+    /*************************
+     * test-local structures *
+     *************************/
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    hbool_t           curl_ready = FALSE;
+    hid_t             fapl_id    = -1;
+    H5FD_t           *file       = NULL;
+    const char        data[36]   = "The Force shall be with you, always";
+
+    TESTING("ROS3 VFD always-fail and no-op routines");
+
+
+    if (FALSE == s3_test_bucket_defined) {
+        SKIPPED();
+        puts("    environment variable HDF5_ROS3_TEST_BUCKET_URL not defined");
+        fflush(stdout);
+        return 0;
+    }
+
+    /*********
+     * SETUP *
+     *********/
+
+    FAIL_IF( CURLE_OK != curl_global_init(CURL_GLOBAL_DEFAULT) )
+    curl_ready = TRUE;
+
+    /* create ROS3 fapl
+     */
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( fapl_id < 0 )
+    JSVERIFY( SUCCEED, H5Pset_fapl_ros3(fapl_id, &anonymous_fa), NULL )
+
+    /* open file
+     */
+    file = H5FDopen(
+            url_text_public,
+            H5F_ACC_RDONLY,
+            fapl_id,
+            HADDR_UNDEF);
+    FAIL_IF( NULL == file )
+
+    /*********
+     * TESTS *
+     *********/
+
+    /* auto-fail calls to write and truncate
+     */
+    H5E_BEGIN_TRY {
+        JSVERIFY( FAIL,
+                  H5FDwrite(file, H5FD_MEM_DRAW, H5P_DEFAULT, 1000, 35, data),
+                  "write must fail" )
+    } H5E_END_TRY;
+
+    H5E_BEGIN_TRY {
+        JSVERIFY( FAIL,
+                  H5FDtruncate(file, H5P_DEFAULT, FALSE),
+                  "truncate must fail" )
+    } H5E_END_TRY;
+
+    H5E_BEGIN_TRY {
+        JSVERIFY( FAIL,
+                  H5FDtruncate(file, H5P_DEFAULT, TRUE),
+                  "truncate must fail (closing)" )
+    } H5E_END_TRY;
+
+    /* no-op calls to `lock()` and `unlock()`
+     */
+    JSVERIFY( SUCCEED,
+              H5FDlock(file, TRUE),
+              "lock always succeeds; has no effect" )
+    JSVERIFY( SUCCEED,
+              H5FDlock(file, FALSE),
+              NULL )
+    JSVERIFY( SUCCEED,
+              H5FDunlock(file),
+              NULL )
+    /* Lock/unlock with null file or similar error crashes tests.
+     * HDassert in calling heirarchy, `H5FD[un]lock()` and `H5FD_[un]lock()`
+     */
+
+    /************
+     * TEARDOWN *
+     ************/
+
+    FAIL_IF( FAIL == H5FDclose(file) )
+    file = NULL;
+
+    FAIL_IF( FAIL == H5Pclose(fapl_id) )
+    fapl_id = -1;
+
+    curl_global_cleanup();
+    curl_ready = FALSE;
+
+    PASSED();
+    return 0;
+
+error:
+    /***********
+     * CLEANUP *
+     ***********/
+
+    if (fapl_id >= 0) {
+        H5E_BEGIN_TRY {
+           (void)H5Pclose(fapl_id);
+        } H5E_END_TRY;
+    }
+    if (file)               { (void)H5FDclose(file); }
+    if (curl_ready == TRUE) { curl_global_cleanup(); }
+
+    return 1;
+
+} /* test_noops_and_autofails*/
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_cmp()
+ *
+ * Purpose:
+ *
+ *     Verify "file comparison" behavior.
+ *
+ * Return:
+ *
+ *     PASSED : 0
+ *     FAILED : 1
+ *
+ * Programmer: Jacob Smith
+ *             2017-11-06
+ *
+ *---------------------------------------------------------------------------
+ */
+static int
+test_cmp(void)
+{
+
+    /*********************
+     * test-local macros *
+     *********************/
+
+    /*************************
+     * test-local structures *
+     *************************/
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    H5FD_t           *fd_raven   = NULL;
+    H5FD_t           *fd_shakes  = NULL;
+    H5FD_t           *fd_raven_2 = NULL;
+    hbool_t           curl_ready = FALSE;
+    hid_t             fapl_id    = -1;
+
+    TESTING("ROS3 cmp (comparison)");
+
+    if (s3_test_credentials_loaded == 0) {
+        SKIPPED();
+        puts("    s3 credentials are not loaded");
+        fflush(stdout);
+        return 0;
+    }
+
+    if (FALSE == s3_test_bucket_defined) {
+        SKIPPED();
+        puts("    environment variable HDF5_ROS3_TEST_BUCKET_URL not defined");
+        fflush(stdout);
+        return 0;
+    }
+
+    /*********
+     * SETUP *
+     *********/
+
+    FAIL_IF( CURLE_OK != curl_global_init(CURL_GLOBAL_DEFAULT) )
+    curl_ready = TRUE;
+
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( 0 > fapl_id )
+    JSVERIFY( SUCCEED, H5Pset_fapl_ros3(fapl_id, &restricted_access_fa), NULL )
+
+    fd_raven = H5FDopen(
+            url_text_public,
+            H5F_ACC_RDONLY,
+            fapl_id,
+            HADDR_UNDEF);
+    FAIL_IF( NULL == fd_raven )
+
+    fd_shakes = H5FDopen(
+            url_text_restricted,
+            H5F_ACC_RDONLY,
+            fapl_id,
+            HADDR_UNDEF);
+    FAIL_IF( NULL == fd_shakes )
+
+    fd_raven_2 = H5FDopen(
+            url_text_public,
+            H5F_ACC_RDONLY,
+            fapl_id,
+            HADDR_UNDEF);
+    FAIL_IF( NULL == fd_raven_2 )
+
+    /*********
+     * TESTS *
+     *********/
+
+    JSVERIFY(  0, H5FDcmp(fd_raven,  fd_raven_2), NULL )
+    JSVERIFY( -1, H5FDcmp(fd_raven,  fd_shakes),  NULL )
+    JSVERIFY( -1, H5FDcmp(fd_shakes, fd_raven_2), NULL )
+
+    /************
+     * TEARDOWN *
+     ************/
+
+    FAIL_IF( FAIL == H5FDclose(fd_raven) )
+    fd_raven = NULL;
+    FAIL_IF( FAIL == H5FDclose(fd_shakes) )
+    fd_shakes = NULL;
+    FAIL_IF( FAIL == H5FDclose(fd_raven_2) )
+    fd_raven_2 = NULL;
+    FAIL_IF( FAIL == H5Pclose(fapl_id) )
+    fapl_id = -1;
+
+    curl_global_cleanup();
+    curl_ready = FALSE;
+
+    PASSED();
+    return 0;
+
+error:
+    /***********
+     * CLEANUP *
+     ***********/
+
+    if (fd_raven   != NULL)  (void)H5FDclose(fd_raven);
+    if (fd_raven_2 != NULL)  (void)H5FDclose(fd_raven_2);
+    if (fd_shakes  != NULL)  (void)H5FDclose(fd_shakes);
+    if (TRUE == curl_ready)  curl_global_cleanup();
+    if (fapl_id >= 0) {
+        H5E_BEGIN_TRY {
+            (void)H5Pclose(fapl_id);
+        } H5E_END_TRY;
+    }
+
+    return 1;
+
+} /* test_cmp */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_H5F_integration()
+ *
+ * Purpose:
+ *
+ *     Demonstrate S3 file-open through H5F API.
+ *
+ * Return:
+ *
+ *     PASSED : 0
+ *     FAILED : 1
+ *
+ * Programmer: Jacob Smith
+ *             2017-11-07
+ *
+ *---------------------------------------------------------------------------
+ */
+static int
+test_H5F_integration(void)
+{
+    /*********************
+     * test-local macros *
+     *********************/
+
+    /*************************
+     * test-local structures *
+     *************************/
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    hid_t file    = -1;
+    hid_t fapl_id = -1;
+
+    TESTING("S3 file access through HD5F library (H5F API)");
+
+    if (s3_test_credentials_loaded == 0) {
+        SKIPPED();
+        puts("    s3 credentials are not loaded");
+        fflush(stdout);
+        return 0;
+    }
+
+    if (FALSE == s3_test_bucket_defined) {
+        SKIPPED();
+        puts("    environment variable HDF5_ROS3_TEST_BUCKET_URL not defined");
+        fflush(stdout);
+        return 0;
+    }
+
+    /*********
+     * SETUP *
+     *********/
+
+    fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+    FAIL_IF( 0 > fapl_id )
+    FAIL_IF( FAIL == H5Pset_fapl_ros3(fapl_id, &restricted_access_fa) )
+
+    /*********
+     * TESTS *
+     *********/
+
+    /* Read-Write Open access is not allowed with this file driver.
+     */
+    H5E_BEGIN_TRY {
+        FAIL_IF( 0 <= H5Fopen(
+                      url_h5_public,
+                      H5F_ACC_RDWR,
+                      fapl_id) )
+    } H5E_END_TRY;
+
+    /* H5Fcreate() is not allowed with this file driver.
+     */
+    H5E_BEGIN_TRY {
+        FAIL_IF( 0 <= H5Fcreate(
+                      url_missing,
+                      H5F_ACC_RDONLY,
+                      H5P_DEFAULT,
+                      fapl_id) )
+    } H5E_END_TRY;
+
+    /* Successful open.
+     */
+    file = H5Fopen(
+            url_h5_public,
+            H5F_ACC_RDONLY,
+            fapl_id);
+    FAIL_IF( file < 0 )
+
+    /************
+     * TEARDOWN *
+     ************/
+
+    FAIL_IF( FAIL == H5Fclose(file) )
+    file = -1;
+
+    FAIL_IF( FAIL == H5Pclose(fapl_id) )
+    fapl_id = -1;
+
+    PASSED();
+    return 0;
+
+error:
+    /***********
+     * CLEANUP *
+     ***********/
+HDprintf("\nerror!"); fflush(stdout);
+
+    if (fapl_id >= 0) {
+        H5E_BEGIN_TRY {
+           (void)H5Pclose(fapl_id);
+        } H5E_END_TRY;
+    }
+    if (file > 0)
+        (void)H5Fclose(file);
+
+    return 1;
+
+} /* test_H5F_integration */
+
+#endif /* H5_HAVE_ROS3_VFD */
+
+
+/*-------------------------------------------------------------------------
+ *
+ * Function:    main
+ *
+ * Purpose:     Tests the basic features of Virtual File Drivers
+ *
+ * Return:      Success: 0
+ *              Failure: 1
+ *
+ * Programmer:  Jacob Smith
+ *              2017-10-23
+ *
+ *-------------------------------------------------------------------------
+ */
+int
+main(void)
+{
+#ifdef H5_HAVE_ROS3_VFD
+    int nerrors = 0;
+    const char *bucket_url_env = NULL;
+
+#endif /* H5_HAVE_ROS3_VFD */
+
+    HDprintf("Testing ros3 VFD functionality.\n");
+
+#ifdef H5_HAVE_ROS3_VFD
+
+    /************************
+     * initialize test urls *
+     ************************/
+
+    bucket_url_env = HDgetenv("HDF5_ROS3_TEST_BUCKET_URL");
+    if (bucket_url_env == NULL || bucket_url_env[0] == '\0') {
+        HDprintf("WARNING: S3 bucket url is not defined in enviornment " \
+                 "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n");
+    } else {
+        HDstrncpy(s3_test_bucket_url, bucket_url_env, S3_TEST_MAX_URL_SIZE);
+        s3_test_bucket_defined = TRUE;
+    }
+
+    if (S3_TEST_MAX_URL_SIZE < HDsnprintf(
+            url_text_restricted,
+            (size_t)S3_TEST_MAX_URL_SIZE,
+            "%s/%s",
+            (const char *)s3_test_bucket_url,
+            (const char *)S3_TEST_RESOURCE_TEXT_RESTRICTED))
+    {
+        HDprintf("* ros3 setup failed (text_restricted) ! *\n");
+        return 1;
+    }
+    if (S3_TEST_MAX_URL_SIZE < HDsnprintf(
+            url_text_public,
+            (size_t)S3_TEST_MAX_URL_SIZE,
+            "%s/%s",
+            (const char *)s3_test_bucket_url,
+            (const char *)S3_TEST_RESOURCE_TEXT_PUBLIC))
+    {
+        HDprintf("* ros3 setup failed (text_public) ! *\n");
+        return 1;
+    }
+    if (S3_TEST_MAX_URL_SIZE < HDsnprintf(
+            url_h5_public,
+            (size_t)S3_TEST_MAX_URL_SIZE,
+            "%s/%s",
+            (const char *)s3_test_bucket_url,
+            (const char *)S3_TEST_RESOURCE_H5_PUBLIC))
+    {
+        HDprintf("* ros3 setup failed (h5_public) ! *\n");
+        return 1;
+    }
+    if (S3_TEST_MAX_URL_SIZE < HDsnprintf(
+            url_missing,
+            S3_TEST_MAX_URL_SIZE,
+            "%s/%s",
+            (const char *)s3_test_bucket_url,
+            (const char *)S3_TEST_RESOURCE_MISSING))
+    {
+        HDprintf("* ros3 setup failed (missing) ! *\n");
+        return 1;
+    }
+
+    /**************************************
+     * load credentials and prepare fapls *
+     **************************************/
+
+    /* "clear" profile data strings */
+    s3_test_aws_access_key_id[0]     = '\0';
+    s3_test_aws_secret_access_key[0] = '\0';
+    s3_test_aws_region[0]            = '\0';
+
+    /* attempt to load test credentials
+     * if unable, certain tests will be skipped
+     */
+    if (SUCCEED == H5FD_s3comms_load_aws_profile(
+            S3_TEST_PROFILE_NAME,
+            s3_test_aws_access_key_id,
+            s3_test_aws_secret_access_key,
+            s3_test_aws_region))
+    {
+        s3_test_credentials_loaded = 1;
+        HDstrncpy(restricted_access_fa.aws_region,
+                (const char *)s3_test_aws_region,
+                H5FD_ROS3_MAX_REGION_LEN);
+        HDstrncpy(restricted_access_fa.secret_id,
+                (const char *)s3_test_aws_access_key_id,
+                H5FD_ROS3_MAX_SECRET_ID_LEN);
+        HDstrncpy(restricted_access_fa.secret_key,
+                (const char *)s3_test_aws_secret_access_key,
+                H5FD_ROS3_MAX_SECRET_KEY_LEN);
+    }
+
+    /******************
+     * commence tests *
+     ******************/
+
+    h5_reset();
+
+    nerrors += test_fapl_config_validation();
+    nerrors += test_ros3_fapl();
+    nerrors += test_vfd_open();
+    nerrors += test_eof_eoa();
+    nerrors += test_H5FDread_without_eoa_set_fails();
+    nerrors += test_read();
+    nerrors += test_noops_and_autofails();
+    nerrors += test_cmp();
+    nerrors += test_H5F_integration();
+
+    if (nerrors > 0) {
+        HDprintf("***** %d ros3 TEST%s FAILED! *****\n",
+                 nerrors,
+                 nerrors > 1 ? "S" : "");
+        nerrors = 1;
+    } else {
+        HDprintf("All ros3 tests passed.\n");
+    }
+    return nerrors; /* 0 if no errors, 1 if any errors */
+
+#else
+
+    HDprintf("SKIPPED - read-only S3 VFD not built\n");
+    return EXIT_SUCCESS;
+
+#endif /* H5_HAVE_ROS3_VFD */
+
+} /* main() */
+
diff --git a/test/s3comms.c b/test/s3comms.c
new file mode 100644
index 0000000..9453b75
--- /dev/null
+++ b/test/s3comms.c
@@ -0,0 +1,2730 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * Read-Only S3 Virtual File Driver (VFD)
+ *
+ * Purpose:    Unit tests for the S3 Communications (s3comms) module.
+ *
+ * Programmer: Jacob Smith <jake.smith@hdfgroup.org>
+ *             2017-10-11
+ */
+
+#include "h5test.h"
+#include "H5FDs3comms.h"
+#include "H5MMprivate.h" /* memory management */
+
+#ifdef H5_HAVE_ROS3_VFD
+
+/*****************************************************************************
+ *
+ * FILE-LOCAL TESTING MACROS
+ *
+ * Purpose:
+ *
+ *     1) Upon test failure, goto-jump to single-location teardown in test
+ *        function. E.g., `error:` (consistency with HDF corpus) or
+ *        `failed:` (reflects purpose).
+ *            >>> using "error", in part because `H5E_BEGIN_TRY` expects it.
+ *     2) Increase clarity and reduce overhead found with `TEST_ERROR`.
+ *        e.g., "if(somefunction(arg, arg2) < 0) TEST_ERROR:"
+ *        requires reading of entire line to know whether this if/call is
+ *        part of the test setup, test operation, or a test unto itself.
+ *     3) Provide testing macros with optional user-supplied failure message;
+ *        if not supplied (NULL), generate comparison output in the spirit of
+ *        test-driven development. E.g., "expected 5 but was -3"
+ *        User messages clarify test's purpose in code, encouraging description
+ *        without relying on comments.
+ *     4) Configurable expected-actual order in generated comparison strings.
+ *        Some prefer `VERIFY(expected, actual)`, others
+ *        `VERIFY(actual, expected)`. Provide preprocessor ifdef switch
+ *        to satifsy both parties, assuming one paradigm per test file.
+ *        (One could #undef and redefine the flag through the file as desired,
+ *         but _why_.)
+ *        Provided as courtesy, per consideration for inclusion in the library
+ *        proper.
+ *
+ *     Macros:
+ *
+ *         JSVERIFY_EXP_ACT - ifdef flag, configures comparison order
+ *         FAIL_IF()        - check condition
+ *         FAIL_UNLESS()    - check _not_ condition
+ *         JSVERIFY()       - long-int equality check; prints reason/comparison
+ *         JSVERIFY_NOT()   - long-int inequality check; prints
+ *         JSVERIFY_STR()   - string equality check; prints
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *****************************************************************************/
+
+
+/*----------------------------------------------------------------------------
+ *
+ * ifdef flag: JSVERIFY_EXP_ACT
+ *
+ * JSVERIFY macros accept arguments as (EXPECTED, ACTUAL[, reason])
+ *   default, if this is undefined, is (ACTUAL, EXPECTED[, reason])
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY_EXP_ACT 1L
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSFAILED_AT()
+ *
+ * Purpose:
+ *
+ *     Preface a test failure by printing "*FAILED*" and location to stdout
+ *     Similar to `H5_FAILED(); AT();` from h5test.h
+ *
+ *     *FAILED* at somefile.c:12 in function_name()...
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSFAILED_AT() {                                                   \
+    HDprintf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, FUNC); \
+}
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: FAIL_IF()
+ *
+ * Purpose:
+ *
+ *     Make tests more accessible and less cluttered than
+ *         `if (thing == otherthing()) TEST_ERROR`
+ *         paradigm.
+ *
+ *     The following lines are roughly equivalent:
+ *
+ *         `if (myfunc() < 0) TEST_ERROR;` (as seen elsewhere in HDF tests)
+ *         `FAIL_IF(myfunc() < 0)`
+ *
+ *     Prints a generic "FAILED AT" line to stdout and jumps to `error`,
+ *     similar to `TEST_ERROR` in h5test.h
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-23
+ *
+ *----------------------------------------------------------------------------
+ */
+#define FAIL_IF(condition) \
+if (condition) {           \
+    JSFAILED_AT()          \
+    goto error;            \
+}
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: FAIL_UNLESS()
+ *
+ * Purpose:
+ *
+ *     TEST_ERROR wrapper to reduce cognitive overhead from "negative tests",
+ *     e.g., "a != b".
+ *
+ *     Opposite of FAIL_IF; fails if the given condition is _not_ true.
+ *
+ *     `FAIL_IF( 5 != my_op() )`
+ *     is equivalent to
+ *     `FAIL_UNLESS( 5 == my_op() )`
+ *     However, `JSVERIFY(5, my_op(), "bad return")` may be even clearer.
+ *         (see JSVERIFY)
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define FAIL_UNLESS(condition) \
+if (!(condition)) {            \
+    JSFAILED_AT()              \
+    goto error;                \
+}
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSERR_LONG()
+ *
+ * Purpose:
+ *
+ *     Print an failure message for long-int arguments.
+ *     ERROR-AT printed first.
+ *     If `reason` is given, it is printed on own line and newlined after
+ *     else, prints "expected/actual" aligned on own lines.
+ *
+ *     *FAILED* at myfile.c:488 in somefunc()...
+ *     forest must be made of trees.
+ *
+ *     or
+ *
+ *     *FAILED* at myfile.c:488 in somefunc()...
+ *       ! Expected 425
+ *       ! Actual   3
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSERR_LONG(expected, actual, reason) {           \
+    JSFAILED_AT()                                        \
+    if (reason!= NULL) {                                 \
+        HDprintf("%s\n", (reason));                      \
+    } else {                                             \
+        HDprintf("  ! Expected %ld\n  ! Actual   %ld\n", \
+                  (long)(expected), (long)(actual));     \
+    }                                                    \
+}
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSERR_STR()
+ *
+ * Purpose:
+ *
+ *     Print an failure message for string arguments.
+ *     ERROR-AT printed first.
+ *     If `reason` is given, it is printed on own line and newlined after
+ *     else, prints "expected/actual" aligned on own lines.
+ *
+ *     *FAILED*  at myfile.c:421 in myfunc()...
+ *     Blue and Red strings don't match!
+ *
+ *     or
+ *
+ *     *FAILED*  at myfile.c:421 in myfunc()...
+ *     !!! Expected:
+ *     this is my expected
+ *     string
+ *     !!! Actual:
+ *     not what I expected at all
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSERR_STR(expected, actual, reason) {           \
+    JSFAILED_AT()                                       \
+    if ((reason) != NULL) {                             \
+        HDprintf("%s\n", (reason));                     \
+    } else {                                            \
+        HDprintf("!!! Expected:\n%s\n!!!Actual:\n%s\n", \
+                 (expected), (actual));                 \
+    }                                                   \
+}
+
+#ifdef JSVERIFY_EXP_ACT
+/* VERIFY rountines with paramter order (<expected>, <actual> [, <msg> ])
+ */
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSVERIFY()
+ *
+ * Purpose:
+ *
+ *     Verify that two long integers are equal.
+ *     If unequal, print failure message
+ *     (with `reason`, if not NULL; expected/actual if NULL)
+ *     and jump to `error` at end of function
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY(expected, actual, reason)     \
+if ((long)(actual) != (long)(expected)) {      \
+    JSERR_LONG((expected), (actual), (reason)) \
+    goto error;                                \
+} /* JSVERIFY */
+
+#if 0 /* UNUSED */
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSVERIFY_NOT()
+ *
+ * Purpose:
+ *
+ *     Verify that two long integers are _not_ equal.
+ *     If equal, print failure message
+ *     (with `reason`, if not NULL; expected/actual if NULL)
+ *     and jump to `error` at end of function
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY_NOT(expected, actual, reason) \
+if ((long)(actual) == (long)(expected)) {      \
+    JSERR_LONG((expected), (actual), (reason)) \
+    goto error;                                \
+} /* JSVERIFY_NOT */
+#endif /* JSVERIFY_NOT unused */
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Macro: JSVERIFY_STR()
+ *
+ * Purpose:
+ *
+ *     Verify that two strings are equal.
+ *     If unequal, print failure message
+ *     (with `reason`, if not NULL; expected/actual if NULL)
+ *     and jump to `error` at end of function
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-24
+ *
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY_STR(expected, actual, reason) \
+if (strcmp((actual), (expected)) != 0) {       \
+    JSERR_STR((expected), (actual), (reason)); \
+    goto error;                                \
+} /* JSVERIFY_STR */
+
+
+#else
+/* JSVERIFY_EXP_ACT not defined
+ *
+ * Repeats macros above, but with actual/expected parameters reversed.
+ */
+
+
+/*----------------------------------------------------------------------------
+ * Macro: JSVERIFY()
+ * See: JSVERIFY documentation above.
+ * Programmer: Jacob Smith
+ *             2017-10-14
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY(actual, expected, reason)      \
+if ((long)(actual) != (long)(expected)) {       \
+    JSERR_LONG((expected), (actual), (reason)); \
+    goto error;                                 \
+} /* JSVERIFY */
+
+#if 0 /* UNUSED */
+
+/*----------------------------------------------------------------------------
+ * Macro: JSVERIFY_NOT()
+ * See: JSVERIFY_NOT documentation above.
+ * Programmer: Jacob Smith
+ *             2017-10-14
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY_NOT(actual, expected, reason) \
+if ((long)(actual) == (long)(expected)) {      \
+    JSERR_LONG((expected), (actual), (reason)) \
+    goto error;                                \
+} /* JSVERIFY_NOT */
+#endif /* JSVERIFY_NOT unused */
+
+
+/*----------------------------------------------------------------------------
+ * Macro: JSVERIFY_STR()
+ * See: JSVERIFY_STR documentation above.
+ * Programmer: Jacob Smith
+ *             2017-10-14
+ *----------------------------------------------------------------------------
+ */
+#define JSVERIFY_STR(actual, expected, reason) \
+if (strcmp((actual), (expected)) != 0) {       \
+    JSERR_STR((expected), (actual), (reason)); \
+    goto error;                                \
+} /* JSVERIFY_STR */
+
+#endif /* ifdef/else JSVERIFY_EXP_ACT */
+
+
+#define S3_TEST_PROFILE_NAME "ros3_vfd_test"
+
+#define S3_TEST_RESOURCE_TEXT_RESTRICTED "t8.shakespeare.txt"
+#define S3_TEST_RESOURCE_TEXT_PUBLIC "Poe_Raven.txt"
+#define S3_TEST_RESOURCE_MISSING "missing.csv"
+
+#define S3_TEST_RUN_TIMEOUT 0 /* run tests that might hang */
+#define S3_TEST_MAX_URL_SIZE 256 /* char array size */
+
+/* Global variables for aws test profile.
+ * An attempt is made to read ~/.aws/credentials and ~/.aws/config upon test
+ * startup -- if unable to open either file or cannot load region, id, and key,
+ * tests connecting with S3 will not be run
+ */
+static int     s3_test_credentials_loaded               = 0;
+static char    s3_test_aws_region[16]                   = "";
+static char    s3_test_aws_access_key_id[64]            = "";
+static char    s3_test_aws_secret_access_key[128]       = "";
+static char    s3_test_bucket_url[S3_TEST_MAX_URL_SIZE] = "";
+static hbool_t s3_test_bucket_defined                   = FALSE;
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_macro_format_credential()
+ *
+ * Purpose:
+ *
+ *     Demonstrate that the macro `S3COMMS_FORMAT_CREDENTIAL`
+ *     performs as expected.
+ *
+ * Programmer: Jacob Smith
+ *             2017-09-19
+ *
+ *----------------------------------------------------------------------------
+ */
+static herr_t
+test_macro_format_credential(void)
+{
+    /************************
+     * test-local variables *
+     ************************/
+
+    char       dest[256];
+    const char access[]   = "AKIAIOSFODNN7EXAMPLE";
+    const char date[]     = "20130524";
+    const char region[]   = "us-east-1";
+    const char service[]  = "s3";
+    const char expected[] =
+            "AKIAIOSFODNN7EXAMPLE/20130524/us-east-1/s3/aws4_request";
+
+    TESTING("test_macro_format_credential");
+
+    FAIL_IF( S3COMMS_MAX_CREDENTIAL_SIZE <
+             S3COMMS_FORMAT_CREDENTIAL(dest, access, date, region, service) )
+
+    JSVERIFY_STR( expected, dest, NULL )
+
+    PASSED();
+    return 0;
+
+error:
+    return -1;
+
+} /* end test_macro_format_credential() */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_aws_canonical_request()
+ *
+ * Purpose:
+ *
+ *     Demonstrate the construction of a Canoncial Request (and Signed Headers)
+ *
+ *     Elided / not yet implemented:
+ *         Query strings
+ *         request "body"
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-04
+ *
+ *---------------------------------------------------------------------------
+ */
+static herr_t
+test_aws_canonical_request(void)
+{
+    /*************************
+     * test-local structures *
+     *************************/
+
+    struct header {
+        const char *name;
+        const char *value;
+    };
+
+    struct testcase {
+        const char    *exp_request;
+        const char    *exp_headers;
+        const char    *verb;
+        const char    *resource;
+        unsigned int   listsize;
+        struct header  list[5];
+    };
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    struct testcase  cases[]   = {
+        {   "GET\n/some/path.file\n\nhost:somebucket.someserver.somedomain\nrange:bytes=150-244\n\nhost;range\ne3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+            "host;range",
+            "GET",
+            "/some/path.file",
+            2,
+            {   {"Range", "bytes=150-244"},
+                {"Host", "somebucket.someserver.somedomain"},
+            },
+        },
+        {   "HEAD\n/bucketpath/myfile.dat\n\nhost:place.domain\nx-amz-content-sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\nx-amz-date:19411207T150803Z\n\nhost;x-amz-content-sha256;x-amz-date\ne3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+            "host;x-amz-content-sha256;x-amz-date",
+            "HEAD",
+            "/bucketpath/myfile.dat",
+            3,
+            {   {"x-amz-content-sha256", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"},
+                {"host", "place.domain"},
+                {"x-amz-date", "19411207T150803Z"},
+            }
+        },
+        {   "PUT\n/\n\n\n\ne3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+            "",
+            "PUT",
+            "/",
+            0,
+            {{"",""},}, /* unused; satisfies compiler */
+        },
+    }; /* struct testcase cases[] */
+    struct testcase *C         = NULL;
+    char             cr_dest[512];     /* canonical request */
+    hrb_t           *hrb       = NULL; /* http request buffer object */
+    unsigned int     i         = 0;    /* looping/indexing */
+    unsigned int     j         = 0;    /* looping/indexing */
+    hrb_node_t      *node      = NULL; /* http headers list pointer */
+    unsigned int     n_cases   = 3;
+    char             sh_dest[64];       /* signed headers */
+
+    TESTING("test_aws_canonical_request");
+
+    for (i = 0; i < n_cases; i++) {
+        /* pre-test bookkeeping
+         */
+        C = &cases[i];
+        for (j = 0; j < 256; j++) { cr_dest[j] = 0; } /* zero request buffer */
+        for (j = 0; j <  64; j++) { sh_dest[j] = 0; } /* zero headers buffer */
+
+        /* create HTTP request object with given verb, resource/path
+         */
+        hrb = H5FD_s3comms_hrb_init_request(C->verb,
+                                            C->resource,
+                                            "HTTP/1.1");
+        HDassert(hrb->body == NULL);
+
+        /* Create headers list from test case input
+         */
+        for (j = 0; j < C->listsize; j++) {
+            FAIL_IF( FAIL ==
+                     H5FD_s3comms_hrb_node_set(
+                             &node,
+                             C->list[j].name,
+                             C->list[j].value));
+        }
+
+        hrb->first_header = node;
+
+        /* test
+         */
+        JSVERIFY( SUCCEED,
+                  H5FD_s3comms_aws_canonical_request(
+                          cr_dest,
+                          512,
+                          sh_dest,
+                          64,
+                          hrb),
+                  " unable to compose canonical request" )
+        JSVERIFY_STR( C->exp_headers, sh_dest, NULL )
+        JSVERIFY_STR( C->exp_request, cr_dest, NULL )
+
+        /* tear-down
+         */
+        while (node != NULL) {
+            FAIL_IF( FAIL ==
+                     H5FD_s3comms_hrb_node_set(&node, node->name, NULL));
+        }
+        HDassert(NULL == node);
+        FAIL_IF( FAIL == H5FD_s3comms_hrb_destroy(&hrb));
+        HDassert(NULL == hrb);
+
+    } /* for each test case */
+
+    /***************
+     * ERROR CASES *
+     ***************/
+
+     /*  malformed hrb and/or node-list
+      */
+    JSVERIFY( FAIL, H5FD_s3comms_aws_canonical_request(
+                      cr_dest,
+                      20,
+                      sh_dest,
+                      20,
+                      NULL),
+              "http request object cannot be null" )
+
+    hrb = H5FD_s3comms_hrb_init_request("GET", "/", "HTTP/1.1");
+    JSVERIFY( FAIL, H5FD_s3comms_aws_canonical_request(
+                      NULL,
+                      20,
+                      sh_dest,
+                      20,
+                      hrb),
+              "canonical request destination cannot be NULL" )
+
+    JSVERIFY( FAIL, H5FD_s3comms_aws_canonical_request(
+                      cr_dest,
+                      20,
+                      NULL,
+                      20,
+                      hrb),
+              "signed headers destination cannot be null" )
+
+    FAIL_IF( FAIL == H5FD_s3comms_hrb_destroy(&hrb) )
+    HDassert( NULL == hrb );
+
+    PASSED();
+    return 0;
+
+error:
+
+    if (node != NULL) {
+        while (node != NULL)
+               (void)H5FD_s3comms_hrb_node_set(&node, node->name, NULL);
+        HDassert( node == NULL );
+    }
+    if (hrb != NULL) {
+        (void)H5FD_s3comms_hrb_destroy(&hrb);
+    }
+
+    return -1;
+
+} /* end test_aws_canonical_request() */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_bytes_to_hex
+ *
+ * Purpose:
+ *
+ *     Define and verify behavior of  `H5FD_s3comms_bytes_to_hex()`.
+ *
+ * Return:
+ *
+ *     Success:  0
+ *     Failure: -1
+ *
+ * Programmer: Jacob Smith
+ *             2017-09-14
+ *
+ *---------------------------------------------------------------------------
+ */
+static herr_t
+test_bytes_to_hex(void)
+{
+    /*************************
+     * test-local structures *
+     *************************/
+
+    struct testcase {
+        const char          exp[17]; /* in size * 2 + 1 for null terminator */
+        const unsigned char in[8];
+        size_t              size;
+        hbool_t             lower;
+    };
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    struct testcase cases[] = {
+        {   "52F3000C9A",
+            {82,243,0,12,154},
+            5,
+            FALSE,
+        },
+        {   "009a0cf3005200", /* lowercase alphas */
+            {0,154,12,243,0,82,0},
+            7,
+            TRUE,
+        },
+        {   "",
+            {17,63,26,56},
+            0,
+            FALSE, /* irrelevant */
+        },
+    };
+    int  i       = 0;
+    int  n_cases = 3;
+    char out[17];
+    int  out_off = 0;
+
+
+
+    TESTING("bytes-to-hex");
+
+    for (i = 0; i < n_cases; i++) {
+        for (out_off = 0; out_off < 17; out_off++) {
+            out[out_off] = 0;
+        }
+
+        JSVERIFY( SUCCEED,
+                  H5FD_s3comms_bytes_to_hex(out,
+                                            cases[i].in,
+                                            cases[i].size,
+                                            cases[i].lower),
+                  NULL )
+
+        JSVERIFY_STR(cases[i].exp, out, NULL)
+    }
+
+    /* dest cannot be null
+     */
+    JSVERIFY( FAIL,
+              H5FD_s3comms_bytes_to_hex(
+                      NULL,
+                      (const unsigned char *)"nada",
+                      5,
+                      FALSE),
+               "destination cannot be null" )
+
+    PASSED();
+    return 0;
+
+error:
+    return -1;
+
+} /* end test_bytes_to_hex() */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_hrb_init_request()
+ *
+ * Purpose:
+ *
+ *     Define and verify behavior of `H5FD_s3comms_hrb_init_request()`
+ *
+ * Programmer: Jacob Smith
+ *             2017-09-20
+ *
+ *---------------------------------------------------------------------------
+ */
+static herr_t
+test_hrb_init_request(void)
+{
+    /*********************
+     * test-local macros *
+     *********************/
+
+    /*************************
+     * test-local structures *
+     *************************/
+
+    struct testcase {
+        const char  msg[64];
+        const char *verb;
+        const char *resource;
+        const char *exp_res;
+        const char *version;
+        hbool_t     ret_null;
+    };
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    struct testcase cases[] = {
+        {   "get HTTP request just as we provided",
+            "GET",
+            "/path/to/some/file",
+            "/path/to/some/file",
+            "HTTP/1.1",
+            FALSE,
+        },
+        {   "null verb substitues to GET",
+            NULL,
+            "/MYPATH/MYFILE.tiff",
+            "/MYPATH/MYFILE.tiff",
+            "HTTP/1.1",
+            FALSE,
+        },
+        {   "demonstrate non-GET verb",
+            "HEAD",
+            "/MYPATH/MYFILE.tiff",
+            "/MYPATH/MYFILE.tiff",
+            "HTTP/1.1",
+            FALSE,
+        },
+        {   "slash prepended to resource path, if necessary",
+            NULL,
+            "MYPATH/MYFILE.tiff",
+            "/MYPATH/MYFILE.tiff",
+            NULL,
+            FALSE,
+        },
+        {   "null resource path causes problem",
+            "GET",
+            NULL,
+            NULL,
+            NULL,
+            TRUE,
+        },
+    };
+    struct testcase *C      = NULL;
+    unsigned int     i      = 0;
+    unsigned int     ncases = 5;
+    hrb_t           *req    = NULL;
+
+    TESTING("hrb_init_request");
+
+    for (i = 0; i < ncases; i++) {
+        C = &cases[i];
+        req = H5FD_s3comms_hrb_init_request(
+                C->verb,
+                C->resource,
+                C->version);
+        if (cases[i].ret_null == TRUE) {
+            FAIL_IF( req != NULL );
+        }
+        else {
+            FAIL_IF( req == NULL );
+            JSVERIFY( S3COMMS_HRB_MAGIC, req->magic, NULL )
+            if (C->verb == NULL) {
+                JSVERIFY_STR( "GET", req->verb, NULL )
+            }
+            else {
+                JSVERIFY_STR( req->verb, C->verb, NULL )
+            }
+            JSVERIFY_STR( "HTTP/1.1",  req->version,  NULL )
+            JSVERIFY_STR( C->exp_res,  req->resource, NULL )
+            FAIL_IF( req->first_header != NULL );
+            FAIL_IF( req->body         != NULL );
+            JSVERIFY( 0, req->body_len, NULL )
+            JSVERIFY( SUCCEED, H5FD_s3comms_hrb_destroy(&req),
+                      "unable to destroy hrb_t" )
+            FAIL_IF( NULL != req ); /* should annull pointer as well as free */
+        }
+
+    } /* end for each testcase */
+
+    PASSED();
+    return 0;
+
+error:
+    (void)H5FD_s3comms_hrb_destroy(&req);
+
+    return -1;
+
+} /* end test_hrb_init_request() */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_hrb_node_set()
+ *
+ * Purpose:
+ *
+ *     Test operations on hrb_node_t structure
+ *
+ * Programmer: Jacob Smith
+ *             2017-09-22
+ *
+ *---------------------------------------------------------------------------
+ */
+static herr_t
+test_hrb_node_set(void)
+{
+    /*************************
+     * test-local structures *
+     *************************/
+
+    /* bundle of name/value representing an hrb_node_t
+     */
+    typedef struct node_mock_t {
+        const char *name;
+        const char *value;
+    } node_mock_t;
+
+    /* bundle for a testcase
+     *
+     * `message`
+     *     purpose of the testcase
+     *
+     * `delta`
+     *     container for name and value strings to pass into node-set function
+     *     to to modify the list.
+     *
+     * `returned`
+     *     expected return value of node-set function
+     *
+     * `given`
+     * `expected`
+     *     string arrays representing the state of the list before and after
+     *     modification. The number of strings must be even, with each name
+     *     paired to a value. `NULL` terminates the list, with `{NULL}`
+     *     representing the empty list.
+     */
+    typedef struct testcase {
+        const char  *message;
+        node_mock_t  delta;
+        herr_t       returned;
+        const char  *given[11]; /* name/value pairs in array; NULL sentinel */
+        const char  *expected[11];
+    } testcase;
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    testcase cases[] = {
+        {   "cannot remove node from null list",
+            { "Host", NULL },
+            FAIL,
+            {NULL},
+            {NULL},
+        },
+        {   "cannot create list with NULL field name",
+            { NULL, "somevalue" },
+            FAIL,
+            {NULL},
+            {NULL},
+        },
+        {   "create a new list",
+            { "Host", "somevalue" },
+            SUCCEED,
+            {NULL},
+            {   "Host", "somevalue",
+                NULL,
+            },
+        },
+        {   "insert new node at head list",
+            { "Host", "somevalue" },
+            SUCCEED,
+            {   "Range", "bytes=20-40",
+                NULL,
+            },
+            {   "Host", "somevalue",
+                "Range", "bytes=20-40",
+                NULL,
+            },
+        },
+        {   "append new node at list end",
+            { "x-amz-date", "somevalue" },
+            SUCCEED,
+            {   "Range", "bytes=20-40",
+                NULL,
+            },
+            {   "Range", "bytes=20-40",
+                "x-amz-date", "somevalue",
+                NULL,
+            },
+        },
+        {   "insert new node inside list",
+            { "Intermediary", "somevalue" },
+            SUCCEED,
+            {   "Host", "somehost" ,
+                "Range", "bytes=20-40",
+                NULL,
+            },
+            {   "Host", "somehost",
+                "Intermediary", "somevalue",
+                "Range", "bytes=20-40",
+                NULL,
+            },
+        },
+        {   "modify node",
+            { "Range", "bytes=40-80" },
+            SUCCEED,
+            {   "Host", "somehost",
+                "Range", "bytes=20-40",
+                NULL,
+            },
+            {   "Host", "somehost",
+                "Range", "bytes=40-80",
+                NULL,
+            },
+        },
+        {   "modify node with new case",
+            { "RANGE", "bytes=40-80" },
+            SUCCEED,
+            {   "Host", "somehost",
+                "Range", "bytes=20-40",
+                NULL,
+            },
+            {   "Host", "somehost",
+                "RANGE", "bytes=40-80",
+                NULL,
+            },
+        },
+        {   "cannot add node with no name",
+            { NULL, "bytes=40-80" },
+            FAIL,
+            {   "Host", "somehost",
+                NULL,
+            },
+            {   "Host", "somehost",
+                NULL,
+            },
+        },
+        {   "add node with 'empty' name",
+            { "", "bytes=40-80" },
+            SUCCEED,
+            {   "Host", "somehost",
+                NULL,
+            },
+            {   "", "bytes=40-80",
+                "Host", "somehost",
+                NULL,
+            },
+        },
+        {   "remove node from end of list",
+            { "Host", NULL },
+            SUCCEED,
+            {   "Date", "Thr, 25 Jan 2018",
+                "Host", "somehost",
+                NULL,
+            },
+            {   "Date", "Thr, 25 Jan 2018",
+                NULL,
+            },
+        },
+        {   "remove node from middle of list",
+            { "Host", NULL },
+            SUCCEED,
+            {   "Date", "Thr, 25 Jan 2018",
+                "Host", "somehost",
+                "Range", "bytes=20-40",
+                NULL,
+            },
+            {   "Date", "Thr, 25 Jan 2018",
+                "Range", "bytes=20-40",
+                NULL,
+            },
+        },
+        {   "remove node from start of list",
+            { "Date", NULL },
+            SUCCEED,
+            {   "Date", "Thr, 25 Jan 2018",
+                "Host", "somehost",
+                "Range", "bytes=20-40",
+                NULL,
+            },
+            {   "Host", "somehost",
+                "Range", "bytes=20-40",
+                NULL,
+            },
+        },
+        {   "remove only node in list",
+            { "Date", NULL },
+            SUCCEED,
+            {   "Date", "Thr, 25 Jan 2018",
+                NULL,
+            },
+            {   NULL,
+            },
+        },
+        {   "attempt to remove absent node fails",
+            { "Host", NULL },
+            FAIL,
+            {   "Date", "Thr, 25 Jan 2018",
+                "Range", "bytes=20-40",
+                NULL,
+            },
+            {   "Date", "Thr, 25 Jan 2018",
+                "Range", "bytes=20-40",
+                NULL,
+            },
+        },
+        {   "removal is case-insensitive",
+            { "hOsT", NULL },
+            SUCCEED,
+            {   "Date", "Thr, 25 Jan 2018",
+                "Host", "somehost",
+                "Range", "bytes=20-40",
+                NULL,
+            },
+            {   "Date", "Thr, 25 Jan 2018",
+                "Range", "bytes=20-40",
+                NULL,
+            },
+        },
+    };
+    unsigned testcases_count = 16;
+    unsigned test_i = 0;
+    hrb_node_t *list = NULL;
+
+    TESTING("hrb_node_t (test_hrb_node_set)");
+
+    for (test_i = 0; test_i < testcases_count; test_i++) {
+        const hrb_node_t  *node = NULL;
+        const testcase    *test = &(cases[test_i]);
+        unsigned mock_i = 0;
+
+        /*********
+         * SETUP *
+         *********/
+
+        for (mock_i = 0; test->given[mock_i] != NULL; mock_i += 2) {
+            const char *name = test->given[mock_i];
+            const char *valu = test->given[mock_i+1];
+
+            FAIL_IF( SUCCEED !=
+                     H5FD_s3comms_hrb_node_set(&list, name, valu) )
+        }
+        /********
+         * TEST *
+         ********/
+
+        /* perform modification on list
+         */
+        JSVERIFY( test->returned,
+                  H5FD_s3comms_hrb_node_set(&list,
+                                            test->delta.name,
+                                            test->delta.value),
+                  test->message )
+
+
+        /* verify resulting list
+         */
+        node = list;
+        mock_i = 0;
+        while (test->expected[mock_i] != NULL && node != NULL) {
+            const char *name = test->expected[mock_i];
+            const char *valu = test->expected[mock_i+1];
+
+            JSVERIFY_STR( name, node->name, NULL )
+            JSVERIFY_STR( valu, node->value, NULL )
+
+            mock_i += 2;
+            node = node->next;
+        }
+        FAIL_IF( test->expected[mock_i] != NULL )
+        FAIL_IF( node != NULL )
+
+        /************
+         * TEARDOWN *
+         ************/
+
+        while (list != NULL) {
+            FAIL_IF( SUCCEED !=
+                     H5FD_s3comms_hrb_node_set(&list, list->name, NULL) )
+        }
+    } /* end for each testcase */
+
+    PASSED();
+    return 0;
+
+error:
+    while (list != NULL) {
+        (void)H5FD_s3comms_hrb_node_set(&list, list->name, NULL);
+    }
+
+    return -1;
+
+} /* end test_hrb_node_t() */
+
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_HMAC_SHA256()
+ *
+ * Purpose:
+ *
+ *     Define and verify behavior of `H5FD_s3comms_HMAC_SHA256()`
+ *
+ * Programmer: Jacob Smith
+ *             2017-09-19
+ *
+ *---------------------------------------------------------------------------
+ */
+static herr_t
+test_HMAC_SHA256(void)
+{
+
+    /*************************
+     * test-local structures *
+     *************************/
+
+    struct testcase {
+        herr_t               ret; /* SUCCEED/FAIL expected from call */
+        const unsigned char  key[SHA256_DIGEST_LENGTH];
+        size_t               key_len;
+        const char          *msg;
+        size_t               msg_len;
+        const char          *exp; /* not used if ret == FAIL */
+        size_t               dest_size; /* if 0, `dest` is not malloc'd */
+    };
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    struct testcase cases[] = {
+        {   SUCCEED,
+            {   0xdb, 0xb8, 0x93, 0xac, 0xc0, 0x10, 0x96, 0x49,
+                0x18, 0xf1, 0xfd, 0x43, 0x3a, 0xdd, 0x87, 0xc7,
+                0x0e, 0x8b, 0x0d, 0xb6, 0xbe, 0x30, 0xc1, 0xfb,
+                0xea, 0xfe, 0xfa, 0x5e, 0xc6, 0xba, 0x83, 0x78,
+            },
+            SHA256_DIGEST_LENGTH,
+            "AWS4-HMAC-SHA256\n20130524T000000Z\n20130524/us-east-1/s3/aws4_request\n7344ae5b7ee6c3e7e6b0fe0640412a37625d1fbfff95c48bbb2dc43964946972",
+            HDstrlen("AWS4-HMAC-SHA256\n20130524T000000Z\n20130524/us-east-1/s3/aws4_request\n7344ae5b7ee6c3e7e6b0fe0640412a37625d1fbfff95c48bbb2dc43964946972"),
+            "f0e8bdb87c964420e857bd35b5d6ed310bd44f0170aba48dd91039c6036bdb41",
+            SHA256_DIGEST_LENGTH * 2 + 1, /* +1 for null terminator */
+        },
+        {   SUCCEED,
+            {'J','e','f','e'},
+            4,
+            "what do ya want for nothing?",
+            28,
+            "5bdcc146bf60754e6a042426089575c75a003f089d2739839dec58b964ec3843",
+            SHA256_DIGEST_LENGTH * 2 + 1,
+        },
+        {    FAIL,
+             "DOESN'T MATTER",
+             14,
+             "ALSO IRRELEVANT",
+             15,
+             NULL,
+             0, /* dest -> null, resulting in immediate error */
+        },
+    };
+    char *dest    = NULL;
+    int   i       = 0;
+    int   n_cases = 3;
+
+    TESTING("HMAC_SHA256");
+
+    for (i = 0; i < n_cases; i++) {
+        if (cases[i].dest_size == 0) {
+           dest = NULL;
+        } else {
+           dest = (char *)HDmalloc(sizeof(char) * cases[i].dest_size);
+           HDassert(dest != NULL);
+        }
+
+        JSVERIFY( cases[i].ret,
+                  H5FD_s3comms_HMAC_SHA256(
+                          cases[i].key,
+                          cases[i].key_len,
+                          cases[i].msg,
+                          cases[i].msg_len,
+                          dest),
+                  cases[i].msg );
+        if (cases[i].ret == SUCCEED) {
+#ifdef VERBOSE
+            if (0 !=
+                strncmp(cases[i].exp,
+                        dest,
+                        HDstrlen(cases[i].exp)))
+            {
+                /* print out how wrong things are, and then fail
+                 */
+                dest = (char *)realloc(dest, cases[i].dest_size + 1);
+                HDassert(dest != NULL);
+                dest[cases[i].dest_size] = 0;
+                HDfprintf(stdout,
+                          "ERROR:\n!!! \"%s\"\n != \"%s\"\n",
+                          cases[i].exp,
+                          dest);
+                TEST_ERROR;
+            }
+#else /* VERBOSE not defined */
+            /* simple pass/fail test
+             */
+            JSVERIFY( 0,
+                      strncmp(cases[i].exp, dest, HDstrlen(cases[i].exp)),
+                      NULL);
+#endif /* VERBOSE */
+        }
+        free(dest);
+    }
+
+    PASSED();
+    return 0;
+
+error:
+    free(dest);
+    return -1;
+
+} /* end test_HMAC_SHA256() */
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Function: test_nlowercase()
+ *
+ * Purpose:
+ *
+ *     Define and verify behavior of `H5FD_s3comms_nlowercase()`
+ *
+ * Programmer: Jacob Smith
+ *             2017-19-18
+ *
+ *----------------------------------------------------------------------------
+ */
+static herr_t
+test_nlowercase(void)
+{
+    /*************************
+     * test-local structures *
+     *************************/
+
+    struct testcase {
+        const char *in;
+        size_t      len;
+        const char *exp;
+    };
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    /* any character after in exp on or after exp[len] is undefined.
+     * in this test, kept as the null character for simplicity.
+     */
+    struct testcase cases[] = {
+        {   "HALlEluJAh",
+            6,
+            "hallel",
+        },
+        {   "all\0 lower",
+            10,
+            "all\0 lower",
+        },
+        {   "to meeeeeee",
+            0,
+            "",
+        },
+    };
+    char *dest    = NULL;
+    int   i       = 0;
+    int   n_cases = 3;
+
+    TESTING("nlowercase");
+
+    for (i = 0; i < n_cases; i++) {
+        dest = (char *)HDmalloc(sizeof(char) * 16);
+
+        JSVERIFY( SUCCEED,
+                  H5FD_s3comms_nlowercase(dest,
+                                          cases[i].in,
+                                          cases[i].len),
+                  cases[i].in )
+        if (cases[i].len > 0) {
+            JSVERIFY( 0, strncmp(dest, cases[i].exp, cases[i].len), NULL )
+        }
+        free(dest);
+    } /* end for each testcase */
+
+    JSVERIFY( FAIL,
+              H5FD_s3comms_nlowercase(NULL,
+                                      cases[0].in,
+                                      cases[0].len),
+              "null distination should fail" )
+
+    PASSED();
+    return 0;
+
+error:
+    free(dest);
+    return -1;
+
+} /* end test_nlowercase() */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_parse_url()
+ *
+ * Programmer: Jacob Smith
+ *             2017-11-??
+ *
+ *---------------------------------------------------------------------------
+ */
+static herr_t
+test_parse_url(void)
+{
+    /*********************
+     * test-local macros *
+     *********************/
+
+    /*************************
+     * test-local structures *
+     *************************/
+
+    typedef struct {
+        const char *scheme;
+        const char *host;
+        const char *port;
+        const char *path;
+        const char *query;
+    } const_purl_t;
+
+    struct testcase {
+        const char   *url;
+        herr_t        exp_ret; /* expected return;              */
+                               /* if FAIL, `expected` is unused */
+        const_purl_t  expected;
+        const char   *msg;
+    };
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    parsed_url_t   *purl    = NULL;
+    unsigned int    i       = 0;
+    unsigned int    ncases  = 15;
+    struct testcase cases[] = {
+        {   NULL,
+            FAIL,
+            { NULL, NULL, NULL, NULL, NULL },
+            "null url",
+        },
+        {   "",
+            FAIL,
+            { NULL, NULL, NULL, NULL, NULL },
+            "empty url",
+        },
+        {   "ftp://[1000:4000:0002:2010]",
+            SUCCEED,
+            {   "ftp",
+                "[1000:4000:0002:2010]",
+                NULL,
+                NULL,
+                NULL,
+            },
+            "IPv6 ftp and empty path (root)",
+        },
+        {   "ftp://[1000:4000:0002:2010]:2040",
+            SUCCEED,
+            {   "ftp",
+                "[1000:4000:0002:2010]",
+                "2040",
+                NULL,
+                NULL,
+            },
+            "root IPv6 ftp with port",
+        },
+        {   "http://some.domain.org:9000/path/to/resource.txt",
+            SUCCEED,
+            {   "http",
+                "some.domain.org",
+                "9000",
+                "path/to/resource.txt",
+                NULL,
+            },
+            "without query",
+        },
+        {   "https://domain.me:00/file.txt?some_params unchecked",
+            SUCCEED,
+            {   "https",
+                "domain.me",
+                "00",
+                "file.txt",
+                "some_params unchecked",
+            },
+            "with query",
+        },
+        {   "ftp://domain.com/",
+            SUCCEED,
+            {   "ftp",
+                "domain.com",
+                NULL,
+                NULL,
+                NULL,
+            },
+            "explicit root w/out port",
+        },
+        {   "ftp://domain.com:1234/",
+            SUCCEED,
+            {   "ftp",
+                "domain.com",
+                "1234",
+                NULL,
+                NULL,
+            },
+            "explicit root with port",
+        },
+        {   "ftp://domain.com:1234/file?",
+            FAIL,
+            { NULL, NULL, NULL, NULL, NULL, },
+            "empty query is invalid",
+        },
+        {   "ftp://:1234/file",
+            FAIL,
+            { NULL, NULL, NULL, NULL, NULL, },
+            "no host",
+        },
+        {   "h&r block",
+            FAIL,
+            { NULL, NULL, NULL, NULL, NULL, },
+            "no scheme (bad URL)",
+        },
+        {   "http://domain.com?a=b&d=b",
+            SUCCEED,
+            {   "http",
+                "domain.com",
+                NULL,
+                NULL,
+                "a=b&d=b",
+            },
+            "QUERY with implict PATH",
+        },
+        {   "http://[5]/path?a=b&d=b",
+            SUCCEED,
+            {   "http",
+                "[5]",
+                NULL,
+                "path",
+                "a=b&d=b",
+            },
+            "IPv6 extraction is really dumb",
+        },
+        {   "http://[1234:5678:0910:1112]:port/path",
+            FAIL,
+            { NULL, NULL, NULL, NULL, NULL, },
+            "non-decimal PORT (port)",
+        },
+        {   "http://mydomain.com:01a3/path",
+            FAIL,
+            { NULL, NULL, NULL, NULL, NULL, },
+            "non-decimal PORT (01a3)",
+        },
+    };
+
+    TESTING("url-parsing functionality");
+
+    /*********
+     * TESTS *
+     *********/
+
+    for (i = 0; i < ncases; i++) {
+        HDassert( purl == NULL );
+
+        JSVERIFY( cases[i].exp_ret,
+                  H5FD_s3comms_parse_url(cases[i].url, &purl),
+                  cases[i].msg )
+
+        if (cases[i].exp_ret == FAIL) {
+            /* on FAIL, `purl` should be untouched--remains NULL */
+            FAIL_UNLESS( purl == NULL )
+        }
+        else {
+            /* on SUCCEED, `purl` should be set */
+            FAIL_IF( purl == NULL )
+
+            if (cases[i].expected.scheme != NULL) {
+                FAIL_IF( NULL == purl->scheme )
+                JSVERIFY_STR( cases[i].expected.scheme,
+                              purl->scheme,
+                              cases[i].msg )
+            } else {
+                FAIL_UNLESS( NULL == purl->scheme )
+            }
+
+            if (cases[i].expected.host != NULL) {
+                FAIL_IF( NULL == purl->host )
+                JSVERIFY_STR( cases[i].expected.host,
+                              purl->host,
+                              cases[i].msg )
+            } else {
+                FAIL_UNLESS( NULL == purl->host )
+            }
+
+            if (cases[i].expected.port != NULL) {
+                FAIL_IF( NULL == purl->port )
+                JSVERIFY_STR( cases[i].expected.port,
+                              purl->port,
+                              cases[i].msg )
+            } else {
+                FAIL_UNLESS( NULL == purl->port )
+            }
+
+            if (cases[i].expected.path != NULL) {
+                FAIL_IF( NULL == purl->path )
+                JSVERIFY_STR( cases[i].expected.path,
+                              purl->path,
+                              cases[i].msg )
+            } else {
+                FAIL_UNLESS( NULL == purl->path )
+            }
+
+            if (cases[i].expected.query != NULL) {
+                FAIL_IF( NULL == purl->query )
+                JSVERIFY_STR( cases[i].expected.query,
+                              purl->query,
+                              cases[i].msg )
+            } else {
+                FAIL_UNLESS( NULL == purl->query )
+            }
+        } /* end if parse-url return SUCCEED/FAIL */
+
+        /* per-test cleanup
+         * well-behaved, even if `purl` is NULL
+         */
+        FAIL_IF( FAIL == H5FD_s3comms_free_purl(purl) )
+        purl = NULL;
+
+    } /* end for each testcase */
+
+    PASSED();
+    return 0;
+
+error:
+    /***********
+     * cleanup *
+     ***********/
+    (void)H5FD_s3comms_free_purl(purl);
+
+    return -1;
+
+} /* end test_parse_url() */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_percent_encode_char()
+ *
+ * Purpose:
+ *
+ *     Define and verify behavior of `H5FD_s3comms_percent_encode_char()`
+ *
+ * Return:
+ *
+ *     Success:  0
+ *     Failure: -1
+ *
+ * Programmer: Jacob Smith
+ *             2017-09-14
+ *
+ *---------------------------------------------------------------------------
+ */
+static herr_t
+test_percent_encode_char(void)
+{
+    /*************************
+     * test-local structures *
+     *************************/
+
+    struct testcase {
+        const char  c;
+        const char *exp;
+        size_t      exp_len;
+    };
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    struct testcase cases[] = {
+        {'$', "%24", 3}, /* u+0024 dollar sign */
+        {' ', "%20", 3}, /* u+0020 space */
+        {'^', "%5E", 3}, /* u+0094 carat */
+        {'/', "%2F", 3}, /* u+002f solidus (forward slash) */
+        /* {??, "%C5%8C", 6},*/ /* u+014c Latin Capital Letter O with Macron */
+        /* Not included because it is multibyte "wide" character that poses  */
+        /* issues both in the underlying function and in being written in    */
+        /* this file.                                                        */
+        /* {'¢', "%C2%A2", 6}, */ /* u+00a2 cent sign */
+        /* above works, but complains about wide character overflow      */
+        /* Elide for now, until it is determined (a) unnecessary or      */
+        /* (b) requiring signature change to accommodate wide characters */
+        {'\0', "%00", 3}, /* u+0000 null */
+    };
+    char   dest[13];
+    size_t dest_len = 0;
+    int    i        = 0;
+    int    n_cases  = 5;
+
+    TESTING("percent encode characters");
+
+    for (i = 0; i < n_cases; i++) {
+        JSVERIFY( SUCCEED,
+                  H5FD_s3comms_percent_encode_char(
+                          dest,
+                          (const unsigned char)cases[i].c,
+                          &dest_len),
+                  NULL )
+        JSVERIFY(cases[i].exp_len, dest_len, NULL )
+        JSVERIFY(0, strncmp(dest, cases[i].exp, dest_len), NULL )
+        JSVERIFY_STR( cases[i].exp, dest, NULL )
+    }
+
+    JSVERIFY( FAIL,
+              H5FD_s3comms_percent_encode_char(
+                      NULL,
+                      (const unsigned char)'^',
+                      &dest_len),
+              NULL )
+
+    PASSED();
+    return 0;
+
+error:
+    return -1;
+} /* end test_percent_encode_char() */
+
+
+/*---------------------------------------------------------------------------
+ * Function: test_s3r_open()
+ *
+ * Programmer: Jacob Smith 2018-01-24
+ *
+ * Changes: None
+ *
+ *---------------------------------------------------------------------------
+ */
+static herr_t
+test_s3r_get_filesize(void)
+{
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    char url_raven[S3_TEST_MAX_URL_SIZE];
+    s3r_t *handle = NULL;
+
+    TESTING("s3r_get_filesize");
+
+    /* setup -- compose url to target resource
+     */
+    if (FALSE == s3_test_bucket_defined) {
+        SKIPPED();
+        puts("    environment variable HDF5_ROS3_TEST_BUCKET_URL not defined");
+        fflush(stdout);
+        return 0;
+    }
+
+    FAIL_IF( S3_TEST_MAX_URL_SIZE <
+             HDsnprintf(url_raven,
+                      S3_TEST_MAX_URL_SIZE,
+                      "%s/%s",
+                      s3_test_bucket_url,
+                      S3_TEST_RESOURCE_TEXT_PUBLIC) );
+
+    JSVERIFY( 0, H5FD_s3comms_s3r_get_filesize(NULL),
+              "filesize of the null handle should be 0" )
+
+    handle = H5FD_s3comms_s3r_open(url_raven, NULL, NULL, NULL);
+    FAIL_IF( handle == NULL )
+
+    JSVERIFY( 6464, H5FD_s3comms_s3r_get_filesize(handle), NULL )
+
+
+    FAIL_IF( SUCCEED != H5FD_s3comms_s3r_close(handle) )
+
+    PASSED();
+    return 0;
+
+error:
+    if (handle != NULL)
+        (void)H5FD_s3comms_s3r_close(handle);
+
+    return -1;
+
+} /* end test_s3r_get_filesize() */
+
+
+/*---------------------------------------------------------------------------
+ * Function: test_s3r_open()
+ *
+ * Programmer: Jacob Smith 2018-01-??
+ *
+ * Changes: None
+ *
+ *---------------------------------------------------------------------------
+ */
+static herr_t
+test_s3r_open(void)
+{
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    char           url_missing[S3_TEST_MAX_URL_SIZE];
+    char           url_raven[S3_TEST_MAX_URL_SIZE];
+    char           url_raven_badport[S3_TEST_MAX_URL_SIZE];
+    char           url_shakespeare[S3_TEST_MAX_URL_SIZE];
+    unsigned char  signing_key[SHA256_DIGEST_LENGTH];
+    struct tm     *now          = NULL;
+    char           iso8601now[ISO8601_SIZE];
+    s3r_t         *handle       = NULL;
+    hbool_t        curl_ready   = FALSE;
+    parsed_url_t  *purl         = NULL;
+
+    TESTING("s3r_open");
+
+    if (s3_test_credentials_loaded == 0) {
+        SKIPPED();
+        puts("    s3 credentials are not loaded");
+        fflush(stdout);
+        return 0;
+    }
+    if (FALSE == s3_test_bucket_defined) {
+        SKIPPED();
+        puts("    environment variable HDF5_ROS3_TEST_BUCKET_URL not defined");
+        fflush(stdout);
+        return 0;
+    }
+
+    /******************
+     * PRE-TEST SETUP *
+     ******************/
+
+    FAIL_IF( S3_TEST_MAX_URL_SIZE <
+             HDsnprintf(url_shakespeare,
+                      S3_TEST_MAX_URL_SIZE,
+                      "%s/%s",
+                      s3_test_bucket_url,
+                      S3_TEST_RESOURCE_TEXT_RESTRICTED) );
+
+    FAIL_IF( S3_TEST_MAX_URL_SIZE <
+             HDsnprintf(url_missing,
+                      S3_TEST_MAX_URL_SIZE,
+                      "%s/%s",
+                      s3_test_bucket_url,
+                      S3_TEST_RESOURCE_MISSING) );
+
+    FAIL_IF( S3_TEST_MAX_URL_SIZE <
+             HDsnprintf(url_raven,
+                      S3_TEST_MAX_URL_SIZE,
+                      "%s/%s",
+                      s3_test_bucket_url,
+                      S3_TEST_RESOURCE_TEXT_PUBLIC) );
+
+    /* Set given bucket url with invalid/inactive port number for badport.
+     * Note, this sort of micro-management of parsed_url_t is not advised
+     */
+    FAIL_IF( FAIL == H5FD_s3comms_parse_url(s3_test_bucket_url, &purl) )
+    if (purl->port == NULL) {
+        purl->port = (char *)H5MM_malloc(sizeof(char) * 5);
+        FAIL_IF( purl->port == NULL );
+        FAIL_IF( 5 < HDsnprintf(purl->port, 5, "9000") )
+    } else if (strcmp(purl->port, "9000") != 0) {
+        FAIL_IF( 5 < HDsnprintf(purl->port, 5, "9000") )
+    } else {
+        FAIL_IF( 5 < HDsnprintf(purl->port, 5, "1234") )
+    }
+    FAIL_IF( S3_TEST_MAX_URL_SIZE <
+             HDsnprintf(url_raven_badport,
+                      S3_TEST_MAX_URL_SIZE,
+                      "%s://%s:%s/%s",
+                      purl->scheme,
+                      purl->host,
+                      purl->port,
+                      S3_TEST_RESOURCE_TEXT_PUBLIC) );
+
+    curl_global_init(CURL_GLOBAL_DEFAULT);
+    curl_ready = TRUE;
+
+    now = gmnow();
+    FAIL_IF( now == NULL )
+    FAIL_IF( ISO8601NOW(iso8601now, now) != (ISO8601_SIZE - 1) );
+
+    /* It is desired to have means available to verify that signing_key
+     * was set successfully and to an expected value.
+     */
+    FAIL_IF( FAIL ==
+             H5FD_s3comms_signing_key(
+                     signing_key,
+                     (const char *)s3_test_aws_secret_access_key,
+                     (const char *)s3_test_aws_region,
+                     (const char *)iso8601now) );
+
+    /*************************
+     * OPEN NONEXISTENT FILE *
+     *************************/
+
+    /* attempt anonymously
+     */
+    handle = H5FD_s3comms_s3r_open(url_missing, NULL, NULL, NULL);
+    FAIL_IF( handle != NULL );
+
+    /* attempt with authentication
+     */
+    handle = H5FD_s3comms_s3r_open(
+             url_missing,
+             (const char *)s3_test_aws_region,
+             (const char *)s3_test_aws_access_key_id,
+             (const unsigned char *)signing_key);
+    FAIL_IF( handle != NULL );
+
+    /*************************
+     * INACTIVE PORT ON HOST *
+     *************************/
+
+#if S3_TEST_RUN_TIMEOUT
+    HDprintf("Opening on inactive port may hang for a minute; waiting for timeout\n");
+    handle = H5FD_s3comms_s3r_open(url_raven_badport, NULL, NULL, NULL);
+    FAIL_IF( handle != NULL );
+#endif
+
+    /*******************************
+     * INVALID AUTHENTICATION INFO *
+     *******************************/
+
+    /* anonymous access on restricted file
+     */
+    handle = H5FD_s3comms_s3r_open(url_shakespeare, NULL, NULL, NULL);
+    FAIL_IF( handle != NULL );
+
+    /* passed in a bad ID
+     */
+    handle = H5FD_s3comms_s3r_open(
+             url_shakespeare,
+             (const char *)s3_test_aws_region,
+             "I_MADE_UP_MY_ID",
+             (const unsigned char *)signing_key);
+    FAIL_IF( handle != NULL );
+
+    /* using an invalid signing key
+     */
+    handle = H5FD_s3comms_s3r_open(
+             url_shakespeare,
+             (const char *)s3_test_aws_region,
+             (const char *)s3_test_aws_access_key_id,
+             (const unsigned char *)EMPTY_SHA256);
+    FAIL_IF( handle != NULL );
+
+    /*******************************
+     * SUCCESSFUL OPEN (AND CLOSE) *
+     *******************************/
+
+    /* anonymous
+     */
+    handle = H5FD_s3comms_s3r_open(url_raven, NULL, NULL, NULL);
+    FAIL_IF( handle == NULL );
+    JSVERIFY( 6464, H5FD_s3comms_s3r_get_filesize(handle),
+              "did not get expected filesize" )
+    JSVERIFY( SUCCEED,
+              H5FD_s3comms_s3r_close(handle),
+              "unable to close file" )
+    handle = NULL;
+
+    /* using authentication on anonymously-accessible file?
+     */
+    handle = H5FD_s3comms_s3r_open(
+             url_raven,
+             (const char *)s3_test_aws_region,
+             (const char *)s3_test_aws_access_key_id,
+             (const unsigned char *)signing_key);
+    FAIL_IF( handle == NULL );
+    JSVERIFY( 6464, H5FD_s3comms_s3r_get_filesize(handle), NULL )
+    JSVERIFY( SUCCEED,
+              H5FD_s3comms_s3r_close(handle),
+              "unable to close file" )
+    handle = NULL;
+
+    /* authenticating
+     */
+    handle = H5FD_s3comms_s3r_open(
+                     url_shakespeare,
+                     (const char *)s3_test_aws_region,
+                     (const char *)s3_test_aws_access_key_id,
+                     (const unsigned char *)signing_key);
+    FAIL_IF( handle == NULL );
+    JSVERIFY( 5458199, H5FD_s3comms_s3r_get_filesize(handle), NULL )
+    JSVERIFY( SUCCEED,
+              H5FD_s3comms_s3r_close(handle),
+              "unable to close file" )
+    handle = NULL;
+
+
+
+    curl_global_cleanup();
+    curl_ready = FALSE;
+
+    FAIL_IF( FAIL == H5FD_s3comms_free_purl(purl) )
+    purl = NULL;
+
+    PASSED();
+    return 0;
+error:
+    /***********
+     * cleanup *
+     ***********/
+
+    if (handle != NULL)
+        H5FD_s3comms_s3r_close(handle);
+    if (purl != NULL)
+        H5FD_s3comms_free_purl(purl);
+    if (curl_ready == TRUE)
+        curl_global_cleanup();
+
+    return -1;
+
+} /* end test_s3r_open() */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_s3r_read()
+ *
+ * Purpose:
+ *
+ *     Specify and demonstrate the use and life cycle of an S3 Request handle
+ *     `s3r_t`, through its related functions.
+ *
+ *     H5FD_s3comms_s3r_open
+ *     H5FD_s3comms_s3r_getsize << called by open() _only_
+ *     H5FD_s3comms_s3r_read    << called by getsize(), multiple times working
+ *     H5FD_s3comms_s3r_close
+ *
+ *     Shows most basic curl interation.
+ *
+ * Programmer: Jacob Smith
+ *             2017-10-06
+ *
+ *---------------------------------------------------------------------------
+ */
+static herr_t
+test_s3r_read(void)
+{
+
+#define S3COMMS_TEST_BUFFER_SIZE 256
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    char           url_raven[S3_TEST_MAX_URL_SIZE];
+    char           buffer[S3COMMS_TEST_BUFFER_SIZE];
+    s3r_t         *handle     = NULL;
+    hbool_t        curl_ready = FALSE;
+    unsigned int   i          = 0;
+
+    TESTING("test_s3r_read");
+
+    /*
+     * initial setup
+     */
+    if (FALSE == s3_test_bucket_defined) {
+        SKIPPED();
+        puts("    environment variable HDF5_ROS3_TEST_BUCKET_URL not defined");
+        fflush(stdout);
+        return 0;
+    }
+
+    curl_global_init(CURL_GLOBAL_DEFAULT);
+    curl_ready = TRUE;
+    FAIL_IF( S3_TEST_MAX_URL_SIZE <
+             HDsnprintf(url_raven,
+                      S3_TEST_MAX_URL_SIZE,
+                      "%s/%s",
+                      s3_test_bucket_url,
+                      S3_TEST_RESOURCE_TEXT_PUBLIC) );
+
+    for (i = 0; i < S3COMMS_TEST_BUFFER_SIZE; i++)
+        buffer[i] = '\0';
+
+    /* open file
+     */
+    handle = H5FD_s3comms_s3r_open(url_raven, NULL, NULL, NULL);
+    FAIL_IF( handle == NULL )
+    JSVERIFY( 6464, H5FD_s3comms_s3r_get_filesize(handle), NULL )
+
+    for (i = 0; i < S3COMMS_TEST_BUFFER_SIZE; i++)
+        buffer[i] = '\0';
+
+    /**********************
+     * read start of file *
+     **********************/
+
+    JSVERIFY( SUCCEED,
+              H5FD_s3comms_s3r_read(
+                      handle,
+                      (haddr_t)0,
+                      (size_t)118,
+                      buffer),
+              NULL )
+    JSVERIFY_STR (
+            "Once upon a midnight dreary, while I pondered, weak and weary,\n" \
+            "Over many a quaint and curious volume of forgotten lore",
+            buffer,
+            NULL )
+
+    for (i = 0; i < S3COMMS_TEST_BUFFER_SIZE; i++)
+        buffer[i] = '\0';
+
+    /************************
+     * read arbitrary range *
+     ************************/
+
+    JSVERIFY( SUCCEED,
+              H5FD_s3comms_s3r_read(
+                      handle,
+                      (haddr_t)2540,
+                      (size_t)54,
+                      buffer),
+              NULL )
+    JSVERIFY_STR( "the grave and stern decorum of the countenance it wore",
+                  buffer,
+                  NULL )
+
+    for (i = 0; i < S3COMMS_TEST_BUFFER_SIZE; i++)
+        buffer[i] = '\0';
+
+    /**********************
+     * read one character *
+     **********************/
+
+    JSVERIFY(SUCCEED,
+             H5FD_s3comms_s3r_read(
+                      handle,
+                      (haddr_t)2540,
+                      (size_t)1,
+                      buffer),
+              NULL )
+    JSVERIFY_STR( "t", buffer, NULL )
+
+
+    for (i = 0; i < S3COMMS_TEST_BUFFER_SIZE; i++)
+        buffer[i] = '\0';
+
+    /***************
+     * read to EoF *
+     ***************/
+
+    JSVERIFY( SUCCEED,
+              H5FD_s3comms_s3r_read(
+                      handle,
+                      (haddr_t)6370,
+                      (size_t)0,
+                      buffer),
+              NULL )
+    JSVERIFY( 0,
+              strncmp(buffer,
+                      "And my soul from out that shadow that lies floating on the floor\nShall be lifted—nevermore!\n",
+                      94),
+              buffer )
+
+    for (i = 0; i < S3COMMS_TEST_BUFFER_SIZE; i++)
+        buffer[i] = '\0';
+
+    /*****************
+     * read past eof *
+     *****************/
+
+    JSVERIFY( FAIL,
+              H5FD_s3comms_s3r_read(
+                      handle,
+                      (haddr_t)6400,
+                      (size_t)100, /* 6400+100 > 6464 */
+                      buffer),
+              NULL )
+     JSVERIFY( 0, strcmp("", buffer), NULL )
+
+    /************************
+     * read starts past eof *
+     ************************/
+
+    JSVERIFY( FAIL,
+              H5FD_s3comms_s3r_read(
+                      handle,
+                      (haddr_t)1200699, /* 1200699 > 6464 */
+                      (size_t)100,
+                      buffer),
+              NULL )
+     JSVERIFY( 0, strcmp("", buffer), NULL )
+
+    /**********************
+     * read starts on eof *
+     **********************/
+
+    JSVERIFY( FAIL,
+              H5FD_s3comms_s3r_read(
+                      handle,
+                      (haddr_t)6464,
+                      (size_t)0,
+                      buffer),
+              NULL )
+     JSVERIFY( 0, strcmp("", buffer), NULL )
+
+    /*************
+     * TEAR DOWN *
+     *************/
+
+    JSVERIFY( SUCCEED,
+              H5FD_s3comms_s3r_close(handle),
+              "unable to close file" )
+    handle = NULL;
+
+    curl_global_cleanup();
+    curl_ready = FALSE;
+
+    PASSED();
+    return 0;
+
+error:
+    /***********
+     * cleanup *
+     ***********/
+
+    if (handle != NULL)
+        H5FD_s3comms_s3r_close(handle);
+
+    if (curl_ready == TRUE)
+        curl_global_cleanup();
+
+    return -1;
+
+#undef S3COMMS_TEST_BUFFER_SIZE
+
+} /* end test_s3r_read() */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_signing_key()
+ *
+ * Purpose:
+ *
+ *     Define and verify behavior of `H5FD_s3comms_signing_key()`
+ *
+ *     More test cases would be a very good idea.
+ *
+ * Programmer: Jacob Smith
+ *             2017-09-18
+ *
+ *---------------------------------------------------------------------------
+ */
+static herr_t
+test_signing_key(void)
+{
+    /*************************
+     * test-local structures *
+     *************************/
+
+    struct testcase {
+        const char    *region;
+        const char    *secret_key;
+        const char    *when;
+        unsigned char  exp[SHA256_DIGEST_LENGTH];
+    };
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    struct testcase cases[] = {
+        {   "us-east-1",
+            "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
+            "20130524T000000Z",
+            {   0xdb, 0xb8, 0x93, 0xac, 0xc0, 0x10, 0x96, 0x49,
+                0x18, 0xf1, 0xfd, 0x43, 0x3a, 0xdd, 0x87, 0xc7,
+                0x0e, 0x8b, 0x0d, 0xb6, 0xbe, 0x30, 0xc1, 0xfb,
+                0xea, 0xfe, 0xfa, 0x5e, 0xc6, 0xba, 0x83, 0x78,
+            },
+        },
+    };
+    int            i      = 0;
+    unsigned char *key    = NULL;
+    int            ncases = 1;
+
+    TESTING("signing_key");
+
+    for (i = 0; i < ncases; i++) {
+        key = (unsigned char *)HDmalloc(sizeof(unsigned char) * \
+                                      SHA256_DIGEST_LENGTH);
+    HDassert(key != NULL);
+
+        JSVERIFY( SUCCEED,
+                  H5FD_s3comms_signing_key(
+                          key,
+                          cases[i].secret_key,
+                          cases[i].region,
+                          cases[i].when),
+                  NULL )
+
+        JSVERIFY( 0,
+                  strncmp((const char *)cases[i].exp,
+                          (const char *)key,
+                          SHA256_DIGEST_LENGTH),
+                   cases[i].exp )
+
+        free(key);
+        key = NULL;
+    }
+
+
+    /***************
+     * ERROR CASES *
+     ***************/
+
+    key = (unsigned char *)HDmalloc(sizeof(unsigned char) * \
+                                  SHA256_DIGEST_LENGTH);
+    HDassert(key != NULL);
+
+    JSVERIFY( FAIL,
+              H5FD_s3comms_signing_key(
+                      NULL,
+                      cases[0].secret_key,
+                      cases[0].region,
+                      cases[0].when),
+              "destination cannot be NULL" )
+
+    JSVERIFY( FAIL,
+              H5FD_s3comms_signing_key(
+                      key,
+                      NULL,
+                      cases[0].region,
+                      cases[0].when),
+              "secret key cannot be NULL" )
+
+    JSVERIFY( FAIL,
+              H5FD_s3comms_signing_key(
+                      key,
+                      cases[0].secret_key,
+                      NULL,
+                      cases[0].when),
+              "aws region cannot be NULL" )
+
+    JSVERIFY( FAIL,
+              H5FD_s3comms_signing_key(
+                      key,
+                      cases[0].secret_key,
+                      cases[0].region,
+                      NULL),
+              "time string cannot be NULL" )
+
+    free(key);
+    key = NULL;
+
+    PASSED();
+    return 0;
+
+error:
+    if (key != NULL) {
+        free(key);
+    }
+
+    return -1;
+
+} /* end test_signing_key() */
+
+
+/*---------------------------------------------------------------------------
+ *
+ * Function: test_tostringtosign()
+ *
+ * Purpose:
+ *
+ *     Verify that we can get the "string to sign" from a Canonical Request and
+ *     related information.
+ *
+ *     Demonstrate failure cases.
+ *
+ * Return:
+ *
+ *     Success:  0
+ *     Failure: -1
+ *
+ * Programmer: Jacob Smith
+ *             2017-09-13
+ *
+ *---------------------------------------------------------------------------
+ */
+static herr_t
+test_tostringtosign(void)
+{
+    /************************
+     * test-local variables *
+     ************************/
+
+    const char canonreq[]   = "GET\n/test.txt\n\nhost:examplebucket.s3.amazonaws.com\nrange:bytes=0-9\nx-amz-content-sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\nx-amz-date:20130524T000000Z\n\nhost;range;x-amz-content-sha256;x-amz-date\ne3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855";
+    const char iso8601now[] = "20130524T000000Z";
+    const char region[]     = "us-east-1";
+    char s2s[512];
+
+    TESTING("s3comms tostringtosign");
+
+    JSVERIFY( SUCCEED,
+              H5FD_s3comms_tostringtosign(s2s, canonreq, iso8601now, region),
+              "unable to create string to sign" )
+
+    JSVERIFY_STR( "AWS4-HMAC-SHA256\n20130524T000000Z\n20130524/us-east-1/s3/aws4_request\n7344ae5b7ee6c3e7e6b0fe0640412a37625d1fbfff95c48bbb2dc43964946972",
+                 s2s, NULL )
+
+    JSVERIFY( FAIL,
+              H5FD_s3comms_tostringtosign(s2s, NULL, iso8601now, region),
+              "canonical request string cannot be NULL" )
+
+    JSVERIFY( FAIL,
+              H5FD_s3comms_tostringtosign(s2s, canonreq, NULL, region),
+              "time string cannot be NULL" )
+
+    JSVERIFY( FAIL,
+              H5FD_s3comms_tostringtosign(s2s, canonreq, iso8601now, NULL),
+              "aws region cannot be NULL" )
+
+    PASSED();
+    return 0;
+
+error :
+    return -1;
+
+} /* end test_tostringtosign() */
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Function: test_trim()
+ *
+ * Purpose:
+ *
+ *     Define and verify behavior of `H5FD_s3comms_trim()`.
+ *
+ * Programmer: Jacob Smith
+ *             2017-09-14
+ *
+ *----------------------------------------------------------------------------
+ */
+static herr_t
+test_trim(void)
+{
+    /*************************
+     * test-local structures *
+     *************************/
+
+    struct testcase {
+        const char *in;
+        size_t      in_len;
+        const char *exp;
+        size_t      exp_len;
+    };
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    struct testcase cases[] = {
+        {   "block string",
+            12,
+            "block string",
+            12,
+        },
+        {   " \n\r  \t",
+            6,
+            "",
+            0,
+        },
+        {   " \twhite b4",
+            10,
+            "white b4",
+            8,
+        },
+        {   "white after\r\n  ",
+            15,
+            "white after",
+            11,
+        },
+        {   " on\nends\t",
+            9,
+            "on\nends",
+            7,
+        },
+    };
+    char    dest[32];
+    size_t  dest_len = 0;
+    int     i        = 0;
+    int     n_cases  = 5;
+    char   *str      = NULL;
+
+
+
+    TESTING("s3comms trim");
+
+    for (i = 0; i < n_cases; i++) {
+        HDassert(str == NULL);
+        str = (char *)HDmalloc(sizeof(char) * cases[i].in_len);
+        HDassert(str != NULL);
+        HDstrncpy(str, cases[i].in, cases[i].in_len);
+
+        JSVERIFY( SUCCEED,
+                  H5FD_s3comms_trim(dest, str, cases[i].in_len, &dest_len),
+                  NULL )
+        JSVERIFY( cases[i].exp_len, dest_len, cases[i].in )
+        if (dest_len > 0) {
+           JSVERIFY( 0, strncmp(cases[i].exp, dest, dest_len),
+                     cases[i].exp )
+        }
+        free(str);
+        str = NULL;
+    } /* end for each testcase */
+
+    JSVERIFY( SUCCEED, H5FD_s3comms_trim(dest, NULL, 3, &dest_len),
+              "should not fail when trimming a null string" );
+    JSVERIFY( 0, dest_len, "trimming NULL string writes 0 characters" )
+
+    HDassert(str == NULL);
+    str = (char *)HDmalloc(sizeof(char *) * 11);
+    HDassert(str != NULL);
+    memcpy(str, "some text ", 11); /* string with null terminator */
+    JSVERIFY( FAIL, H5FD_s3comms_trim(NULL, str, 10, &dest_len),
+              "destination for trim cannot be NULL" );
+    free(str);
+    str = NULL;
+
+    PASSED();
+    return 0;
+
+error:
+    if (str != NULL) {
+        free(str);
+    }
+    return -1;
+
+} /* end test_trim() */
+
+
+/*----------------------------------------------------------------------------
+ *
+ * Function: test_uriencode()
+ *
+ * Purpose:
+ *
+ *     Define and verify behavior of `H5FD_s3comms_uriencode()`.
+ *
+ * Programmer: Jacob Smith
+ *             2017-09-14
+ *
+ *----------------------------------------------------------------------------
+ */
+static herr_t
+test_uriencode(void)
+{
+    /*************************
+     * test-local structures *
+     *************************/
+
+    struct testcase {
+        const char *str;
+        size_t      s_len;
+        hbool_t     encode_slash;
+        const char *expected;
+    };
+
+    /************************
+     * test-local variables *
+     ************************/
+
+    struct testcase cases[] = {
+        {   "/path/to/resource.jpg",
+            21,
+            FALSE,
+            "/path/to/resource.jpg",
+        },
+        {   "/path/to/resource.jpg",
+            21,
+            TRUE,
+            "%2Fpath%2Fto%2Fresource.jpg",
+        },
+        {   "string got_spaa  ces",
+            20,
+            TRUE,
+            "string%20got_spaa%20%20ces",
+        },
+        {   "sp ac~es/and-sl ash.encoded",
+            27,
+            TRUE,
+            "sp%20ac~es%2Fand-sl%20ash.encoded",
+        },
+        {   "sp ac~es/and-sl ash.unencoded",
+            29,
+            FALSE,
+            "sp%20ac~es/and-sl%20ash.unencoded",
+        },
+        {   "/path/to/resource.txt",
+            0,
+            FALSE,
+            "",
+
+        }
+    };
+    char   *dest         = NULL;
+    size_t  dest_written = 0;
+    int     i            = 0;
+    int     ncases       = 6;
+    size_t  str_len      = 0;
+
+
+
+    TESTING("s3comms uriencode")
+
+    for (i = 0; i < ncases; i++) {
+        str_len = cases[i].s_len;
+        dest = (char *)HDmalloc(sizeof(char) * str_len * 3 + 1);
+        FAIL_IF( dest == NULL )
+
+        JSVERIFY( SUCCEED,
+                  H5FD_s3comms_uriencode(
+                          dest,
+                          cases[i].str,
+                          str_len,
+                          cases[i].encode_slash,
+                          &dest_written),
+                  NULL );
+        JSVERIFY( HDstrlen(cases[i].expected),
+                  dest_written,
+                  NULL )
+        JSVERIFY( 0,
+                  strncmp(dest, cases[i].expected, dest_written),
+                  cases[i].expected );
+
+        free(dest);
+        dest = NULL;
+    } /* end for each testcase */
+
+    /***************
+     * ERROR CASES *
+     ***************/
+
+    dest = (char *)HDmalloc(sizeof(char) * 15);
+    HDassert(dest != NULL);
+
+    JSVERIFY( FAIL,
+              H5FD_s3comms_uriencode(NULL, "word$", 5, false, &dest_written),
+              "destination cannot be NULL" );
+    JSVERIFY( FAIL,
+              H5FD_s3comms_uriencode(dest, NULL, 5, false, &dest_written),
+              "source string cannot be NULL" );
+
+    free(dest);
+    dest = NULL;
+
+    PASSED();
+    return 0;
+
+error:
+    if (dest != NULL) {
+        free(dest);
+    }
+    return -1;
+
+} /* end test_uriencode() */
+
+#endif /* H5_HAVE_ROS3_VFD */
+
+
+
+/*-------------------------------------------------------------------------
+ * Function: main()
+ *
+ * Purpose:
+ *
+ *     Run unit tests for S3 Communications (s3comms).
+ *
+ * Return:
+ *
+ *     Success: 0
+ *     Failure: 1
+ *
+ * Programmer:  Jacob Smith
+ *              2017-10-12
+ *
+ *-------------------------------------------------------------------------
+ */
+int
+main(void)
+{
+#ifdef H5_HAVE_ROS3_VFD
+    int nerrors = 0;
+    const char *bucket_url_env = NULL;
+
+    h5_reset();
+
+#endif /* H5_HAVE_ROS3_VFD */
+
+    HDprintf("Testing S3Communications functionality.\n");
+
+#ifdef H5_HAVE_ROS3_VFD
+
+    /* "clear" profile data strings */
+    s3_test_aws_access_key_id[0]     = '\0';
+    s3_test_aws_secret_access_key[0] = '\0';
+    s3_test_aws_region[0]            = '\0';
+    s3_test_bucket_url[0]            = '\0';
+
+/* TODO: unit/regression test for H5FD_s3comms_load_aws_profile()
+ * requires a few test files and/or manipulation of default path
+ */
+    /* attempt to load test credentials
+     * if unable, certain tests will be skipped
+     */
+    if (SUCCEED == H5FD_s3comms_load_aws_profile(
+            S3_TEST_PROFILE_NAME,
+            s3_test_aws_access_key_id,
+            s3_test_aws_secret_access_key,
+            s3_test_aws_region))
+    {
+        s3_test_credentials_loaded = 1;
+    }
+
+    bucket_url_env = HDgetenv("HDF5_ROS3_TEST_BUCKET_URL");
+    if (bucket_url_env == NULL || bucket_url_env[0] == '\0') {
+        HDprintf("WARNING: S3 bucket url is not defined in enviornment " \
+                 "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n");
+    }
+    else {
+        HDstrncpy(s3_test_bucket_url, bucket_url_env, S3_TEST_MAX_URL_SIZE);
+        s3_test_bucket_defined = TRUE;
+    }
+
+    /* tests ordered rougly by dependence */
+    nerrors += test_macro_format_credential() < 0 ? 1 : 0;
+    nerrors += test_trim()                    < 0 ? 1 : 0;
+    nerrors += test_nlowercase()              < 0 ? 1 : 0;
+    nerrors += test_uriencode()               < 0 ? 1 : 0;
+    nerrors += test_percent_encode_char()     < 0 ? 1 : 0;
+    nerrors += test_bytes_to_hex()            < 0 ? 1 : 0;
+    nerrors += test_HMAC_SHA256()             < 0 ? 1 : 0;
+    nerrors += test_signing_key()             < 0 ? 1 : 0;
+    nerrors += test_hrb_node_set()            < 0 ? 1 : 0;
+    nerrors += test_hrb_init_request()        < 0 ? 1 : 0;
+    nerrors += test_parse_url()               < 0 ? 1 : 0;
+    nerrors += test_aws_canonical_request()   < 0 ? 1 : 0;
+    nerrors += test_tostringtosign()          < 0 ? 1 : 0;
+    nerrors += test_s3r_open()                < 0 ? 1 : 0;
+    nerrors += test_s3r_get_filesize()        < 0 ? 1 : 0;
+    nerrors += test_s3r_read()                < 0 ? 1 : 0;
+
+    if (nerrors) {
+        HDprintf("***** %d S3comms TEST%s FAILED! *****\n",
+                 nerrors,
+                 nerrors > 1 ? "S" : "");
+        return 1;
+    }
+
+    HDprintf("All S3comms tests passed.\n");
+
+    return 0;
+
+#else
+
+    HDprintf("SKIPPED - read-only S3 VFD not built\n");
+    return EXIT_SUCCESS;
+
+#endif /* H5_HAVE_ROS3_VFD */
+
+} /* end main() */
+
diff --git a/test/swmr_addrem_writer.c b/test/swmr_addrem_writer.c
index 01e2ce1..df984b1 100644
--- a/test/swmr_addrem_writer.c
+++ b/test/swmr_addrem_writer.c
@@ -302,7 +302,7 @@ usage(void)
     HDprintf("Defaults to verbose (no '-q' given), flushing every 1000 operations\n");
     HDprintf("('-f 1000'), and will generate a random seed (no -r given).\n");
     HDprintf("\n");
-    HDexit(1);
+    HDexit(EXIT_FAILURE);
 }
 
 int main(int argc, const char *argv[])
@@ -401,7 +401,7 @@ int main(int argc, const char *argv[])
     /* Open file skeleton */
     if((fid = open_skeleton(FILENAME, verbose)) < 0) {
         HDfprintf(stderr, "Error opening skeleton file!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Send a message to indicate "H5Fopen" is complete--releasing the file lock */
@@ -414,7 +414,7 @@ int main(int argc, const char *argv[])
     /* Grow and shrink datasets */
     if(addrem_records(fid, verbose, (unsigned long)nops, (unsigned long)flush_count) < 0) {
         HDfprintf(stderr, "Error adding and removing records from datasets!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
@@ -424,7 +424,7 @@ int main(int argc, const char *argv[])
     /* Clean up the symbols */
     if(shutdown_symbols() < 0) {
         HDfprintf(stderr, "Error releasing symbols!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
@@ -434,7 +434,7 @@ int main(int argc, const char *argv[])
     /* Close objects opened */
     if(H5Fclose(fid) < 0) {
         HDfprintf(stderr, "Error closing file!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     return 0;
diff --git a/test/swmr_generator.c b/test/swmr_generator.c
index 4d8a976..1e00f1d 100644
--- a/test/swmr_generator.c
+++ b/test/swmr_generator.c
@@ -283,7 +283,7 @@ usage(void)
     HDprintf("compression ('-c -1'), v1 b-tree indexing (-i b1), and will generate a random\n");
     HDprintf("seed (no -r given).\n");
     HDprintf("\n");
-    HDexit(1);
+    HDexit(EXIT_FAILURE);
 } /* end usage() */
 
 int main(int argc, const char *argv[])
@@ -377,7 +377,7 @@ int main(int argc, const char *argv[])
     /* Generate file skeleton */
     if(gen_skeleton(FILENAME, verbose, swmr_write, comp_level, index_type, random_seed) < 0) {
         HDfprintf(stderr, "Error generating skeleton file!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     return 0;
diff --git a/test/swmr_reader.c b/test/swmr_reader.c
index c994a71..cb354a7 100644
--- a/test/swmr_reader.c
+++ b/test/swmr_reader.c
@@ -384,7 +384,7 @@ usage(void)
     HDprintf("5 common symbols to poll ('-h 5'), 10 random symbols to poll ('-l 10'),\n");
     HDprintf("and will generate a random seed (no -r given).\n");
     HDprintf("\n");
-    HDexit(1);
+    HDexit(EXIT_FAILURE);
 }
 
 int main(int argc, const char *argv[])
@@ -485,7 +485,7 @@ int main(int argc, const char *argv[])
         HDsnprintf(verbose_name, sizeof(verbose_name), "swmr_reader.out.%u", random_seed);
         if(NULL == (verbose_file = HDfopen(verbose_name, "w"))) {
             HDfprintf(stderr, "Can't open verbose output file!\n");
-            HDexit(1);
+            HDexit(EXIT_FAILURE);
         }
     } /* end if */
 
@@ -508,7 +508,7 @@ int main(int argc, const char *argv[])
     /* Generate dataset names */
     if(generate_symbols() < 0) {
         HDfprintf(stderr, "Error generating symbol names!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Create datatype for creating datasets */
@@ -518,7 +518,7 @@ int main(int argc, const char *argv[])
     /* Reading records from datasets */
     if(read_records(FILENAME, verbose, verbose_file, random_seed, (unsigned long)nseconds, (unsigned)poll_time, (unsigned)ncommon, (unsigned)nrandom) < 0) {
         HDfprintf(stderr, "Error reading records from datasets (random_seed = %u)!\n", random_seed);
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
@@ -528,7 +528,7 @@ int main(int argc, const char *argv[])
     /* Clean up the symbols */
     if(shutdown_symbols() < 0) {
         HDfprintf(stderr, "Error releasing symbols!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
@@ -538,7 +538,7 @@ int main(int argc, const char *argv[])
     /* Close objects created */
     if(H5Tclose(symbol_tid) < 0) {
         HDfprintf(stderr, "Error closing symbol datatype!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     return 0;
diff --git a/test/swmr_remove_reader.c b/test/swmr_remove_reader.c
index b4f0d5b..9ca6045 100644
--- a/test/swmr_remove_reader.c
+++ b/test/swmr_remove_reader.c
@@ -370,7 +370,7 @@ usage(void)
     HDprintf("5 common symbols to poll ('-h 5'), 10 random symbols to poll ('-l 10'),\n");
     HDprintf("and will generate a random seed (no -r given).\n");
     HDprintf("\n");
-    HDexit(1);
+    HDexit(EXIT_FAILURE);
 } 
 
 int main(int argc, const char *argv[])
@@ -480,7 +480,7 @@ int main(int argc, const char *argv[])
     /* Generate dataset names */
     if(generate_symbols() < 0) {
         HDfprintf(stderr, "Error generating symbol names!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Create datatype for creating datasets */
@@ -490,7 +490,7 @@ int main(int argc, const char *argv[])
     /* Reading records from datasets */
     if(read_records(FILENAME, verbose, (unsigned long)nseconds, (unsigned)poll_time, (unsigned)ncommon, (unsigned)nrandom) < 0) {
         HDfprintf(stderr, "Error reading records from datasets!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
@@ -500,7 +500,7 @@ int main(int argc, const char *argv[])
     /* Clean up the symbols */
     if(shutdown_symbols() < 0) {
         HDfprintf(stderr, "Error releasing symbols!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
@@ -510,7 +510,7 @@ int main(int argc, const char *argv[])
     /* Close objects created */
     if(H5Tclose(symbol_tid) < 0) {
         HDfprintf(stderr, "Error closing symbol datatype!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     return 0;
diff --git a/test/swmr_remove_writer.c b/test/swmr_remove_writer.c
index c4f7b6e..e6d23de 100644
--- a/test/swmr_remove_writer.c
+++ b/test/swmr_remove_writer.c
@@ -236,7 +236,7 @@ usage(void)
     HDprintf("Defaults to verbose (no '-q' given), latest format when opening file (no '-o' given),\n");
     HDprintf("flushing every 1000 shrinks ('-f 1000'), and will generate a random seed (no -r given).\n");
     HDprintf("\n");
-    HDexit(1);
+    HDexit(EXIT_FAILURE);
 }
 
 int main(int argc, const char *argv[])
@@ -339,7 +339,7 @@ int main(int argc, const char *argv[])
     /* Open file skeleton */
     if((fid = open_skeleton(FILENAME, verbose, old)) < 0) {
         HDfprintf(stderr, "Error opening skeleton file!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Send a message to indicate "H5Fopen" is complete--releasing the file lock */
@@ -352,7 +352,7 @@ int main(int argc, const char *argv[])
     /* Remove records from datasets */
     if(remove_records(fid, verbose, (unsigned long)nshrinks, (unsigned long)flush_count) < 0) {
         HDfprintf(stderr, "Error removing records from datasets!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
@@ -362,7 +362,7 @@ int main(int argc, const char *argv[])
     /* Clean up the symbols */
     if(shutdown_symbols() < 0) {
         HDfprintf(stderr, "Error releasing symbols!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
@@ -372,7 +372,7 @@ int main(int argc, const char *argv[])
     /* Close objects opened */
     if(H5Fclose(fid) < 0) {
         HDfprintf(stderr, "Error closing file!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     return 0;
diff --git a/test/swmr_sparse_reader.c b/test/swmr_sparse_reader.c
index cd0ece6..6adc6c5 100644
--- a/test/swmr_sparse_reader.c
+++ b/test/swmr_sparse_reader.c
@@ -338,7 +338,7 @@ usage(void)
     HDprintf("Note that the # of records *must* be the same as that supplied to\n");
     HDprintf("swmr_sparse_writer\n");
     HDprintf("\n");
-    HDexit(1);
+    HDexit(EXIT_FAILURE);
 } /* end usage() */
 
 int main(int argc, const char *argv[])
@@ -410,7 +410,7 @@ int main(int argc, const char *argv[])
     /* Generate dataset names */
     if(generate_symbols() < 0) {
         HDfprintf(stderr, "Error generating symbol names!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Create datatype for creating datasets */
@@ -420,7 +420,7 @@ int main(int argc, const char *argv[])
     /* Reading records from datasets */
     if(read_records(FILENAME, verbose, (unsigned long) nrecords, (unsigned)poll_time, (unsigned)reopen_count) < 0) {
         HDfprintf(stderr, "Error reading records from datasets!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
@@ -430,7 +430,7 @@ int main(int argc, const char *argv[])
     /* Clean up the symbols */
     if(shutdown_symbols() < 0) {
         HDfprintf(stderr, "Error releasing symbols!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
@@ -440,7 +440,7 @@ int main(int argc, const char *argv[])
     /* Close objects created */
     if(H5Tclose(symbol_tid) < 0) {
         HDfprintf(stderr, "Error closing symbol datatype!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     return 0;
diff --git a/test/swmr_sparse_writer.c b/test/swmr_sparse_writer.c
index 17d8c61..5173c71 100644
--- a/test/swmr_sparse_writer.c
+++ b/test/swmr_sparse_writer.c
@@ -337,7 +337,7 @@ usage(void)
     HDprintf("Defaults to verbose (no '-q' given) and flushing every 1000 records\n");
     HDprintf("('-f 1000')\n");
     HDprintf("\n");
-    HDexit(1);
+    HDexit(EXIT_FAILURE);
 }
 
 int main(int argc, const char *argv[])
@@ -412,7 +412,7 @@ int main(int argc, const char *argv[])
     /* Open file skeleton */
     if((fid = open_skeleton(FILENAME, verbose)) < 0) {
         HDfprintf(stderr, "Error opening skeleton file!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Send a message to indicate "H5Fopen" is complete--releasing the file lock */
@@ -425,7 +425,7 @@ int main(int argc, const char *argv[])
     /* Append records to datasets */
     if(add_records(fid, verbose, (unsigned long)nrecords, (unsigned long)flush_count) < 0) {
         HDfprintf(stderr, "Error appending records to datasets!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
@@ -435,7 +435,7 @@ int main(int argc, const char *argv[])
     /* Clean up the symbols */
     if(shutdown_symbols() < 0) {
         HDfprintf(stderr, "Error releasing symbols!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
@@ -445,7 +445,7 @@ int main(int argc, const char *argv[])
     /* Close objects opened */
     if(H5Fclose(fid) < 0) {
         HDfprintf(stderr, "Error closing file!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     return 0;
diff --git a/test/swmr_start_write.c b/test/swmr_start_write.c
index 0ee382d..c4222ad 100644
--- a/test/swmr_start_write.c
+++ b/test/swmr_start_write.c
@@ -357,7 +357,7 @@ usage(void)
     HDprintf("v1 b-tree indexing (-i b1), compression ('-c -1'),\n");
     HDprintf("will generate a random seed (no -r given), and verbose (no '-q' given)\n");
     HDprintf("\n");
-    HDexit(1);
+    HDexit(EXIT_FAILURE);
 } /* usage() */
 
 /*
@@ -468,7 +468,7 @@ int main(int argc, const char *argv[])
         HDsnprintf(verbose_name, sizeof(verbose_name), "swmr_writer.out.%u", random_seed);
         if(NULL == (verbose_file = HDfopen(verbose_name, "w"))) {
             HDfprintf(stderr, "Can't open verbose output file!\n");
-            HDexit(1);
+            HDexit(EXIT_FAILURE);
         }
     } /* end if */
 
@@ -487,7 +487,7 @@ int main(int argc, const char *argv[])
     /* Create the test file */
     if((fid = create_file(FILENAME, verbose, verbose_file, random_seed)) < 0) {
         HDfprintf(stderr, "Error creating the file...\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     }
 
     /* Emit informational message */
@@ -501,13 +501,13 @@ int main(int argc, const char *argv[])
     /* Create the datasets in the file */
     if(create_datasets(fid, comp_level, verbose, verbose_file, index_type) < 0) {
         HDfprintf(stderr, "Error creating datasets...\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     }
 
     /* Enable SWMR writing mode */
     if(H5Fstart_swmr_write(fid) < 0) {
         HDfprintf(stderr, "Error starting SWMR writing mode...\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     }
 
     /* Send a message to indicate "H5Fopen" is complete--releasing the file lock */
@@ -520,7 +520,7 @@ int main(int argc, const char *argv[])
     /* Append records to datasets */
     if(add_records(fid, verbose, verbose_file, (unsigned long)nrecords, (unsigned long)flush_count) < 0) {
         HDfprintf(stderr, "Error appending records to datasets!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
@@ -530,7 +530,7 @@ int main(int argc, const char *argv[])
     /* Clean up the symbols */
     if(shutdown_symbols() < 0) {
         HDfprintf(stderr, "Error releasing symbols!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
@@ -540,7 +540,7 @@ int main(int argc, const char *argv[])
     /* Close objects opened */
     if(H5Fclose(fid) < 0) {
         HDfprintf(stderr, "Error closing file!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     return 0;
diff --git a/test/swmr_writer.c b/test/swmr_writer.c
index 6df7355..4c3e64a 100644
--- a/test/swmr_writer.c
+++ b/test/swmr_writer.c
@@ -291,7 +291,7 @@ usage(void)
     HDprintf("Defaults to verbose (no '-q' given), latest format when opening file (no '-o' given),\n");
     HDprintf("flushing every 10000 records ('-f 10000'), and will generate a random seed (no -r given).\n");
     HDprintf("\n");
-    HDexit(1);
+    HDexit(EXIT_FAILURE);
 }
 
 int main(int argc, const char *argv[])
@@ -379,7 +379,7 @@ int main(int argc, const char *argv[])
         HDsnprintf(verbose_name, sizeof(verbose_name), "swmr_writer.out.%u", random_seed);
         if(NULL == (verbose_file = HDfopen(verbose_name, "w"))) {
             HDfprintf(stderr, "Can't open verbose output file!\n");
-            HDexit(1);
+            HDexit(EXIT_FAILURE);
         }
     } /* end if */
 
@@ -408,7 +408,7 @@ int main(int argc, const char *argv[])
     /* Open file skeleton */
     if((fid = open_skeleton(FILENAME, verbose, verbose_file, random_seed, old)) < 0) {
         HDfprintf(stderr, "Error opening skeleton file!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Send a message to indicate "H5Fopen" is complete--releasing the file lock */
@@ -421,7 +421,7 @@ int main(int argc, const char *argv[])
     /* Append records to datasets */
     if(add_records(fid, verbose, verbose_file, (unsigned long)nrecords, (unsigned long)flush_count) < 0) {
         HDfprintf(stderr, "Error appending records to datasets!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
@@ -431,7 +431,7 @@ int main(int argc, const char *argv[])
     /* Clean up the symbols */
     if(shutdown_symbols() < 0) {
         HDfprintf(stderr, "Error releasing symbols!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
@@ -441,7 +441,7 @@ int main(int argc, const char *argv[])
     /* Close objects opened */
     if(H5Fclose(fid) < 0) {
         HDfprintf(stderr, "Error closing file!\n");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     return 0;
diff --git a/test/test_usecases.sh.in b/test/test_usecases.sh.in
index 8bc2078..49868ca 100644
--- a/test/test_usecases.sh.in
+++ b/test/test_usecases.sh.in
@@ -40,7 +40,7 @@ fi
 # Define symbols
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
-EXIT_VALUE=$EXIT_SUCCESS	# Default all tests succeed
+EXIT_VALUE=$EXIT_SUCCESS    # Default all tests succeed
 RESULT_PASSED=" PASSED"
 RESULT_FAILED="*FAILED*"
 RESULT_SKIP="-SKIP-"
@@ -97,17 +97,17 @@ TOOLTEST() {
     cat $actual_err >> $actual
 
     if [ $exit_code -eq 0 ];then
-	echo "$RESULT_PASSED"
-	test yes = "$verbose" && sed 's/^/    /' < $actual
+    echo "$RESULT_PASSED"
+    test yes = "$verbose" && sed 's/^/    /' < $actual
     else
-	echo "$RESULT_FAILED"
-	nerrors="`expr $nerrors + 1`"
-	test yes = "$verbose" && sed 's/^/    /' < $actual
+    echo "$RESULT_FAILED"
+    nerrors="`expr $nerrors + 1`"
+    test yes = "$verbose" && sed 's/^/    /' < $actual
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-	rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
+    rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
     fi
 }
 
@@ -122,7 +122,9 @@ for FILE in use_*; do
     case "$FILE" in
         *.o) continue ;;    ## don't copy the .o files
     esac
-    cp $FILE usecases_test
+    if test -f "$FILE" ; then
+        cp $FILE usecases_test
+    fi
 done
 
 # With the --disable-shared option, swmr program files are built in the test
@@ -131,7 +133,14 @@ done
 # always be copied, swmr files in .libs should be copied only if they exists.
 if [ -f .libs/use_append_chunk ]; then
     mkdir usecases_test/.libs
-    cp .libs/use_* usecases_test/.libs
+    for FILE in .libs/use_*; do
+        case "$FILE" in
+            *.o) continue ;;    ## don't copy the .o files
+        esac
+        if test -f "$FILE" ; then
+            cp $FILE usecases_test/.libs
+        fi
+    done
     cp .libs/twriteorder usecases_test/.libs
 fi
 
@@ -176,10 +185,10 @@ for p in $USECASES_PROGRAMS; do
     TOOLTEST ./$p -l w
     TOOLTEST ./$p -l r
     # use case 1.9, testing with multi-planes chunks
-    TOOLTEST ./$p -z 256 -y 5	# 5 planes chunks
+    TOOLTEST ./$p -z 256 -y 5    # 5 planes chunks
     # cleanup temp datafile
     if test -z "$HDF5_NOCLEANUP"; then
-	rm -f $p.h5
+    rm -f $p.h5
     fi
 done
 
diff --git a/test/testflushrefresh.sh.in b/test/testflushrefresh.sh.in
index ca46dcb..3cdf10f 100644
--- a/test/testflushrefresh.sh.in
+++ b/test/testflushrefresh.sh.in
@@ -20,7 +20,7 @@
 # the verification of this feature needs to occur in separate processes
 # from the one in which the file is being manipulated in. (i.e., we have
 # a single writer process, and various reader processes spawning off
-# and doing the verification that individual objects are being 
+# and doing the verification that individual objects are being
 # correctly flushed).
 #
 # Programmer:
@@ -80,23 +80,30 @@ fi
 # HDF5 has several tests that create and delete signal files to communicate
 # between processes, and it seems that even though the names of the files are
 # different, occasionally the wrong file is deleted, interrupting the flow of
-# the test.  Running each of these tests in its own directory should eliminate 
+# the test.  Running each of these tests in its own directory should eliminate
 # the problem.
 mkdir flushrefresh_test
 cp flushrefresh flushrefresh_test
 
 # With the --disable-shared option, flushrefresh is built in the test directory,
-# otherwise it is in test/.libs with a wrapper script named flushrefresh in 
-# the test directory.  test/flushrefresh should always be copied, 
+# otherwise it is in test/.libs with a wrapper script named flushrefresh in
+# the test directory.  test/flushrefresh should always be copied,
 # .libs/flushrefresh should be copied only if it exists.
 if [ -f .libs/flushrefresh ]; then
     mkdir flushrefresh_test/.libs
-    cp .libs/flushrefresh flushrefresh_test/.libs
+    for FILE in .libs/flushrefresh*; do
+        case "$FILE" in
+            *.o) continue ;;    ## don't copy the .o files
+        esac
+        if test -f "$FILE" ; then
+            cp $FILE flushrefresh_test/.libs
+        fi
+    done
 fi
 cd flushrefresh_test
 
 # =================================================
-# Set up/initialize some variables to be used later 
+# Set up/initialize some variables to be used later
 # =================================================
 testfile=flushrefresh.h5
 startsignal=flushrefresh_VERIFICATION_START
@@ -119,13 +126,13 @@ pid_main=$!
 # =======================================
 
 until [ $verification_done -eq 1 ]; do
-   
+
   # Wait for signal from test program that verification routine can run.
   before=`TimeStamp`
   until [ -s $startsignal ]; do
     after=`TimeStamp`
     timediff=`expr $after - $before`
-    if [ $timediff -gt $timeout_length ]; then   
+    if [ $timediff -gt $timeout_length ]; then
         nerrors=`expr $nerrors + 1`
         timedout=1
         break
@@ -165,7 +172,7 @@ if [ $timedout -eq 0 ]; then
     until [ -s $startsignal ]; do
       after=`TimeStamp`
       timediff=`expr $after - $before`
-      if [ $timediff -gt $timeout_length ]; then   
+      if [ $timediff -gt $timeout_length ]; then
           nerrors=`expr $nerrors + 1`
           timedout=1
           break
diff --git a/test/testframe.c b/test/testframe.c
index 68c66ec..3c2a335 100644
--- a/test/testframe.c
+++ b/test/testframe.c
@@ -90,7 +90,7 @@ AddTest(const char *TheName, void (*TheCall) (void), void (*Cleanup) (void), con
         /* Reallocate array */
         if(NULL == (newTest = (TestStruct *)HDrealloc(Test, newAlloc * sizeof(TestStruct)))) {
             HDprintf("Out of memory for tests, Index = %u, TestAlloc = %u, newAlloc = %u\n", Index, TestAlloc, newAlloc);
-            exit(EXIT_FAILURE);
+            HDexit(EXIT_FAILURE);
         } /* end if */
 
         /* Update info */
diff --git a/test/testswmr.sh.in b/test/testswmr.sh.in
index f81a7d7..a41947e 100644
--- a/test/testswmr.sh.in
+++ b/test/testswmr.sh.in
@@ -131,9 +131,10 @@ for FILE in swmr*; do
     case "$FILE" in
         *.o) continue ;;    ## don't copy the .o files
     esac
-    cp $FILE swmr_test
+    if test -f "$FILE" ; then
+        cp $FILE swmr_test
+    fi
 done
-cp swmr* swmr_test
 
 # With the --disable-shared option, swmr program files are built in the test
 # directory, otherwise they are in test/.libs with a corresponding wrapper
@@ -145,7 +146,9 @@ if [ -f .libs/swmr ]; then
         case "$FILE" in
             *.o) continue ;;    ## don't copy the .o files
         esac
-        cp $FILE swmr_test/.libs
+        if test -f "$FILE" ; then
+            cp $FILE swmr_test/.libs
+        fi
     done
 fi
 
@@ -153,7 +156,7 @@ cd swmr_test
 
 
 # Loop over index types
-for index_type in "-i ea" "-i b2" 
+for index_type in "-i ea" "-i b2"
 do
     # Try with and without compression
     for compress in "" "-c 5"
diff --git a/test/testvdsswmr.sh.in b/test/testvdsswmr.sh.in
index 32af072..28abcf5 100644
--- a/test/testvdsswmr.sh.in
+++ b/test/testvdsswmr.sh.in
@@ -117,7 +117,9 @@ for FILE in vds_swmr*; do
     case "$FILE" in
         *.o) continue ;;    ## don't copy the .o files
     esac
-    cp $FILE vds_swmr_test
+    if test -f "$FILE" ; then
+        cp $FILE vds_swmr_test
+    fi
 done
 
 # With the --disable-shared option, swmr program files are built in the test
@@ -126,7 +128,14 @@ done
 # always be copied, swmr files in .libs should be copied only if they exists.
 if [ -f .libs/vds_swmr_writer ]; then
     mkdir vds_swmr_test/.libs
-    cp .libs/vds_swmr* vds_swmr_test/.libs
+    for FILE in .libs/vds_swmr*; do
+        case "$FILE" in
+            *.o) continue ;;    ## don't copy the .o files
+        esac
+        if test -f "$FILE" ; then
+            cp $FILE vds_swmr_test/.libs
+        fi
+    done
 fi
 
 cd vds_swmr_test
diff --git a/test/twriteorder.c b/test/twriteorder.c
index 60ee384..b104b72 100644
--- a/test/twriteorder.c
+++ b/test/twriteorder.c
@@ -134,7 +134,7 @@ parse_option(int argc, char * const argv[])
         switch (c) {
             case 'h':
                 usage(progname_g);
-                HDexit(0);
+                HDexit(EXIT_SUCCESS);
                 break;
             case 'b':   /* number of planes to write/read */
                 if ((blocksize_g = atoi(optarg)) <= 0) {
@@ -407,12 +407,12 @@ main(int argc, char *argv[])
             HDprintf("%d: launch reader process\n", mypid);
             if (read_wo_file() < 0) {
                 HDfprintf(stderr, "read_wo_file encountered error\n");
-                HDexit(1);
+                HDexit(EXIT_FAILURE);
             }
 
             /* Reader is done. Clean up by removing the data file */
             HDremove(DATAFILE);
-            HDexit(0);
+            HDexit(EXIT_SUCCESS);
         }
     }
 
diff --git a/test/unlink.c b/test/unlink.c
index f79aa29..6825dec 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -2421,17 +2421,13 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    main
  *
- * Purpose:    Test unlinking operations
+ * Purpose:     Test unlinking operations
  *
- * Return:    Success:    zero
- *
- *        Failure:    non-zero
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *
  * Programmer:    Robb Matzke
  *              Friday, September 25, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 int
@@ -2551,16 +2547,16 @@ main(void)
 
     if (nerrors) {
         HDprintf("***** %d FAILURE%s! *****\n", nerrors, 1==nerrors?"":"S");
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
     }
 
     HDputs("All unlink tests passed.");
 
     h5_cleanup(FILENAME, fapl);
 
-    return 0;
+    HDexit(EXIT_SUCCESS);
 
 error:
-    return 1;
-}
+    HDexit(EXIT_FAILURE);
+} /* end main() */
 
diff --git a/test/use_append_chunk.c b/test/use_append_chunk.c
index 4e8c672..6b34f1e 100644
--- a/test/use_append_chunk.c
+++ b/test/use_append_chunk.c
@@ -174,9 +174,9 @@ main(int argc, char *argv[])
             HDprintf("%d: launch reader process\n", mypid);
             if (read_uc_file(send_wait) < 0){
                 HDfprintf(stderr, "read_uc_file encountered error\n");
-                HDexit(1);
+                HDexit(EXIT_FAILURE);
             }
-            HDexit(0);
+            HDexit(EXIT_SUCCESS);
         }
     }
 
diff --git a/test/use_append_mchunks.c b/test/use_append_mchunks.c
index 0414628..b7d45a4 100644
--- a/test/use_append_mchunks.c
+++ b/test/use_append_mchunks.c
@@ -167,9 +167,9 @@ main(int argc, char *argv[])
             HDprintf("%d: launch reader process\n", mypid);
             if (read_uc_file(send_wait) < 0){
                 HDfprintf(stderr, "read_uc_file encountered error\n");
-                HDexit(1);
+                HDexit(EXIT_FAILURE);
             }
-            HDexit(0);
+            HDexit(EXIT_SUCCESS);
         }
     }
 
diff --git a/test/use_common.c b/test/use_common.c
index b600dca..9effa06 100644
--- a/test/use_common.c
+++ b/test/use_common.c
@@ -63,7 +63,7 @@ parse_option(int argc, char * const argv[])
     switch (c) {
     case 'h':
         usage(progname_g);
-        exit(0);
+        HDexit(EXIT_SUCCESS);
         break;
     case 'f':    /* usecase data file name */
         UC_opts.filename = optarg;
diff --git a/test/use_disable_mdc_flushes.c b/test/use_disable_mdc_flushes.c
index b349269..9cd202c 100644
--- a/test/use_disable_mdc_flushes.c
+++ b/test/use_disable_mdc_flushes.c
@@ -102,7 +102,7 @@ parse_option(int argc, char * const argv[])
     switch (c) {
     case 'h':
         usage(progname_g);
-        exit(0);
+        HDexit(EXIT_SUCCESS);
         break;
     case 'f':    /* usecase data file name */
         filename_g = optarg;
@@ -540,7 +540,7 @@ int
 main(void)
 {
     HDfprintf(stderr, "Non-POSIX platform. Skipping.\n");
-    return EXIT_SUCCESS;
+    HDexit(EXIT_SUCCESS);
 } /* end main() */
 
 #endif /* H5_HAVE_FORK */
diff --git a/test/vfd.c b/test/vfd.c
index 8e46850..68fe0bd 100644
--- a/test/vfd.c
+++ b/test/vfd.c
@@ -58,6 +58,7 @@ const char *FILENAME[] = {
     "stdio_file",        /*7*/
     "windows_file",      /*8*/
     "new_multi_file_v16",/*9*/
+    "ro_s3_file",        /*10*/
     NULL
 };
 
@@ -1917,6 +1918,104 @@ error:
 
 
 /*-------------------------------------------------------------------------
+ * Function:    test_ros3
+ *
+ * Purpose:     Tests the file handle interface for the ROS3 driver
+ *
+ *              As the ROS3 driver is 1) read only, 2) requires access
+ *              to an S3 server (minio for now), this test is quite
+ *              different from the other tests.
+ *
+ *              For now, test only fapl & flags.  Extend as the
+ *              work on the VFD continues.
+ *
+ * Return:      Success:        0
+ *              Failure:        -1
+ *
+ * Programmer:  John Mainzer
+ *              7/12/17
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+test_ros3(void)
+{
+#ifdef H5_HAVE_ROS3_VFD
+    hid_t       fid = -1;                   /* file ID                      */
+    hid_t       fapl_id = -1;               /* file access property list ID */
+    hid_t       fapl_id_out = -1;           /* from H5Fget_access_plist     */
+    hid_t       driver_id = -1;             /* ID for this VFD              */
+    unsigned long driver_flags = 0;         /* VFD feature flags            */
+    char        filename[1024];             /* filename                     */
+    void        *os_file_handle = NULL;     /* OS file handle               */
+    hsize_t     file_size;                  /* file size                    */
+    H5FD_ros3_fapl_t test_ros3_fa;
+    H5FD_ros3_fapl_t ros3_fa_0 =
+    {
+        /* version      = */ H5FD_CURR_ROS3_FAPL_T_VERSION,
+        /* authenticate = */ FALSE,
+        /* aws_region   = */ "",
+        /* secret_id    = */ "",
+        /* secret_key   = */ "plugh",
+    };
+#endif /*H5_HAVE_ROS3_VFD */
+
+    TESTING("Read-only S3 file driver");
+
+#ifndef H5_HAVE_ROS3_VFD
+    SKIPPED();
+    return 0;
+#else /* H5_HAVE_ROS3_VFD */
+
+    /* Set property list and file name for ROS3 driver. */
+    if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+        TEST_ERROR;
+
+    if(H5Pset_fapl_ros3(fapl_id, &ros3_fa_0) < 0)
+        TEST_ERROR;
+
+    /* verify that the ROS3 FAPL entry is set as expected */
+    if(H5Pget_fapl_ros3(fapl_id, &test_ros3_fa) < 0)
+        TEST_ERROR;
+
+    /* need a macro to compare instances of H5FD_ros3_fapl_t */
+    if((test_ros3_fa.version != ros3_fa_0.version) ||
+       (test_ros3_fa.authenticate != ros3_fa_0.authenticate) ||
+       (strcmp(test_ros3_fa.aws_region, ros3_fa_0.aws_region) != 0) ||
+       (strcmp(test_ros3_fa.secret_id, ros3_fa_0.secret_id) != 0) ||
+       (strcmp(test_ros3_fa.secret_key, ros3_fa_0.secret_key) != 0))
+        TEST_ERROR;
+
+    h5_fixname(FILENAME[10], fapl_id, filename, sizeof(filename));
+
+    /* Check that the VFD feature flags are correct */
+    if ((driver_id = H5Pget_driver(fapl_id)) < 0)
+        TEST_ERROR;
+
+    if (H5FDdriver_query(driver_id, &driver_flags) < 0)
+        TEST_ERROR;
+
+    if(!(driver_flags & H5FD_FEAT_DATA_SIEVE))
+        TEST_ERROR
+
+    /* Check for extra flags not accounted for above */
+    if(driver_flags != (H5FD_FEAT_DATA_SIEVE))
+        TEST_ERROR
+
+    PASSED();
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Pclose(fapl_id);
+        H5Pclose(fapl_id_out);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    return -1;
+#endif /* H5_HAVE_ROS3_VFD */
+} /* end test_ros3() */
+
+/*-------------------------------------------------------------------------
  * Function:    main
  *
  * Purpose:     Tests the basic features of Virtual File Drivers
@@ -1948,6 +2047,7 @@ main(void)
     nerrors += test_log() < 0            ? 1 : 0;
     nerrors += test_stdio() < 0          ? 1 : 0;
     nerrors += test_windows() < 0        ? 1 : 0;
+    nerrors += test_ros3() < 0           ? 1 : 0;
 
     if(nerrors) {
         HDprintf("***** %d Virtual File Driver TEST%s FAILED! *****\n",