Basic alignment with async branch (#115) (#137)

* Basic alignment with async branch - trivial changes to reduce clutter in overall diff.

* Update minor error code to reflect change within library

* Update the error output to match library

6 files changed, 18 insertions, 28 deletions

diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c
index 3e92f18..536d312 100644
--- a/testpar/t_2Gio.c
+++ b/testpar/t_2Gio.c
@@ -4220,7 +4220,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
     herr_t      ret;
 #ifdef LATER /* fletcher32 */
     H5Z_filter_t filter_info;
-#endif       /* LATER */
+#endif /* LATER */
     char message[256];
 
     /* Set up MPI parameters */
@@ -4248,7 +4248,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
 
             ret = H5Pset_fletcher32(dcpl);
             VRFY((ret >= 0),"set filter (flecher32) succeeded");
-#endif       /* LATER */
+#endif /* LATER */
     }
     else  {
         VRFY(0, "Unexpected mode, only test for TEST_FILTERS_READ.");
@@ -4290,7 +4290,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
     test_name = "Broken Collective I/O - Filter is required";
     no_collective_cause_local_expected = H5D_MPIO_FILTERS;
     no_collective_cause_global_expected = H5D_MPIO_FILTERS;
-#endif       /* LATER */
+#endif /* LATER */
 
     /* Get the file dataspace */
     file_space = H5Dget_space(dataset);
@@ -4421,9 +4421,9 @@ no_collective_cause_tests(void)
     test_no_collective_cause_mode(TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_COMPACT);
     test_no_collective_cause_mode(TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_EXTERNAL);
 #ifdef LATER /* fletcher32 */
-             /* TODO: use this instead of below TEST_FILTERS_READ when H5Dcreate and
-              * H5Dwrite is ready for mpio + filter feature.
-              */
+    /* TODO: use this instead of below TEST_FILTERS_READ when H5Dcreate and
+     * H5Dwrite is ready for mpio + filter feature.
+     */
     /* test_no_collective_cause_mode (TEST_FILTERS); */
     test_no_collective_cause_mode_filter(TEST_FILTERS_READ);
 #endif /* LATER */
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index e0e03f2..3989f2e 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -2465,7 +2465,7 @@ datum_notify(H5C_notify_action_t action, void *thing)
                         HDfprintf(stdout, "%d:%s: Bad data in read req reply.\n", world_mpi_rank, FUNC);
                     }
 
-#if 0  /* This has been useful debugging code -- keep it for now. */
+#if 0 /* This has been useful debugging code -- keep it for now. */
                 if ( mssg.req != READ_REQ_REPLY_CODE ) {
 
                 HDfprintf(stdout,
@@ -6880,7 +6880,7 @@ main(int argc, char **argv)
     H5open();
 
     express_test = do_express_test();
-#if 0  /* JRM */
+#if 0 /* JRM */
     express_test = 0;
 #endif /* JRM */
     if (express_test) {
diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c
index 776da2e..770c1dd 100644
--- a/testpar/t_cache_image.c
+++ b/testpar/t_cache_image.c
@@ -3918,9 +3918,8 @@ main(int argc, char **argv)
      * hang in the atexit post processing in which it may try to make MPI
      * calls.  By then, MPI calls may not work.
      */
-    if (H5dont_atexit() < 0) {
+    if (H5dont_atexit() < 0)
         HDprintf("%d:Failed to turn off atexit processing. Continue.\n", mpi_rank);
-    };
 
     H5open();
 
@@ -3932,11 +3931,8 @@ main(int argc, char **argv)
     }
 
     if (mpi_size < 2) {
-
-        if (mpi_rank == 0) {
-
+        if (mpi_rank == 0)
             HDprintf("    Need at least 2 processes.  Exiting.\n");
-        }
         goto finish;
     }
 
@@ -3991,12 +3987,11 @@ main(int argc, char **argv)
     MPI_Barrier(MPI_COMM_WORLD);
 
     nerrs += verify_cache_image_RO(0, H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY, mpi_rank);
-#if 1
     nerrs += verify_cache_image_RO(1, H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED, mpi_rank);
     nerrs += verify_cache_image_RW(0, H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY, mpi_rank);
     nerrs += verify_cache_image_RW(1, H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED, mpi_rank);
     nerrs += smoke_check_1(comm, info, mpi_rank, mpi_size);
-#endif
+
 finish:
 
     /* make sure all processes are finished before final report, cleanup
@@ -4005,19 +4000,14 @@ finish:
     MPI_Barrier(MPI_COMM_WORLD);
 
     if (mpi_rank == 0) { /* only process 0 reports */
-        HDsleep(10);
         HDprintf("===================================\n");
-        if (nerrs > 0) {
+        if (nerrs > 0)
             HDprintf("***metadata cache image tests detected %d failures***\n", nerrs);
-        }
-        else {
+        else
             HDprintf("metadata cache image tests finished with no failures\n");
-        }
         HDprintf("===================================\n");
     }
 
-    /* takedown_derived_types(); */
-
     /* close HDF5 library */
     H5close();
 
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index ec1ecf7..aa51440 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -3985,9 +3985,9 @@ no_collective_cause_tests(void)
     test_no_collective_cause_mode(TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_COMPACT);
     test_no_collective_cause_mode(TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_EXTERNAL);
 #ifdef LATER /* fletcher32 */
-             /* TODO: use this instead of below TEST_FILTERS_READ when H5Dcreate and
-              * H5Dwrite is ready for mpio + filter feature.
-              */
+    /* TODO: use this instead of below TEST_FILTERS_READ when H5Dcreate and
+     * H5Dwrite is ready for mpio + filter feature.
+     */
     /* test_no_collective_cause_mode (TEST_FILTERS); */
     test_no_collective_cause_mode_filter(TEST_FILTERS_READ);
 #endif /* LATER */
diff --git a/testpar/t_filter_read.c b/testpar/t_filter_read.c
index 10d6c27..a50cb24 100644
--- a/testpar/t_filter_read.c
+++ b/testpar/t_filter_read.c
@@ -346,7 +346,7 @@ test_filter_read(void)
             VRFY(hrc >= 0, "H5Pclose");
         }
 #endif /* H5_HAVE_FILTER_SZIP */
-    }  /* end for */
+    } /* end for */
 
     /*----------------------------------------------------------
      * STEP 4: Test shuffling by itself.
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index 1c5e875..be3f6e1 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -578,7 +578,7 @@ hs_dr_pio_test__takedown(struct hs_dr_pio_test_vars_t *tv_ptr)
 {
 #if HS_DR_PIO_TEST__TAKEDOWN__DEBUG
     const char *fcnName = "hs_dr_pio_test__takedown()";
-#endif               /* HS_DR_PIO_TEST__TAKEDOWN__DEBUG */
+#endif /* HS_DR_PIO_TEST__TAKEDOWN__DEBUG */
     int    mpi_rank; /* needed by the VRFY macro */
     herr_t ret;      /* Generic return value */