So that I can use PASSED(); anywhere a statement can go, #define PASSED() with

a do-while wrapper.

16 files changed, 260 insertions, 261 deletions

diff --git a/hl/test/test_file_image.c b/hl/test/test_file_image.c
index fd2d0d2..504a3f5 100644
--- a/hl/test/test_file_image.c
+++ b/hl/test/test_file_image.c
@@ -467,7 +467,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
             FAIL_PUTS_ERROR("H5Dclose() failed");
     } /* end for */
 
-    PASSED()
+    PASSED();
 
     HL_TESTING2("close file images");
 
diff --git a/test/cache.c b/test/cache.c
index cf6ab2f..e2a0b85 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -13885,7 +13885,7 @@ check_move_entry(unsigned paged)
         takedown_cache(file_ptr, FALSE, FALSE);
 
     if(pass)
-        PASSED()
+        PASSED();
     else
         H5_FAILED()
 
@@ -17017,7 +17017,7 @@ check_move_entry_errs(unsigned paged)
         takedown_cache(file_ptr, FALSE, FALSE);
 
     if(pass)
-        PASSED()
+        PASSED();
     else {
         H5_FAILED()
 
@@ -30672,7 +30672,7 @@ done:
         takedown_cache(file_ptr, FALSE, FALSE);
 
     if(pass)
-        PASSED()
+        PASSED();
     else {
         H5_FAILED();
         HDfprintf(stdout, "%s.\n", failure_mssg);
@@ -30895,7 +30895,7 @@ done:
         takedown_cache(file_ptr, FALSE, FALSE);
 
     if(pass)
-        PASSED()
+        PASSED();
     else {
         H5_FAILED();
         HDfprintf(stdout, "%s.\n", failure_mssg);
@@ -33467,7 +33467,7 @@ done:
         takedown_cache(file_ptr, FALSE, FALSE);
 
     if(pass)
-        PASSED()
+        PASSED();
     else {
         H5_FAILED();
         HDfprintf(stdout, "%s.\n", failure_mssg);
@@ -33670,7 +33670,7 @@ done:
     takedown_cache(file_ptr, FALSE, FALSE);
 
     if(pass)
-        PASSED()
+        PASSED();
     else {
         H5_FAILED();
         HDfprintf(stdout, "%s.\n", failure_mssg);
diff --git a/test/dtransform.c b/test/dtransform.c
index 6f7e8a4..bc61232 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -700,7 +700,7 @@ test_trivial(const hid_t dxpl_id_simple)
                 FAIL_PUTS_ERROR("    ERROR: Conversion failed to match computed data\n");
         }
 
-    PASSED()
+    PASSED();
 
     TESTING("data transform, trivial transform, with type conversion")
     if(H5Dread(dset_id_float, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
@@ -712,7 +712,7 @@ test_trivial(const hid_t dxpl_id_simple)
                 FAIL_PUTS_ERROR("    ERROR: Conversion failed to match computed data\n")
         }
 
-    PASSED()
+    PASSED();
 
     return 0;
 error:
@@ -739,7 +739,7 @@ test_getset(const hid_t dxpl_id_c_to_f)
     if(HDstrcmp(c_to_f, ptrgetTest) != 0)
         FAIL_PUTS_ERROR("    ERROR: Data transform failed to match what was set\n")
 
-    PASSED()
+    PASSED();
 
     HDfree(ptrgetTest);
     ptrgetTest = NULL;
@@ -759,7 +759,7 @@ test_getset(const hid_t dxpl_id_c_to_f)
                 FAIL_PUTS_ERROR("    ERROR: Conversion failed to match computed data\n")
         }
 
-    PASSED()
+    PASSED();
 
     TESTING("H5Pget_data_transform, after resetting transform property")
 
@@ -770,7 +770,7 @@ test_getset(const hid_t dxpl_id_c_to_f)
     if(HDstrcmp(simple, ptrgetTest) != 0)
         FAIL_PUTS_ERROR("    ERROR: Data transform failed to match what was set\n")
 
-    PASSED()
+    PASSED();
 
     HDfree(ptrgetTest);
     ptrgetTest = NULL;
@@ -806,7 +806,7 @@ test_set(void)
     H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
 
     if(H5Pget_data_transform(dxpl_id, ptrgetTest, HDstrlen(str) + 1) < 0)
-        PASSED()
+        PASSED();
     else
         FAIL_PUTS_ERROR("    ERROR: Data transform get before set succeeded (it shouldn't have)\n");
 
diff --git a/test/earray.c b/test/earray.c
index 2955d4a..0771321 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -768,7 +768,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
         TEST_ERROR
     } /* end if */
 
-    PASSED()
+    PASSED();
 }
 #else /* NDEBUG */
     SKIPPED();
@@ -784,7 +784,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
     if(create_array(f, cparam, &ea, &ea_addr, NULL) < 0)
         TEST_ERROR
 
-    PASSED()
+    PASSED();
 
     /* Verify the creation parameters */
     TESTING("verify array creation parameters");
@@ -798,7 +798,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -868,7 +868,7 @@ test_reopen(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -972,7 +972,7 @@ test_open_twice(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -1112,7 +1112,7 @@ test_open_twice_diff(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tpa
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -1233,7 +1233,7 @@ test_delete_open(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -2234,7 +2234,7 @@ test_set_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -2391,7 +2391,7 @@ test_skip_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
diff --git a/test/farray.c b/test/farray.c
index 752a63f..a592452 100644
--- a/test/farray.c
+++ b/test/farray.c
@@ -500,7 +500,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE
         TEST_ERROR
     } /* end if */
 
-    PASSED()
+    PASSED();
 }
 #else /* NDEBUG */
     SKIPPED();
@@ -516,7 +516,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE
     if(create_array(f, cparam, &fa, &fa_addr) < 0)
         TEST_ERROR
 
-    PASSED()
+    PASSED();
 
     /* Verify the creation parameters */
     TESTING("verify array creation parameters");
@@ -530,7 +530,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -597,7 +597,7 @@ test_reopen(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam)
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -696,7 +696,7 @@ test_open_twice(hid_t fapl_id, H5FA_create_t *cparam, farray_test_param_t *tpara
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -829,7 +829,7 @@ test_open_twice_diff(hid_t fapl_id, H5FA_create_t *cparam, farray_test_param_t *
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -947,7 +947,7 @@ test_delete_open(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam)
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -1487,7 +1487,7 @@ test_set_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam,
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -1614,7 +1614,7 @@ test_skip_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam,
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
diff --git a/test/fheap.c b/test/fheap.c
index 95acd96..d825e3f 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -1901,7 +1901,7 @@ test_create(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
     HDmemset(&state, 0, sizeof(fheap_heap_state_t));
     if(check_stats(fh, &state))
         TEST_ERROR
-    PASSED()
+    PASSED();
 
     /* Query the type of address mapping */
     TESTING("query heap creation parameters");
@@ -1933,7 +1933,7 @@ test_create(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -2085,7 +2085,7 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
             TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -2258,7 +2258,7 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
             TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -2433,7 +2433,7 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -2779,7 +2779,7 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl)
         FAIL_STACK_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -2902,7 +2902,7 @@ test_filtered_create(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl)
     H5O_msg_reset(H5O_PLINE_ID, &test_cparam.pline);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -3042,7 +3042,7 @@ test_size(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl)
         FAIL_STACK_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -3179,7 +3179,7 @@ test_reopen_hdr(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl)
         FAIL_STACK_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -3290,7 +3290,7 @@ test_man_insert_weird(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa
         FAIL_STACK_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -3391,7 +3391,7 @@ test_man_insert_first(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -3485,7 +3485,7 @@ test_man_insert_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -3582,7 +3582,7 @@ test_man_insert_root_mult(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -3687,7 +3687,7 @@ test_man_insert_force_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_par
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -3792,7 +3792,7 @@ test_man_insert_fill_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -3903,7 +3903,7 @@ test_man_insert_third_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -3998,7 +3998,7 @@ test_man_fill_first_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *t
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -4100,7 +4100,7 @@ test_man_start_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -4199,7 +4199,7 @@ test_man_fill_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -4309,7 +4309,7 @@ test_man_start_third_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -4406,7 +4406,7 @@ test_man_fill_fourth_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -4501,7 +4501,7 @@ test_man_fill_all_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -4601,7 +4601,7 @@ test_man_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -4710,7 +4710,7 @@ test_man_second_direct_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhe
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -4811,7 +4811,7 @@ test_man_fill_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -4920,7 +4920,7 @@ test_man_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -5027,7 +5027,7 @@ test_man_fill_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -5126,7 +5126,7 @@ test_man_fill_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fheap_te
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -5234,7 +5234,7 @@ test_man_start_2nd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -5335,7 +5335,7 @@ test_man_recursive_indirect_two_deep(hid_t fapl, H5HF_create_t *cparam, fheap_te
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -5444,7 +5444,7 @@ test_man_start_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -5554,7 +5554,7 @@ test_man_fill_first_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fh
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -5660,7 +5660,7 @@ test_man_fill_3rd_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fhea
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -5766,7 +5766,7 @@ test_man_fill_all_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhea
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -5880,7 +5880,7 @@ test_man_start_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -5999,7 +5999,7 @@ test_man_fill_first_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fh
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -6110,7 +6110,7 @@ test_man_fill_4th_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fhea
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -6221,7 +6221,7 @@ test_man_fill_all_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhea
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -6355,7 +6355,7 @@ test_man_start_5th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -6509,7 +6509,7 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed);
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -6673,7 +6673,7 @@ test_man_remove_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -6865,7 +6865,7 @@ test_man_remove_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -7033,7 +7033,7 @@ test_man_remove_one_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -7276,7 +7276,7 @@ HDfprintf(stderr, "file_size = %lu\n", (unsigned long)file_size);
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -7579,7 +7579,7 @@ HDfprintf(stderr, "file_size = %lu\n", (unsigned long)file_size);
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -7690,7 +7690,7 @@ test_man_incr_insert_remove(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_
         TEST_ERROR
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -7762,7 +7762,7 @@ test_man_remove_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -7850,7 +7850,7 @@ test_man_remove_two_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -7920,7 +7920,7 @@ test_man_remove_first_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -7992,7 +7992,7 @@ test_man_remove_first_two_rows(hid_t fapl, H5HF_create_t *cparam, fheap_test_par
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -8068,7 +8068,7 @@ test_man_remove_first_four_rows(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -8138,7 +8138,7 @@ test_man_remove_all_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -8212,7 +8212,7 @@ test_man_remove_2nd_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -8290,7 +8290,7 @@ test_man_remove_3rd_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -8371,7 +8371,7 @@ test_man_skip_start_block(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -8468,7 +8468,7 @@ test_man_skip_start_block_add_back(hid_t fapl, H5HF_create_t *cparam, fheap_test
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -8577,7 +8577,7 @@ test_man_skip_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_t
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -8670,7 +8670,7 @@ test_man_skip_2nd_block(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *t
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -8812,7 +8812,7 @@ test_man_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_tes
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -8978,7 +8978,7 @@ test_man_fill_one_partial_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t *
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -9107,7 +9107,7 @@ test_man_fill_row_skip_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -9234,7 +9234,7 @@ test_man_skip_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -9356,7 +9356,7 @@ test_man_fill_direct_skip_indirect_start_block_add_skipped(hid_t fapl, H5HF_crea
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -9483,7 +9483,7 @@ test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped(hid_t fapl, H5HF_
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -9625,7 +9625,7 @@ HDfprintf(stderr, "obj_size = %Zu\n", obj_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -9799,7 +9799,7 @@ HDfprintf(stderr, "obj_size = %Zu\n", obj_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -9950,7 +9950,7 @@ test_man_fill_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -10130,7 +10130,7 @@ test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped(hid_t
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -10256,7 +10256,7 @@ test_man_fill_2nd_direct_skip_start_block_add_skipped(hid_t fapl, H5HF_create_t
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -10394,7 +10394,7 @@ test_man_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped(hid_t fapl, H
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -10544,7 +10544,7 @@ HDfprintf(stderr, "obj_size = %Zu\n", obj_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -10705,7 +10705,7 @@ HDfprintf(stderr, "obj_size = %Zu\n", obj_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -10866,7 +10866,7 @@ HDfprintf(stderr, "obj_size = %Zu\n", obj_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -11034,7 +11034,7 @@ HDfprintf(stderr, "obj_size = %Zu\n", obj_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -11193,7 +11193,7 @@ HDfprintf(stderr, "obj_size = %Zu\n", obj_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -11370,7 +11370,7 @@ HDfprintf(stderr, "obj_size = %Zu\n", obj_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -11582,7 +11582,7 @@ HDfprintf(stderr, "obj_size = %Zu\n", obj_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -11778,7 +11778,7 @@ HDfprintf(stderr, "obj_size = %Zu\n", obj_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -12010,7 +12010,7 @@ HDfprintf(stderr, "obj_size = %Zu\n", obj_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -12144,7 +12144,7 @@ test_man_frag_simple(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -12313,7 +12313,7 @@ test_man_frag_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -12425,7 +12425,7 @@ HDfprintf(stderr, "num_first_indirect_rows = %u\n", num_first_indirect_rows);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -12543,7 +12543,7 @@ test_man_frag_3rd_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -12696,7 +12696,7 @@ HDfprintf(stderr, "file_size = %lu\n", (unsigned long)file_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -12927,7 +12927,7 @@ HDfprintf(stderr, "file_size = %lu\n", (unsigned long)file_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -13233,7 +13233,7 @@ HDfprintf(stderr, "file_size = %lu\n", (unsigned long)file_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -13658,7 +13658,7 @@ HDfprintf(stderr, "file_size = %lu\n", (unsigned long)file_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -13878,7 +13878,7 @@ HDfprintf(stderr, "empty_size = %lu, file_size = %lu\n", (unsigned long)empty_si
     H5MM_xfree(heap_id);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -14031,7 +14031,7 @@ HDfprintf(stderr, "file_size = %lu\n", (unsigned long)file_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -14262,7 +14262,7 @@ HDfprintf(stderr, "file_size = %lu\n", (unsigned long)file_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -14867,7 +14867,7 @@ HDfprintf(stderr, "file_size = %lu\n", (unsigned long)file_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -15055,7 +15055,7 @@ HDfprintf(stderr, "empty_size = %lu, file_size = %lu\n", (unsigned long)empty_si
     H5O_msg_reset(H5O_PLINE_ID, &tmp_cparam.pline); /* Release the I/O pipeline filter information */
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -15383,7 +15383,7 @@ HDfprintf(stderr, "empty_size = %lu, file_size = %lu\n", (unsigned long)empty_si
     H5O_msg_reset(H5O_PLINE_ID, &tmp_cparam.pline); /* Release the I/O pipeline filter information */
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -15583,7 +15583,7 @@ HDfprintf(stderr, "file_size = %lu\n", (unsigned long)file_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -15802,7 +15802,7 @@ HDfprintf(stderr, "file_size = %lu\n", (unsigned long)file_size);
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -16090,7 +16090,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
     H5MM_xfree(rewrite_obj);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -16268,7 +16268,7 @@ test_bug1(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
     H5MM_xfree(keep_ids.offs);
 
     /* All tests passed */
-    PASSED()
+    PASSED();
 
     return(0);
 
diff --git a/test/flush2.c b/test/flush2.c
index 0f15903..a6acb41 100644
--- a/test/flush2.c
+++ b/test/flush2.c
@@ -266,7 +266,7 @@ main(void)
     h5_fixname(FILENAME[0], fapl_id, filename, sizeof(filename));
     check_second_dset = FALSE;
     if(file_ok(filename, fapl_id, check_second_dset))
-        PASSED()
+        PASSED();
     else
         TEST_ERROR
 
@@ -279,7 +279,7 @@ main(void)
         if(clear_status_flags(filename, fapl_id) < 0)
             TEST_ERROR
         if(file_ok(filename, fapl_id, check_second_dset))
-            PASSED()
+            PASSED();
         else
             TEST_ERROR
     } /* end if */
@@ -305,7 +305,7 @@ main(void)
 #endif
     } /* end if */
     else
-        PASSED()
+        PASSED();
     /* Turn the error stack back on */
     if(H5Eset_auto2(H5E_DEFAULT, func, NULL) < 0)
         FAIL_STACK_ERROR
@@ -332,7 +332,7 @@ main(void)
 #endif
         } /* end if */
         else
-            PASSED()
+            PASSED();
         /* Turn the error stack back on */
         if(H5Eset_auto2(H5E_DEFAULT, func, NULL) < 0)
             FAIL_STACK_ERROR
@@ -348,7 +348,7 @@ main(void)
     check_second_dset = TRUE;
     h5_fixname(FILENAME[4], fapl_id, filename, sizeof(filename));
     if(file_ok(filename, fapl_id, check_second_dset))
-        PASSED()
+        PASSED();
     else
         TEST_ERROR
 
@@ -363,7 +363,7 @@ main(void)
         if(clear_status_flags(filename, fapl_id) < 0)
             TEST_ERROR
         if(file_ok(filename, fapl_id, check_second_dset))
-            PASSED()
+            PASSED();
         else
             TEST_ERROR
     } /* end if */
@@ -391,7 +391,7 @@ main(void)
 #endif
     } /* end if */
     else
-        PASSED()
+        PASSED();
     /* Turn the error stack back on */
     if(H5Eset_auto2(H5E_DEFAULT, func, NULL) < 0)
         FAIL_STACK_ERROR
diff --git a/test/freespace.c b/test/freespace.c
index 947b2ce..f9f1932 100644
--- a/test/freespace.c
+++ b/test/freespace.c
@@ -547,7 +547,7 @@ test_fs_create(hid_t fapl)
     if(file_size != empty_size)
         TEST_ERROR
 
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -674,7 +674,7 @@ test_fs_sect_add(hid_t fapl)
     if (tmp_file_size <= (file_size+fr_meta_size))
         TEST_ERROR
 
-    PASSED()
+    PASSED();
 
     TESTING("adding a section via H5FS_sect_add() to free-space with H5FS_CLS_GHOST_OBJ: test 2");
 
@@ -736,7 +736,7 @@ test_fs_sect_add(hid_t fapl)
     if (tmp_file_size != (file_size+fr_meta_size))
         TEST_ERROR
 
-    PASSED()
+    PASSED();
 
     TESTING("adding a section via H5FS_sect_add() to free-space: test 3");
 
@@ -805,7 +805,7 @@ test_fs_sect_add(hid_t fapl)
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     TESTING("adding a section via H5FS_sect_add() to free-space: test 4");
 
@@ -884,7 +884,7 @@ test_fs_sect_add(hid_t fapl)
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -982,7 +982,7 @@ test_fs_sect_find(hid_t fapl)
         FAIL_STACK_ERROR
     frsp = NULL;
 
-    PASSED()
+    PASSED();
 
     TESTING("H5FS_sect_find() a section equal to requested-size from free-space");
 
@@ -1110,7 +1110,7 @@ test_fs_sect_find(hid_t fapl)
         FAIL_STACK_ERROR
     frsp = NULL;
 
-    PASSED()
+    PASSED();
 
     TESTING("H5FS_sect_find() a section greater than requested-size from free-space");
 
@@ -1190,7 +1190,7 @@ test_fs_sect_find(hid_t fapl)
         FAIL_STACK_ERROR
     frsp = NULL;
 
-    PASSED()
+    PASSED();
 
     TESTING("H5FS_sect_find(): cannot find a section with requested-size from free-space");
 
@@ -1253,7 +1253,7 @@ test_fs_sect_find(hid_t fapl)
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -1453,7 +1453,7 @@ test_fs_sect_merge(hid_t fapl)
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     /*
      * TEST 2
@@ -1555,7 +1555,7 @@ test_fs_sect_merge(hid_t fapl)
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     /*
      * TEST 3
@@ -1723,7 +1723,7 @@ test_fs_sect_merge(hid_t fapl)
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -1894,7 +1894,7 @@ test_fs_sect_shrink(hid_t fapl)
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
 
     TESTING("shrinking of sections when H5FS_sect_add() to free-space: test 2");
@@ -1996,7 +1996,7 @@ test_fs_sect_shrink(hid_t fapl)
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     TESTING("shrinking of sections when H5FS_sect_add() to free-space: test 3");
 
@@ -2087,7 +2087,7 @@ test_fs_sect_shrink(hid_t fapl)
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -2240,7 +2240,7 @@ test_fs_sect_change_class(hid_t fapl)
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     /*
      * TEST 2
@@ -2362,7 +2362,7 @@ test_fs_sect_change_class(hid_t fapl)
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -2515,7 +2515,7 @@ test_fs_sect_extend(hid_t fapl)
 	FAIL_STACK_ERROR
     fs_addr = HADDR_UNDEF;
 
-    PASSED()
+    PASSED();
 
     /*
      * TEST 2
@@ -2588,7 +2588,7 @@ test_fs_sect_extend(hid_t fapl)
 	FAIL_STACK_ERROR
     fs_addr = HADDR_UNDEF;
 
-    PASSED()
+    PASSED();
 
     /*
      * Test 3
@@ -2662,7 +2662,7 @@ test_fs_sect_extend(hid_t fapl)
 	FAIL_STACK_ERROR
     fs_addr = HADDR_UNDEF;
 
-    PASSED()
+    PASSED();
 
     /*
      * TEST 4
@@ -2735,7 +2735,7 @@ test_fs_sect_extend(hid_t fapl)
 	FAIL_STACK_ERROR
     fs_addr = HADDR_UNDEF;
 
-    PASSED()
+    PASSED();
 
     /* Close the file and dxpl */
     if(H5Fclose(file) < 0)
@@ -2843,7 +2843,7 @@ test_fs_sect_iterate(hid_t fapl)
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     return 0;
 
diff --git a/test/getname.c b/test/getname.c
index 873ceb9..85d9c73 100644
--- a/test/getname.c
+++ b/test/getname.c
@@ -2588,7 +2588,7 @@ test_obj_ref(hid_t fapl)
     
     namelen = H5Rget_name(dataset, H5R_OBJECT, &wbuf[0], (char*)buf, sizeof(buf));
     if(!((HDstrcmp(buf, "/Dataset3") == 0) &&(namelen == 9))) TEST_ERROR
-    PASSED()
+    PASSED();
 
     HDmemset(buf, 0, sizeof(buf));
     TESTING("getting path to dataset in /Group1");
@@ -2600,7 +2600,7 @@ test_obj_ref(hid_t fapl)
     *buf = '\0';
     namelen = H5Rget_name(dataset, H5R_OBJECT, &wbuf[1], (char*)buf, sizeof(buf));
     if(!((HDstrcmp(buf, "/Group1/Dataset2") == 0) &&(namelen == 16))) TEST_ERROR
-    PASSED()
+    PASSED();
 
     HDmemset(buf, 0, sizeof(buf));
     TESTING("getting path to /Group1");
@@ -2612,7 +2612,7 @@ test_obj_ref(hid_t fapl)
     *buf = '\0';
     namelen = H5Rget_name(dataset, H5R_OBJECT, &wbuf[2], (char*)buf, sizeof(buf));
     if(!((HDstrcmp(buf, "/Group1") == 0) &&(namelen == 7))) TEST_ERROR
-    PASSED()
+    PASSED();
 
     HDmemset(buf, 0, sizeof(buf));
     TESTING("getting path to datatype in /Group1");
@@ -2624,7 +2624,7 @@ test_obj_ref(hid_t fapl)
     *buf = '\0';
     namelen = H5Rget_name(dataset, H5R_OBJECT, &wbuf[3], (char*)buf, sizeof(buf));
     if(!((HDstrcmp(buf, "/Group1/Datatype1") == 0) &&(namelen == 17))) TEST_ERROR
-    PASSED()
+    PASSED();
 
     HDmemset(buf, 0, sizeof(buf));
     TESTING("getting path to dataset in nested group");
@@ -2636,7 +2636,7 @@ test_obj_ref(hid_t fapl)
     *buf = '\0';
     namelen = H5Rget_name(dataset, H5R_OBJECT, &wbuf[4], (char*)buf, sizeof(buf));
     if(!((HDstrcmp(buf, "/Group1/Group2/Dataset4") == 0) &&(namelen == 23))) TEST_ERROR
-    PASSED()
+    PASSED();
 
     HDmemset(buf, 0, sizeof(buf));
     TESTING("getting path to nested group");
@@ -2648,7 +2648,7 @@ test_obj_ref(hid_t fapl)
     *buf = '\0';
     namelen = H5Rget_name(dataset, H5R_OBJECT, &wbuf[5], (char*)buf, sizeof(buf));
     if(!((HDstrcmp(buf, "/Group1/Group2") == 0) &&(namelen == 14))) TEST_ERROR
-    PASSED()
+    PASSED();
 
     HDmemset(buf, 0, sizeof(buf));
     TESTING("getting path to dataset created via hard link");
@@ -2660,7 +2660,7 @@ test_obj_ref(hid_t fapl)
     *buf = '\0';
     namelen = H5Rget_name(dataset, H5R_OBJECT, &wbuf[6], (char*)buf, sizeof(buf));
     if(!((HDstrcmp(buf, "/Group1/Dataset5") == 0) &&(namelen == 16))) TEST_ERROR
-    PASSED()
+    PASSED();
 
     HDmemset(buf, 0, sizeof(buf));
     TESTING("getting path to root group");
@@ -2672,7 +2672,7 @@ test_obj_ref(hid_t fapl)
     *buf = '\0';
     namelen = H5Rget_name(dataset, H5R_OBJECT, &wbuf[7], (char*)buf, sizeof(buf));
     if(!((HDstrcmp(buf, "/") == 0) &&(namelen == 1))) TEST_ERROR
-    PASSED()
+    PASSED();
 
     /* Now we mount fid2 at /Group2 and look for dataset4.  It shouldn't be found */
     if(H5Fmount(fid1, "/Group1/Group2", fid2, H5P_DEFAULT) < 0)
@@ -2687,7 +2687,7 @@ test_obj_ref(hid_t fapl)
     *buf = '\0';
     namelen = H5Rget_name(dataset, H5R_OBJECT, &wbuf[4], (char*)buf, sizeof(buf));
     if(namelen != 0) TEST_ERROR
-    PASSED()
+    PASSED();
 
     /* Now we try unlinking dataset2 from the file and searching for it.  It shouldn't be found */
     if((dataset2 = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &wbuf[1])) < 0)
@@ -2703,7 +2703,7 @@ test_obj_ref(hid_t fapl)
     *buf = '\0';
     namelen = H5Rget_name(dataset, H5R_OBJECT, &wbuf[1], (char*)buf, sizeof(buf));
     if(namelen != 0) TEST_ERROR
-    PASSED()
+    PASSED();
 
     /* Close disk dataspace */
     if(H5Sclose(sid1) < 0)
@@ -2830,7 +2830,7 @@ test_reg_ref(hid_t fapl)
 
     name_size1 = H5Rget_name(dsetr_id, H5R_DATASET_REGION, &ref_out[0], (char*)buf1, NAME_BUF_SIZE );
     if(!((HDstrcmp(buf1, "/MATRIX") == 0) &&(name_size1 == 7))) TEST_ERROR
-    PASSED()
+    PASSED();
 
     TESTING("H5Iget_name to get name from region reference(hyperslab)");
 
@@ -2844,14 +2844,14 @@ test_reg_ref(hid_t fapl)
 
     if(H5Dclose(dsetv_id) < 0) TEST_ERROR
 
-    PASSED()
+    PASSED();
 
     /* Get name of the dataset the second region reference points to using H5Rget_name */
     TESTING("H5Rget_name to get name from region reference(pnt selec)");
     *buf1 = '\0';
     name_size1 = H5Rget_name(dsetr_id, H5R_DATASET_REGION, &ref_out[1], (char*)buf1, NAME_BUF_SIZE);
     if(!((HDstrcmp(buf1, "/MATRIX") == 0) &&(name_size1 == 7))) TEST_ERROR
-    PASSED()
+    PASSED();
 
     TESTING("H5Iget_name to get name from region reference(pnt selec)");
 
@@ -2865,7 +2865,7 @@ test_reg_ref(hid_t fapl)
 
     if(H5Dclose(dsetv_id) < 0) TEST_ERROR
 
-    PASSED()
+    PASSED();
 
     if(H5Dclose(dsetr_id) < 0)
 	TEST_ERROR
diff --git a/test/h5test.h b/test/h5test.h
index 37bf5a5..909cc57 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -103,7 +103,7 @@ H5TEST_DLLVAR MPI_Info h5_io_info_g;         /* MPI INFO object for IO */
  */
 #define TESTING(...) h5_testing(__VA_ARGS__);
 #define TESTING_2(WHAT)  {HDprintf("  Testing %-60s",WHAT); HDfflush(stdout);}
-#define PASSED()  {HDputs(" PASSED");HDfflush(stdout);}
+#define PASSED()  do {HDputs(" PASSED");HDfflush(stdout);} while (0)
 #define H5_FAILED()  {HDputs("*FAILED*");HDfflush(stdout);}
 #define H5_WARNING()  {HDputs("*WARNING*");HDfflush(stdout);}
 #define SKIPPED()  {HDputs(" -SKIP-");HDfflush(stdout);}
diff --git a/test/hyperslab.c b/test/hyperslab.c
index 4f9d991..4c84868 100644
--- a/test/hyperslab.c
+++ b/test/hyperslab.c
@@ -265,7 +265,7 @@ test_fill(size_t nx, size_t ny, size_t nz,
         } /* end for */
     } /* end for */
 
-    PASSED()
+    PASSED();
 
     HDfree(dst);
 
@@ -545,7 +545,7 @@ test_copy(int mode,
         } /* end for */
     } /* end for */
 
-    PASSED()
+    PASSED();
 
     HDfree(src);
     HDfree(dst);
@@ -666,7 +666,7 @@ test_multifill(size_t nx)
         } /* end if */
     } /* end for */
 
-    PASSED()
+    PASSED();
 
     HDfree(src);
     HDfree(dst);
@@ -753,7 +753,7 @@ test_endian(size_t nx)
         } /* end for */
     } /* end for */
 
-    PASSED()
+    PASSED();
 
     HDfree(src);
     HDfree(dst);
@@ -850,7 +850,7 @@ test_transpose(size_t nx, size_t ny)
         } /* end for */
     } /* end for */
 
-    PASSED()
+    PASSED();
 
     HDfree(src);
     HDfree(dst);
@@ -943,7 +943,7 @@ test_sub_super(size_t nx, size_t ny)
             } /* end if */
         } /* end for */
     } /* end for */
-    PASSED()
+    PASSED();
 
     /*
      * Test replicating pixels to produce an image twice as large in each
@@ -1007,7 +1007,7 @@ test_sub_super(size_t nx, size_t ny)
         } /* end for */
     } /* end for */
 
-    PASSED()
+    PASSED();
 
     HDfree(full);
     HDfree(half);
diff --git a/test/mf.c b/test/mf.c
index ca2defe..4cba4b9 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -318,7 +318,7 @@ test_mf_eoa(const char *env_h5_drvr, hid_t fapl)
         if(H5Pclose(fapl_new) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -460,7 +460,7 @@ test_mf_eoa_shrink(const char *env_h5_drvr, hid_t fapl)
         if(new_file_size != file_size)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -508,7 +508,7 @@ test_mf_eoa_shrink(const char *env_h5_drvr, hid_t fapl)
         if(new_file_size != (file_size + TBLOCK_SIZE30))
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -552,7 +552,7 @@ test_mf_eoa_shrink(const char *env_h5_drvr, hid_t fapl)
         if(new_file_size != (file_size + TBLOCK_SIZE30))
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -600,7 +600,7 @@ test_mf_eoa_shrink(const char *env_h5_drvr, hid_t fapl)
         if(H5Pclose(fapl_new) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -738,7 +738,7 @@ test_mf_eoa_extend(const char *env_h5_drvr, hid_t fapl)
         if(new_file_size != (file_size + TBLOCK_SIZE30 + TBLOCK_SIZE50))
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -801,7 +801,7 @@ test_mf_eoa_extend(const char *env_h5_drvr, hid_t fapl)
         if(H5Pclose(fapl_new) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -999,7 +999,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
         if(new_file_size != file_size)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -1093,7 +1093,7 @@ test_mf_fs_start(hid_t fapl)
     if(H5Pclose(fapl_new) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -1242,7 +1242,7 @@ test_mf_fs_alloc_free(hid_t fapl)
     if (new_file_size != file_size)
         TEST_ERROR
 
-    PASSED()
+    PASSED();
 
     TESTING("H5MF_alloc()/H5MF_xfree() of free-space manager:test 2");
 
@@ -1317,7 +1317,7 @@ test_mf_fs_alloc_free(hid_t fapl)
     if (new_file_size != file_size)
         TEST_ERROR
 
-    PASSED()
+    PASSED();
 
     TESTING("H5MF_alloc()/H5MF_xfree() of free-space manager:test 3");
 
@@ -1405,7 +1405,7 @@ test_mf_fs_alloc_free(hid_t fapl)
     if(H5Pclose(fapl_new) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -1598,7 +1598,7 @@ test_mf_fs_extend(hid_t fapl)
     if (new_file_size != file_size)
         TEST_ERROR
 
-    PASSED()
+    PASSED();
 
     TESTING("H5MF_try_extend() of free-space manager:test 2");
 
@@ -1700,7 +1700,7 @@ test_mf_fs_extend(hid_t fapl)
     if (new_file_size != file_size)
         TEST_ERROR
 
-    PASSED()
+    PASSED();
 
     TESTING("H5MF_try_extend() of free-space manager:test 3");
 
@@ -1802,7 +1802,7 @@ test_mf_fs_extend(hid_t fapl)
     if (new_file_size != file_size)
         TEST_ERROR
 
-    PASSED()
+    PASSED();
 
     TESTING("H5MF_try_extend() of free-space manager:test 4");
 
@@ -1911,7 +1911,7 @@ test_mf_fs_extend(hid_t fapl)
     if(H5Pclose(fapl_new) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -2023,7 +2023,7 @@ test_mf_fs_absorb(const char *env_h5_drvr, hid_t fapl)
         if(H5Fclose(file) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -2084,7 +2084,7 @@ test_mf_fs_absorb(const char *env_h5_drvr, hid_t fapl)
         if(H5Fclose(file) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -2226,7 +2226,7 @@ test_mf_aggr_alloc1(const char *env_h5_drvr, hid_t fapl)
         if(H5Pclose(fcpl) < 0)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -2368,7 +2368,7 @@ test_mf_aggr_alloc2(const char *env_h5_drvr, hid_t fapl)
         if (new_file_size != file_size)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -2528,7 +2528,7 @@ test_mf_aggr_alloc3(const char *env_h5_drvr, hid_t fapl)
         if(new_file_size != file_size)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -2695,7 +2695,7 @@ test_mf_aggr_alloc4(const char *env_h5_drvr, hid_t fapl)
         if(new_file_size != file_size)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -2818,7 +2818,7 @@ test_mf_aggr_alloc5(const char *env_h5_drvr, hid_t fapl)
         if(new_file_size != file_size)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -2974,7 +2974,7 @@ test_mf_aggr_alloc6(const char *env_h5_drvr, hid_t fapl)
         if(new_file_size != file_size)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -3158,7 +3158,7 @@ test_mf_aggr_alloc7(const char *env_h5_drvr, hid_t fapl)
         if (file_size != empty_size)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -3312,7 +3312,7 @@ test_mf_aggr_extend(const char *env_h5_drvr, hid_t fapl)
         if (file_size != empty_size)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -3382,7 +3382,7 @@ test_mf_aggr_extend(const char *env_h5_drvr, hid_t fapl)
         if(file_size != empty_size)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -3450,7 +3450,7 @@ test_mf_aggr_extend(const char *env_h5_drvr, hid_t fapl)
         if(file_size != empty_size)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -3559,7 +3559,7 @@ test_mf_aggr_absorb(const char *env_h5_drvr, hid_t fapl)
         if(file_size != empty_size)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -3618,7 +3618,7 @@ test_mf_aggr_absorb(const char *env_h5_drvr, hid_t fapl)
         if(file_size != empty_size)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -3680,7 +3680,7 @@ test_mf_aggr_absorb(const char *env_h5_drvr, hid_t fapl)
         if(file_size != empty_size)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -3847,7 +3847,7 @@ test_mf_align_eoa(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         if (new_file_size != file_size)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -3902,7 +3902,7 @@ test_mf_align_eoa(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
 
         if (new_file_size != (file_size-TBLOCK_SIZE50)) TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -3958,7 +3958,7 @@ test_mf_align_eoa(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
 
         if (new_file_size != (file_size+TBLOCK_SIZE30)) TEST_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -4095,7 +4095,7 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     TESTING("H5MF_alloc() of free-space manager with alignment: test 2");
 
@@ -4170,7 +4170,7 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     TESTING("H5MF_alloc() of free-space manager with alignment: test 3");
 
@@ -4245,7 +4245,7 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         if(H5Fclose(file) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -4515,7 +4515,7 @@ test_mf_align_alloc1(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         if(H5Fclose(file) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -4801,7 +4801,7 @@ test_mf_align_alloc2(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         if(H5Fclose(file) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -5177,7 +5177,7 @@ test_mf_align_alloc3(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         if(H5Fclose(file) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -5386,7 +5386,7 @@ test_mf_align_alloc4(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         if(H5Fclose(file) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -5609,7 +5609,7 @@ test_mf_align_alloc5(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         if(H5Fclose(file) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -5915,7 +5915,7 @@ test_mf_align_alloc6(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         if(H5Fclose(file) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
     } /* end if */
     else {
         SKIPPED();
@@ -6078,7 +6078,7 @@ test_mf_bug1(const char *env_h5_drvr, hid_t fapl)
      * the previous */
     if((addr2 - addr1) != (3 * align)) TEST_ERROR
 
-    PASSED()
+    PASSED();
 
     /* Close file */
     if(H5Fclose(file) < 0)
@@ -6358,7 +6358,7 @@ test_mf_fs_persist_split(void)
     if(H5Pclose(fcpl) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -6711,7 +6711,7 @@ test_mf_fs_persist_multi(void)
     if(H5Pclose(fcpl) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -6878,7 +6878,7 @@ test_mf_fs_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
         if(H5Pclose(fapl2) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
 
     } else {
         SKIPPED();
@@ -7062,7 +7062,7 @@ test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
         if(H5Pclose(fapl2) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
 
     } else {
         SKIPPED();
@@ -7235,7 +7235,7 @@ test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_for
     if(H5Pclose(fapl2) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -7420,7 +7420,7 @@ test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format
     if(H5Pclose(fapl2) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -7509,7 +7509,7 @@ test_dichotomy(hid_t fapl)
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
+    PASSED();
 
     return(0);
 
@@ -7763,7 +7763,7 @@ test_page_alloc_xfree(const char *env_h5_drvr, hid_t fapl)
         if(H5Pclose(fapl_new) < 0)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
 
     } else {
         SKIPPED();
@@ -7887,7 +7887,7 @@ test_page_try_shrink(const char *env_h5_drvr, hid_t fapl)
         if(H5Pclose(fcpl) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
 
     } else {
         SKIPPED();
@@ -8042,7 +8042,7 @@ test_page_small_try_extend(const char *env_h5_drvr, hid_t fapl)
         if(H5Pclose(fcpl) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
 
     } else {
         SKIPPED();
@@ -8183,7 +8183,7 @@ test_page_large_try_extend(const char *env_h5_drvr, hid_t fapl)
         if(H5Pclose(fcpl) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
 
     } else {
         SKIPPED();
@@ -8336,7 +8336,7 @@ test_page_large(const char *env_h5_drvr, hid_t fapl)
         if(file_size % TBLOCK_SIZE4096)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
 
     } else {
         SKIPPED();
@@ -8499,7 +8499,7 @@ test_page_small(const char *env_h5_drvr, hid_t fapl)
         if(H5Pclose(fcpl) < 0)
             FAIL_STACK_ERROR
 
-        PASSED()
+        PASSED();
 
     } else {
         SKIPPED();
@@ -8805,7 +8805,7 @@ test_page_alignment(const char *env_h5_drvr, hid_t fapl)
         if(H5Pclose(fapl_new) < 0)
             TEST_ERROR
 
-        PASSED()
+        PASSED();
 
     } else {
         SKIPPED();
diff --git a/test/ohdr.c b/test/ohdr.c
index 61fbbfc..55542b5 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -1134,7 +1134,7 @@ test_minimized_dset_ohdr_size_comparisons(hid_t fapl_id)
         if(H5Dclose(dset_F_N_id) < 0) TEST_ERROR
         if(H5Dclose(dset_F_Y_id) < 0) TEST_ERROR
 
-        PASSED()
+        PASSED();
 
     } /* compact and non-compact */
 
@@ -1266,7 +1266,7 @@ test_minimized_dset_ohdr_with_filter(hid_t fapl_id)
     if(H5Dclose(dset_mZ_id) < 0) TEST_ERROR
     if(H5Fclose(file_id) < 0) TEST_ERROR
 
-    PASSED()
+    PASSED();
     return SUCCEED;
 
 error:
@@ -1440,7 +1440,7 @@ test_minimized_dset_ohdr_modification_times(hid_t _fapl_id)
     if(H5Pclose(dcpl_mT_id) < 0) TEST_ERROR
     if(H5Pclose(dcpl_mN_id) < 0) TEST_ERROR
 
-    PASSED()
+    PASSED();
     return SUCCEED;
 
 error:
@@ -1555,7 +1555,7 @@ test_minimized_dset_ohdr_fillvalue_backwards_compatability(hid_t _fapl_id)
     if(H5Dclose(dset_1_id) < 0) TEST_ERROR
     if(H5Fclose(file_id) < 0) TEST_ERROR;
 
-    PASSED()
+    PASSED();
     return SUCCEED;
 
 error:
diff --git a/test/page_buffer.c b/test/page_buffer.c
index b428c3a..c2dec6b 100644
--- a/test/page_buffer.c
+++ b/test/page_buffer.c
@@ -652,7 +652,7 @@ test_args(hid_t orig_fapl, const char *env_h5_drvr)
     if(H5Pclose(fapl) < 0)
         FAIL_STACK_ERROR;
 
-    PASSED()
+    PASSED();
     return 0;
 
 error:
@@ -780,7 +780,7 @@ test_mpmde_delay_basic(hid_t orig_fapl, const char *env_h5_drvr)
     HDfree(data);
     HDfree(odata);
 
-    PASSED()
+    PASSED();
     return 0;
 
 error:
@@ -982,7 +982,7 @@ test_spmde_lru_evict_basic(hid_t orig_fapl, const char *env_h5_drvr)
 
     last = print_elapsed_time(&last, __func__, __LINE__);
 
-    PASSED()
+    PASSED();
     return 0;
 
 error:
@@ -1119,7 +1119,7 @@ test_spmde_delay_basic(hid_t orig_fapl, const char *env_h5_drvr)
     HDfree(data);
     HDfree(odata);
 
-    PASSED()
+    PASSED();
     return 0;
 
 error:
@@ -1419,7 +1419,7 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr,
         FAIL_STACK_ERROR;
     HDfree(data);
 
-    PASSED()
+    PASSED();
     return 0;
 
 error:
@@ -1682,7 +1682,7 @@ test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr)
         FAIL_STACK_ERROR;
     HDfree(data);
 
-    PASSED()
+    PASSED();
     return 0;
 
 error:
@@ -2414,7 +2414,7 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr)
 
     HDfree(data);
 
-    PASSED()
+    PASSED();
 
     return 0;
 
@@ -2808,7 +2808,7 @@ test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr)
     HDfree(data);
 
 
-    PASSED()
+    PASSED();
     return 0;
 
 error:
@@ -2924,7 +2924,7 @@ verify_page_buffering_disabled(hid_t orig_fapl, const char *env_h5_drvr)
     if(H5Pclose(fapl) < 0)
         FAIL_STACK_ERROR;
 
-    PASSED()
+    PASSED();
 
     return 0;
 
diff --git a/test/set_extent.c b/test/set_extent.c
index 78d2b0b..1503a15 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -2013,8 +2013,7 @@ static int test_external(hid_t fapl) {
     if (H5Fclose(fid) < 0)
         FAIL_STACK_ERROR
 
-    PASSED()
-    ;
+    PASSED();
 
     return 0;
 
diff --git a/test/vfd_swmr.c b/test/vfd_swmr.c
index a3b52d5..357a545 100644
--- a/test/vfd_swmr.c
+++ b/test/vfd_swmr.c
@@ -168,7 +168,7 @@ test_fapl(void)
     if(my_config)
         HDfree(my_config);
 
-    PASSED()
+    PASSED();
     return 0;
 
 error:
@@ -503,7 +503,7 @@ test_file_fapl(void)
     if(file_config)
         HDfree(file_config);
 
-    PASSED()
+    PASSED();
     return 0;
 
 error:
@@ -644,7 +644,7 @@ test_file_end_tick(void)
     if(my_config)
         HDfree(my_config);
 
-    PASSED()
+    PASSED();
     return 0;
 
 error:
@@ -769,7 +769,7 @@ test_writer_create_open_flush(void)
     if(my_config)
         HDfree(my_config);
 
-    PASSED()
+    PASSED();
     return 0;
 
 error:
@@ -1020,7 +1020,7 @@ test_writer_md(void)
     if(index)
         HDfree(index);
 
-    PASSED()
+    PASSED();
     return 0;
 
 error:
@@ -1715,7 +1715,7 @@ test_reader_md_concur(void)
     if(index)
         HDfree(index);
 
-    PASSED()
+    PASSED();
     return 0;
 
 error:
@@ -1913,7 +1913,7 @@ test_multiple_file_opens(void)
     if(config2)
         HDfree(config2);
 
-    PASSED()
+    PASSED();
     return 0;
 
 error:
@@ -2262,7 +2262,7 @@ test_multiple_concur_file_opens(void)
     if(config2)
         HDfree(config2);
 
-    PASSED()
+    PASSED();
     return 0;
 
 error:
@@ -2614,7 +2614,7 @@ test_same_file_opens(void)
     if(config2)
         HDfree(config2);
 
-    PASSED()
+    PASSED();
     return 0;
 
 error: