h5test.h testing macros get enclosed in do..while loops (#1721)

* h5test.h testing macros get enclosed in do..while loops

* Adds missed macro in hl C++ code

* Fixes macro in Windows code

1 files changed, 343 insertions, 317 deletions

diff --git a/test/ohdr.c b/test/ohdr.c
index c7a13fa..6b31334 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -88,9 +88,9 @@ test_cont(char *filename, hid_t fapl)
 
     /* Create the file to operate on */
     if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (NULL == (f = (H5F_t *)H5VL_object(file)))
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (H5AC_ignore_tags(f) < 0) {
         H5_FAILED();
         H5Eprint2(H5E_DEFAULT, stdout);
@@ -98,65 +98,65 @@ test_cont(char *filename, hid_t fapl)
     } /* end if */
 
     if (H5O_create(f, (size_t)H5O_MIN_SIZE, (size_t)0, H5P_GROUP_CREATE_DEFAULT, &oh_locA /*out*/) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     if (H5O_create(f, (size_t)H5O_MIN_SIZE, (size_t)0, H5P_GROUP_CREATE_DEFAULT, &oh_locB /*out*/) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     time_new = 11111111;
 
     if (H5O_msg_create(&oh_locA, H5O_NAME_ID, 0, 0, &long_name) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     if (H5O_msg_create(&oh_locB, H5O_MTIME_ID, 0, 0, &time_new) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (H5O_msg_create(&oh_locB, H5O_MTIME_ID, 0, 0, &time_new) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (H5O_msg_create(&oh_locB, H5O_MTIME_ID, 0, 0, &time_new) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     if (H5O_msg_create(&oh_locA, H5O_MTIME_NEW_ID, 0, 0, &time_new) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     if (H5O_msg_create(&oh_locB, H5O_MTIME_ID, 0, 0, &time_new) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     if (H5O_msg_create(&oh_locA, H5O_NAME_ID, 0, 0, &short_name) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     if (1 != H5O_link(&oh_locA, 1))
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (1 != H5O_link(&oh_locB, 1))
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (H5AC_prep_for_file_flush(f) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (H5AC_flush(f) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (H5AC_secure_from_file_flush(f) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (H5O__expunge_chunks_test(&oh_locA) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     if (H5O_get_hdr_info(&oh_locA, &hdr_info) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     nchunks = hdr_info.nchunks;
 
     /* remove the 1st H5O_NAME_ID message */
     if (H5O_msg_remove(&oh_locA, H5O_NAME_ID, 0, FALSE) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     if (H5O_get_hdr_info(&oh_locA, &hdr_info) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     if (hdr_info.nchunks >= nchunks)
-        TEST_ERROR
+        TEST_ERROR;
 
     if (H5O_close(&oh_locA, NULL) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (H5O_close(&oh_locB, NULL) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (H5Fclose(file) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     PASSED();
 
@@ -199,77 +199,77 @@ test_ohdr_cache(char *filename, hid_t fapl)
 
     /* Make a copy of the FAPL */
     if ((my_fapl = H5Pcopy(fapl)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Tweak down the size of the metadata cache to only 64K */
     mdc_config.version = H5AC__CURR_CACHE_CONFIG_VERSION;
     if (H5Pget_mdc_config(my_fapl, &mdc_config) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     mdc_config.set_initial_size = TRUE;
     mdc_config.initial_size     = 32 * 1024;
     mdc_config.max_size         = 64 * 1024;
     mdc_config.min_size         = 8 * 1024;
     if (H5Pset_mdc_config(my_fapl, &mdc_config) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Create the file to operate on */
     if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, my_fapl)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (H5Pclose(my_fapl) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (NULL == (f = (H5F_t *)H5VL_object(file)))
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (H5AC_ignore_tags(f) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Create object (local heap) that occupies most of cache */
     if (H5HL_create(f, (31 * 1024), &lheap_addr) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Protect local heap (which actually pins it in the cache) */
     if (NULL == (lheap = H5HL_protect(f, lheap_addr, H5AC__READ_ONLY_FLAG)))
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Create an object header */
     HDmemset(&oh_loc, 0, sizeof(oh_loc));
     if (H5O_create(f, (size_t)2048, (size_t)1, H5P_GROUP_CREATE_DEFAULT, &oh_loc /*out*/) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Query object header information */
     rc = 0;
     if (H5O__get_rc_test(&oh_loc, &rc) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (0 != rc)
-        TEST_ERROR
+        TEST_ERROR;
 
     /* Create object (local heap) that occupies most of cache */
     if (H5HL_create(f, (31 * 1024), &lheap_addr2) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Protect local heap (which actually pins it in the cache) */
     if (NULL == (lheap2 = H5HL_protect(f, lheap_addr2, H5AC__READ_ONLY_FLAG)))
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Unprotect local heap (which actually unpins it from the cache) */
     if (H5HL_unprotect(lheap2) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Create object header message in new object header */
     time_new = 11111111;
     if (H5O_msg_create(&oh_loc, H5O_MTIME_NEW_ID, 0, 0, &time_new) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Create object (local heap) that occupies most of cache */
     if (H5HL_create(f, (31 * 1024), &lheap_addr3) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Protect local heap (which actually pins it in the cache) */
     if (NULL == (lheap3 = H5HL_protect(f, lheap_addr3, H5AC__READ_ONLY_FLAG)))
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Unprotect local heap (which actually unpins it from the cache) */
     if (H5HL_unprotect(lheap3) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Query object header information */
     /* (Note that this is somewhat of a weak test, since it doesn't actually
@@ -279,24 +279,24 @@ test_ohdr_cache(char *filename, hid_t fapl)
      */
     rc = 0;
     if (H5O__get_rc_test(&oh_loc, &rc) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (0 != rc)
-        TEST_ERROR
+        TEST_ERROR;
 
     /* Decrement reference count o object header */
     if (H5O_dec_rc_by_loc(&oh_loc) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Close object header created */
     if (H5O_close(&oh_loc, NULL) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Unprotect local heap (which actually unpins it from the cache) */
     if (H5HL_unprotect(lheap) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     if (H5Fclose(file) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     PASSED();
 
@@ -344,20 +344,20 @@ test_ohdr_swmr(hbool_t new_format)
 
     /* File access property list */
     if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Create the file with/without latest format: ensure version 2 object header for SWMR */
     if (new_format) {
         /* Set to use latest library format */
         if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
-            FAIL_STACK_ERROR
+            FAIL_STACK_ERROR;
 
         if ((fid = H5Fcreate(FILE_OHDR_SWMR, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
-            TEST_ERROR
+            TEST_ERROR;
     } /* end if */
     else {
         if ((fid = H5Fcreate(FILE_OHDR_SWMR, H5F_ACC_TRUNC | H5F_ACC_SWMR_WRITE, H5P_DEFAULT, fapl)) < 0)
-            TEST_ERROR
+            TEST_ERROR;
     } /* end else */
 
     /* Initialize data */
@@ -369,47 +369,47 @@ test_ohdr_swmr(hbool_t new_format)
     /* Create a small data space for compact dataset */
     dims[0] = (hsize_t)compact_size;
     if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Create property list for compact dataset creation */
     if ((plist = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Set the layout for the compact dataset */
     if (H5Pset_layout(plist, H5D_COMPACT) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Create a compact dataset */
     if ((did = H5Dcreate2(fid, DSET_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, plist, H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Write to the compact dataset */
     if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Close the dataset */
     if (H5Dclose(did) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Open the file for SWMR write with/without latest format */
     if ((fid = H5Fopen(FILE_OHDR_SWMR, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Open the compact dataset */
     if ((did = H5Dopen2(fid, DSET_NAME, H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Get the object information */
     if (H5Oget_native_info(did, &ninfo, H5O_NATIVE_INFO_HDR) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     if (new_format)
         if (ninfo.hdr.version != OBJ_VERSION_LATEST)
-            FAIL_STACK_ERROR
+            FAIL_STACK_ERROR;
 
     /* The size of object header should be greater than the speculative read size of H5O_SPEC_READ_SIZE */
     /* This will exercise the coding for the re-read of the object header for SWMR access */
@@ -418,27 +418,27 @@ test_ohdr_swmr(hbool_t new_format)
 
     /* Close the dataset */
     if (H5Dclose(did) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Close the dataspace */
     if (H5Sclose(sid) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Close the dataset creation property list */
     if (H5Pclose(plist) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Close the file access property list */
     if (H5Pclose(fapl) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Remove the test file */
     if (HDremove(FILE_OHDR_SWMR) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Free the buffer */
     HDfree(wbuf);
@@ -552,28 +552,28 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
 
     /* Make a copy of the data file from svn. */
     if (h5_make_local_copy(FILE_BOGUS, testfile) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     TESTING("object with unknown header message and no flags set");
 
     /* Open filename */
     if ((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Open FILE_BOGUS */
     if ((fid_bogus = H5Fopen(testfile, H5F_ACC_RDONLY, fapl)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Set up location ID depending on bogus_id */
     if (bogus_id == H5O_BOGUS_INVALID_ID) {
         /* Open "group" in FILE_BOGUS */
         if ((gid_bogus = H5Gopen2(fid_bogus, "group", H5P_DEFAULT)) < 0)
-            FAIL_STACK_ERROR
+            FAIL_STACK_ERROR;
         loc_bogus = gid_bogus;
 
         /* Create "group" in filename */
         if ((gid = H5Gcreate2(fid, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-            FAIL_STACK_ERROR
+            FAIL_STACK_ERROR;
         loc = gid;
     }
     else { /* H5O_BOGUS_VALID_ID */
@@ -583,9 +583,9 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
 
     /* Open the dataset with the unknown header message, but no extra flags */
     if ((did = H5Dopen2(loc_bogus, "Dataset1", H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (H5Dclose(did) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     PASSED();
 
@@ -593,9 +593,9 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
 
     /* Open the dataset with the unknown header message, and "shareable" flag */
     if ((did = H5Dopen2(loc_bogus, "Dataset5", H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (H5Dclose(did) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     PASSED();
 
@@ -603,9 +603,9 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
 
     /* Open the dataset with the unknown header message, and "fail if unknown and open for write" flag */
     if ((did = H5Dopen2(loc_bogus, "Dataset2", H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     if (H5Dclose(did) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     PASSED();
 
@@ -619,7 +619,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
     H5E_END_TRY;
     if (did >= 0) {
         H5Dclose(did);
-        TEST_ERROR
+        TEST_ERROR;
     } /* end if */
 
     PASSED();
@@ -628,24 +628,24 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
 
     /* Copy object with "mark if unknown" flag on message into file (FILENAME[0]) that can be modified */
     if (H5Ocopy(loc_bogus, "Dataset4", loc, "Dataset4", H5P_DEFAULT, H5P_DEFAULT) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Closing: filename */
     if (bogus_id == H5O_BOGUS_INVALID_ID)
         if (H5Gclose(gid) < 0)
-            FAIL_STACK_ERROR
+            FAIL_STACK_ERROR;
     if (H5Fclose(fid) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Re-open filename, with read-only permissions */
     if ((fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Set up location ID depending on bogus_id */
     if (bogus_id == H5O_BOGUS_INVALID_ID) {
         /* Open "group" in filename */
         if ((gid = H5Gopen2(fid, "group", H5P_DEFAULT)) < 0)
-            FAIL_STACK_ERROR
+            FAIL_STACK_ERROR;
         loc = gid;
     }
     else
@@ -653,34 +653,34 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
 
     /* Open the dataset with the "mark if unknown" message */
     if ((did = H5Dopen2(loc, "Dataset4", H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Check that the "unknown" message was _NOT_ marked */
     if (H5O__check_msg_marked_test(did, FALSE) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Close the dataset */
     if (H5Dclose(did) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Close "group" in filename depending on bogus_id */
     if (bogus_id == H5O_BOGUS_INVALID_ID)
         if (H5Gclose(gid) < 0)
-            FAIL_STACK_ERROR
+            FAIL_STACK_ERROR;
 
     /* Close filename (to flush change to object header) */
     if (H5Fclose(fid) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Re-open filename */
     if ((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Set up location ID depending on bogus_id */
     if (bogus_id == H5O_BOGUS_INVALID_ID) {
         /* Open "group" in filename */
         if ((gid = H5Gopen2(fid, "group", H5P_DEFAULT)) < 0)
-            FAIL_STACK_ERROR
+            FAIL_STACK_ERROR;
         loc = gid;
     }
     else
@@ -688,46 +688,46 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
 
     /* Open the dataset with the "mark if unknown" message */
     if ((did = H5Dopen2(loc, "Dataset4", H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Create data space */
     if ((sid = H5Screate(H5S_SCALAR)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Create an attribute, to get the object header into write access */
     if ((aid = H5Acreate2(did, "Attr", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Close dataspace */
     if (H5Sclose(sid) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Close attribute */
     if (H5Aclose(aid) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Close the dataset */
     if (H5Dclose(did) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Close "group" in filename depending on bogus_id */
     if (bogus_id == H5O_BOGUS_INVALID_ID)
         if (H5Gclose(gid) < 0)
-            FAIL_STACK_ERROR
+            FAIL_STACK_ERROR;
 
     /* Close filename (to flush change to object header) */
     if (H5Fclose(fid) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Re-open filename */
     if ((fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Set up location ID depending on bogus_id */
     if (bogus_id == H5O_BOGUS_INVALID_ID) {
         /* Open "group" in filename */
         if ((gid = H5Gopen2(fid, "group", H5P_DEFAULT)) < 0)
-            FAIL_STACK_ERROR
+            FAIL_STACK_ERROR;
         loc = gid;
     }
     else
@@ -735,43 +735,43 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
 
     /* Re-open the dataset with the "mark if unknown" message */
     if ((did = H5Dopen2(loc, "Dataset4", H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Check that the "unknown" message was marked */
     if (H5O__check_msg_marked_test(did, TRUE) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Close the dataset */
     if (H5Dclose(did) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Closing: filename */
     if (bogus_id == H5O_BOGUS_INVALID_ID)
         if (H5Gclose(gid) < 0)
-            FAIL_STACK_ERROR
+            FAIL_STACK_ERROR;
     if (H5Fclose(fid) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     PASSED();
 
     /* Closing: FILE_BOGUS */
     if (bogus_id == H5O_BOGUS_INVALID_ID)
         if (H5Gclose(gid_bogus) < 0)
-            FAIL_STACK_ERROR
+            FAIL_STACK_ERROR;
     if (H5Fclose(fid_bogus) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     TESTING("object in r/w file with unknown header message & 'fail if unknown and open for write' flag set");
 
     /* Open FILE_BOGUS with RW intent this time */
     if ((fid_bogus = H5Fopen(testfile, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     /* Set up location ID */
     if (bogus_id == H5O_BOGUS_INVALID_ID) {
         /* Open "group" in FILE_BOGUS */
         if ((gid_bogus = H5Gopen2(fid_bogus, "group", H5P_DEFAULT)) < 0)
-            FAIL_STACK_ERROR
+            FAIL_STACK_ERROR;
         loc_bogus = gid_bogus;
     }
     else
@@ -786,7 +786,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
     H5E_END_TRY;
     if (did >= 0) {
         H5Dclose(did);
-        TEST_ERROR
+        TEST_ERROR;
     } /* end if */
 
     PASSED();
@@ -801,15 +801,15 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
     H5E_END_TRY;
     if (did >= 0) {
         H5Dclose(did);
-        TEST_ERROR
+        TEST_ERROR;
     } /* end if */
 
     /* Closing: FILE_BOGUS */
     if (bogus_id == H5O_BOGUS_INVALID_ID)
         if (H5Gclose(gid_bogus) < 0)
-            FAIL_STACK_ERROR
+            FAIL_STACK_ERROR;
     if (H5Fclose(fid_bogus) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
 
     PASSED();
 
@@ -915,7 +915,7 @@ test_minimized_dset_ohdr_attribute_addition(hid_t fapl_id)
     int     in_val                   = 0;
     int     i;
 
-    TESTING("adding attributes to datasets created with H5Pset_dset_no_attrs_hint()")
+    TESTING("adding attributes to datasets created with H5Pset_dset_no_attrs_hint()");
 
     /* Create the test file */
     if (NULL == h5_fixname(FILENAME[1], fapl_id, filename, sizeof(filename)))
@@ -1131,124 +1131,150 @@ test_minimized_dset_ohdr_size_comparisons(hid_t fapl_id)
     for (compact = 0; compact < 2; compact++) { /* 0 or 1 */
 
         if (compact)
-            TESTING("minimized dset object headers size comparisons (compact)")
+            TESTING("minimized dset object headers size comparisons (compact)");
         else
-            TESTING("minimized dset object headers size comparisons")
+            TESTING("minimized dset object headers size comparisons");
 
         dcpl_default = H5Pcreate(H5P_DATASET_CREATE);
         if (dcpl_default < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         dcpl_minimize = H5Pcreate(H5P_DATASET_CREATE);
         if (dcpl_minimize < 0)
-            TEST_ERROR
+            TEST_ERROR;
         ret = H5Pset_dset_no_attrs_hint(dcpl_minimize, TRUE);
         if (ret < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         dcpl_dontmin = H5Pcreate(H5P_DATASET_CREATE);
         if (dcpl_dontmin < 0)
-            TEST_ERROR
+            TEST_ERROR;
         ret = H5Pset_dset_no_attrs_hint(dcpl_dontmin, FALSE);
         if (ret < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         if (compact) {
             ret = H5Pset_layout(dcpl_default, H5D_COMPACT);
             if (ret < 0)
-                TEST_ERROR
+                TEST_ERROR;
             ret = H5Pset_layout(dcpl_minimize, H5D_COMPACT);
             if (ret < 0)
-                TEST_ERROR
+                TEST_ERROR;
             ret = H5Pset_layout(dcpl_dontmin, H5D_COMPACT);
             if (ret < 0)
-                TEST_ERROR
+                TEST_ERROR;
         }
 
         dspace_id = H5Screate_simple(1, array_10, NULL);
         if (dspace_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         int_type_id = H5Tcopy(H5T_NATIVE_INT);
         if (int_type_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         file_f_id = H5Fcreate(filename_a, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
         if (file_f_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         dset_f_x_id =
             H5Dcreate2(file_f_id, "default", int_type_id, dspace_id, H5P_DEFAULT, dcpl_default, H5P_DEFAULT);
         if (dset_f_x_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         dset_f_N_id =
             H5Dcreate2(file_f_id, "dsetNOT", int_type_id, dspace_id, H5P_DEFAULT, dcpl_dontmin, H5P_DEFAULT);
         if (dset_f_N_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         dset_f_Y_id =
             H5Dcreate2(file_f_id, "dsetMIN", int_type_id, dspace_id, H5P_DEFAULT, dcpl_minimize, H5P_DEFAULT);
         if (dset_f_x_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         file_F_id = H5Fcreate(filename_b, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
         if (file_F_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
         ret = H5Fset_dset_no_attrs_hint(file_F_id, TRUE);
         if (ret < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         dset_F_x_id =
             H5Dcreate2(file_F_id, "default", int_type_id, dspace_id, H5P_DEFAULT, dcpl_default, H5P_DEFAULT);
         if (dset_F_x_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         dset_F_N_id =
             H5Dcreate2(file_F_id, "dsetNOT", int_type_id, dspace_id, H5P_DEFAULT, dcpl_dontmin, H5P_DEFAULT);
         if (dset_F_N_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         dset_F_Y_id =
             H5Dcreate2(file_F_id, "dsetMIN", int_type_id, dspace_id, H5P_DEFAULT, dcpl_minimize, H5P_DEFAULT);
         if (dset_F_Y_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /*********
          * TESTS *
          *********/
 
+        /* Identity */
         if (oh_compare(dset_f_x_id, dset_f_x_id) != EQ)
-            TEST_ERROR /* identity */
+            TEST_ERROR;
 
-                if (oh_compare(dset_f_x_id, dset_f_N_id) != EQ)
-                    TEST_ERROR if (oh_compare(dset_f_x_id, dset_f_Y_id) != GT)
-                        TEST_ERROR if (oh_compare(dset_f_N_id, dset_f_Y_id) != GT) TEST_ERROR
+        if (oh_compare(dset_f_x_id, dset_f_N_id) != EQ)
+            TEST_ERROR;
+        if (oh_compare(dset_f_x_id, dset_f_Y_id) != GT)
+            TEST_ERROR;
+        if (oh_compare(dset_f_N_id, dset_f_Y_id) != GT)
+            TEST_ERROR;
 
-                if (oh_compare(dset_F_x_id, dset_F_N_id) != EQ)
-                    TEST_ERROR if (oh_compare(dset_F_x_id, dset_F_Y_id) != EQ)
-                        TEST_ERROR if (oh_compare(dset_F_N_id, dset_F_Y_id) != EQ) TEST_ERROR
+        if (oh_compare(dset_F_x_id, dset_F_N_id) != EQ)
+            TEST_ERROR;
+        if (oh_compare(dset_F_x_id, dset_F_Y_id) != EQ)
+            TEST_ERROR;
+        if (oh_compare(dset_F_N_id, dset_F_Y_id) != EQ)
+            TEST_ERROR;
 
-                if (oh_compare(dset_F_x_id, dset_f_Y_id) != EQ)
-                    TEST_ERROR if (oh_compare(dset_F_x_id, dset_f_x_id) != LT) TEST_ERROR
+        if (oh_compare(dset_F_x_id, dset_f_Y_id) != EQ)
+            TEST_ERROR;
+        if (oh_compare(dset_F_x_id, dset_f_x_id) != LT)
+            TEST_ERROR;
 
-                /************
-                 * TEARDOWN *
-                 ************/
+        /************
+         * TEARDOWN *
+         ************/
 
-                if (H5Sclose(dspace_id) < 0) TEST_ERROR if (H5Tclose(int_type_id) < 0)
-                    TEST_ERROR if (H5Pclose(dcpl_default) < 0) TEST_ERROR if (H5Pclose(dcpl_minimize) < 0)
-                        TEST_ERROR if (H5Pclose(dcpl_dontmin) < 0) TEST_ERROR
+        if (H5Sclose(dspace_id) < 0)
+            TEST_ERROR;
+        if (H5Tclose(int_type_id) < 0)
+            TEST_ERROR;
+        if (H5Pclose(dcpl_default) < 0)
+            TEST_ERROR;
+        if (H5Pclose(dcpl_minimize) < 0)
+            TEST_ERROR;
+        if (H5Pclose(dcpl_dontmin) < 0)
+            TEST_ERROR;
 
-                if (H5Fclose(file_f_id) < 0) TEST_ERROR if (H5Dclose(dset_f_x_id) < 0)
-                    TEST_ERROR if (H5Dclose(dset_f_N_id) < 0) TEST_ERROR if (H5Dclose(dset_f_Y_id) < 0)
-                        TEST_ERROR
+        if (H5Fclose(file_f_id) < 0)
+            TEST_ERROR;
+        if (H5Dclose(dset_f_x_id) < 0)
+            TEST_ERROR;
+        if (H5Dclose(dset_f_N_id) < 0)
+            TEST_ERROR;
+        if (H5Dclose(dset_f_Y_id) < 0)
+            TEST_ERROR;
 
-                if (H5Fclose(file_F_id) < 0) TEST_ERROR if (H5Dclose(dset_F_x_id) < 0)
-                    TEST_ERROR if (H5Dclose(dset_F_N_id) < 0) TEST_ERROR if (H5Dclose(dset_F_Y_id) < 0)
-                        TEST_ERROR
+        if (H5Fclose(file_F_id) < 0)
+            TEST_ERROR;
+        if (H5Dclose(dset_F_x_id) < 0)
+            TEST_ERROR;
+        if (H5Dclose(dset_F_N_id) < 0)
+            TEST_ERROR;
+        if (H5Dclose(dset_F_Y_id) < 0)
+            TEST_ERROR;
 
-                        PASSED();
+        PASSED();
 
     } /* compact and non-compact */
 
@@ -1315,102 +1341,102 @@ test_minimized_dset_ohdr_with_filter(hid_t fapl_id)
      *********/
 
     if (h5_fixname(FILENAME[1], fapl_id, filename, sizeof(filename)) == NULL)
-        TEST_ERROR
+        TEST_ERROR;
 
     dcpl_mx_id = H5Pcreate(H5P_DATASET_CREATE);
     if (dcpl_mx_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
     ret = H5Pset_dset_no_attrs_hint(dcpl_mx_id, TRUE);
     if (ret < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     dcpl_xZ_id = H5Pcreate(H5P_DATASET_CREATE);
     if (dcpl_xZ_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
     ret = H5Pset_chunk(dcpl_xZ_id, ndims, chunk_dim);
     if (ret < 0)
-        TEST_ERROR
+        TEST_ERROR;
     ret = H5Pset_filter(dcpl_xZ_id, H5Z_FILTER_DEFLATE, H5Z_FLAG_OPTIONAL, 0, filter_values);
     if (ret < 0)
-        TEST_ERROR
+        TEST_ERROR;
     dcpl_mZ_id = H5Pcreate(H5P_DATASET_CREATE);
     if (dcpl_mZ_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
     ret = H5Pset_dset_no_attrs_hint(dcpl_mZ_id, TRUE);
     if (ret < 0)
-        TEST_ERROR
+        TEST_ERROR;
     ret = H5Pset_chunk(dcpl_mZ_id, ndims, chunk_dim);
     if (ret < 0)
-        TEST_ERROR
+        TEST_ERROR;
     ret = H5Pset_filter(dcpl_mZ_id, H5Z_FILTER_DEFLATE, H5Z_FLAG_OPTIONAL, 0, filter_values);
     if (ret < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     dspace_id = H5Screate_simple(1, extents, extents);
     if (dspace_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     dtype_id = H5Tcopy(H5T_NATIVE_INT);
     if (dtype_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
     if (file_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     dset_xx_id = H5Dcreate2(file_id, "xx", dtype_id, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (dset_xx_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     dset_mx_id = H5Dcreate2(file_id, "Mx", dtype_id, dspace_id, H5P_DEFAULT, dcpl_mx_id, H5P_DEFAULT);
     if (dset_mx_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     dset_xZ_id = H5Dcreate2(file_id, "xZ", dtype_id, dspace_id, H5P_DEFAULT, dcpl_xZ_id, H5P_DEFAULT);
     if (dset_xZ_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     dset_mZ_id = H5Dcreate2(file_id, "MZ", dtype_id, dspace_id, H5P_DEFAULT, dcpl_mZ_id, H5P_DEFAULT);
     if (dset_mZ_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     /*********
      * TESTS *
      *********/
 
     if (oh_compare(dset_mx_id, dset_xx_id) != LT)
-        TEST_ERROR
+        TEST_ERROR;
     if (oh_compare(dset_mx_id, dset_xZ_id) != LT)
-        TEST_ERROR
+        TEST_ERROR;
     if (oh_compare(dset_mZ_id, dset_mx_id) != GT)
-        TEST_ERROR
+        TEST_ERROR;
     if (oh_compare(dset_mZ_id, dset_xZ_id) != LT)
-        TEST_ERROR
+        TEST_ERROR;
 
     /************
      * TEARDOWN *
      ************/
 
     if (H5Sclose(dspace_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Tclose(dtype_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Pclose(dcpl_xZ_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Pclose(dcpl_mx_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Pclose(dcpl_mZ_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Dclose(dset_xx_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Dclose(dset_xZ_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Dclose(dset_mx_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Dclose(dset_mZ_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Fclose(file_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     PASSED();
     return SUCCEED;
@@ -1490,49 +1516,49 @@ test_minimized_dset_ohdr_modification_times(hid_t _fapl_id)
      *********/
 
     if (h5_fixname(FILENAME[1], _fapl_id, filename, sizeof(filename)) == NULL)
-        TEST_ERROR
+        TEST_ERROR;
 
     dcpl_mx_id = H5Pcreate(H5P_DATASET_CREATE);
     if (dcpl_mx_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
     ret = H5Pset_dset_no_attrs_hint(dcpl_mx_id, TRUE);
     if (ret < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     dcpl_xT_id = H5Pcreate(H5P_DATASET_CREATE);
     if (dcpl_xT_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
     ret = H5Pset_obj_track_times(dcpl_xT_id, TRUE);
     if (ret < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     dcpl_mT_id = H5Pcreate(H5P_DATASET_CREATE);
     if (dcpl_mT_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
     ret = H5Pset_dset_no_attrs_hint(dcpl_mT_id, TRUE);
     if (ret < 0)
-        TEST_ERROR
+        TEST_ERROR;
     ret = H5Pset_obj_track_times(dcpl_mT_id, TRUE);
     if (ret < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     dcpl_mN_id = H5Pcreate(H5P_DATASET_CREATE);
     if (dcpl_mN_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
     ret = H5Pset_dset_no_attrs_hint(dcpl_mN_id, TRUE);
     if (ret < 0)
-        TEST_ERROR
+        TEST_ERROR;
     ret = H5Pset_obj_track_times(dcpl_mN_id, FALSE);
     if (ret < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     dspace_id = H5Screate_simple(1, extents, extents);
     if (dspace_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     dtype_id = H5Tcopy(H5T_NATIVE_INT);
     if (dtype_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     for (i = 0; i < n_cases; i++) {
 
@@ -1542,36 +1568,36 @@ test_minimized_dset_ohdr_modification_times(hid_t _fapl_id)
 
         fapl_id = H5Pcopy(_fapl_id);
         if (fapl_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         if (cases[i].oh_version > 1) {
             ret = H5Pset_libver_bounds(fapl_id, H5F_LIBVER_V18, H5F_LIBVER_V110);
             if (ret < 0)
-                TEST_ERROR
+                TEST_ERROR;
         }
 
         file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
         if (file_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         dset_xx_id = H5Dcreate2(file_id, "xx", dtype_id, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         if (dset_xx_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         dset_mx_id = H5Dcreate2(file_id, "mx", dtype_id, dspace_id, H5P_DEFAULT, dcpl_mx_id, H5P_DEFAULT);
         if (dset_mx_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         dset_xT_id = H5Dcreate2(file_id, "xT", dtype_id, dspace_id, H5P_DEFAULT, dcpl_xT_id, H5P_DEFAULT);
         if (dset_xT_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
         dset_mT_id = H5Dcreate2(file_id, "mT", dtype_id, dspace_id, H5P_DEFAULT, dcpl_mT_id, H5P_DEFAULT);
         if (dset_mT_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         dset_mN_id = H5Dcreate2(file_id, "mN", dtype_id, dspace_id, H5P_DEFAULT, dcpl_mN_id, H5P_DEFAULT);
         if (dset_mN_id < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* ----- *
          * TESTS *
@@ -1579,38 +1605,38 @@ test_minimized_dset_ohdr_modification_times(hid_t _fapl_id)
 
         /* sanity check */
         if (oh_compare(dset_mx_id, dset_xx_id) != LT)
-            TEST_ERROR
+            TEST_ERROR;
         if (oh_compare(dset_mx_id, dset_xT_id) != LT)
-            TEST_ERROR
+            TEST_ERROR;
 
         if (oh_compare(dset_xx_id, dset_xT_id) != EQ)
-            TEST_ERROR
+            TEST_ERROR;
         if (oh_compare(dset_mx_id, dset_mT_id) != EQ)
-            TEST_ERROR
+            TEST_ERROR;
         if (oh_compare(dset_mN_id, dset_mT_id) != LT)
-            TEST_ERROR
+            TEST_ERROR;
 
         if (oh_compare(dset_mT_id, dset_xT_id) != LT)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* ----------------- *
          * per-case teardown *
          * ----------------- */
 
         if (H5Dclose(dset_xx_id) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Dclose(dset_xT_id) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Dclose(dset_mx_id) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Dclose(dset_mT_id) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Dclose(dset_mN_id) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Fclose(file_id) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Pclose(fapl_id) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
     } /* for each version tested */
 
@@ -1619,17 +1645,17 @@ test_minimized_dset_ohdr_modification_times(hid_t _fapl_id)
      ************/
 
     if (H5Sclose(dspace_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Tclose(dtype_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Pclose(dcpl_xT_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Pclose(dcpl_mx_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Pclose(dcpl_mT_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Pclose(dcpl_mN_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     PASSED();
     return SUCCEED;
@@ -1681,22 +1707,22 @@ test_minimized_dset_ohdr_fillvalue_backwards_compatability(hid_t _fapl_id)
 
     fapl_id = H5Pcopy(_fapl_id);
     if (fapl_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     if (h5_fixname(FILENAME[1], fapl_id, filename, sizeof(filename)) == NULL)
-        TEST_ERROR
+        TEST_ERROR;
 
     dspace_id = H5Screate_simple(1, extents, extents);
     if (dspace_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     dtype_id = H5Tcopy(H5T_NATIVE_INT);
     if (dtype_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     dcpl_id = H5Pcreate(H5P_DATASET_CREATE);
     if (dcpl_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     ret = H5Pset_dset_no_attrs_hint(dcpl_id, TRUE);
     if (ret == FAIL)
@@ -1712,11 +1738,11 @@ test_minimized_dset_ohdr_fillvalue_backwards_compatability(hid_t _fapl_id)
 
     file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
     if (file_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     dset_0_id = H5Dcreate2(file_id, "fullrange", dtype_id, dspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
     if (dset_0_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     /* Close file and re-open with different libver bounds.
      * Dataset "fullrange" must also be closed for expected reopen behavior.
@@ -1724,7 +1750,7 @@ test_minimized_dset_ohdr_fillvalue_backwards_compatability(hid_t _fapl_id)
     if (H5Fclose(file_id) < 0)
         TEST_ERROR;
     if (H5Dclose(dset_0_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     ret = H5Pset_libver_bounds(fapl_id, H5F_LIBVER_V18, H5F_LIBVER_LATEST);
     if (ret == FAIL)
@@ -1732,17 +1758,17 @@ test_minimized_dset_ohdr_fillvalue_backwards_compatability(hid_t _fapl_id)
 
     file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl_id);
     if (file_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     dset_1_id = H5Dcreate2(file_id, "upperrange", dtype_id, dspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
     if (dset_1_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     /* re-open "fullrange" dataset
      */
     dset_0_id = H5Dopen2(file_id, "fullrange", H5P_DEFAULT);
     if (dset_0_id < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     /*********
      * TESTS *
@@ -1750,24 +1776,24 @@ test_minimized_dset_ohdr_fillvalue_backwards_compatability(hid_t _fapl_id)
 
     /* dset not supporting pre-1.08 should be smaller? */
     if (oh_compare(dset_1_id, dset_0_id) != LT)
-        TEST_ERROR
+        TEST_ERROR;
 
     /************
      * TEARDOWN *
      ************/
 
     if (H5Sclose(dspace_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Tclose(dtype_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Pclose(dcpl_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Pclose(fapl_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Dclose(dset_0_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Dclose(dset_1_id) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Fclose(file_id) < 0)
         TEST_ERROR;
 
@@ -1834,7 +1860,7 @@ main(void)
 
     /* Push API context */
     if (H5CX_push() < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     api_ctx_pushed = TRUE;
 
     /* Loop through all the combinations of low/high library format bounds */
@@ -1862,13 +1888,13 @@ main(void)
 
             /* test on object continuation block */
             if (test_cont(filename, fapl) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Create the file to operate on */
             if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (NULL == (f = (H5F_t *)H5VL_object(file)))
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_ignore_tags(f) < 0) {
                 H5_FAILED();
                 H5Eprint2(H5E_DEFAULT, stdout);
@@ -1882,28 +1908,28 @@ main(void)
             TESTING("object header creation");
             HDmemset(&oh_loc, 0, sizeof(oh_loc));
             if (H5O_create(f, (size_t)64, (size_t)0, H5P_GROUP_CREATE_DEFAULT, &oh_loc /*out*/) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             PASSED();
 
             /* create a new message */
             TESTING("message creation");
             time_new = 11111111;
             if (H5O_msg_create(&oh_loc, H5O_MTIME_NEW_ID, 0, 0, &time_new) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (1 != H5O_link(&oh_loc, 1))
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_prep_for_file_flush(f) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_flush(f) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_secure_from_file_flush(f) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_expunge_entry(f, H5AC_OHDR, oh_loc.addr, H5AC__NO_FLAGS_SET) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (NULL == H5O_msg_read(&oh_loc, H5O_MTIME_NEW_ID, &ro))
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (ro != time_new)
-                TEST_ERROR
+                TEST_ERROR;
             PASSED();
 
             /*
@@ -1912,25 +1938,25 @@ main(void)
             TESTING("message modification");
             time_new = 33333333;
             if (H5O_msg_write(&oh_loc, H5O_MTIME_NEW_ID, 0, 0, &time_new) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_prep_for_file_flush(f) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_flush(f) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_secure_from_file_flush(f) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_expunge_entry(f, H5AC_OHDR, oh_loc.addr, H5AC__NO_FLAGS_SET) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (NULL == H5O_msg_read(&oh_loc, H5O_MTIME_NEW_ID, &ro))
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (ro != time_new)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Make certain that chunk #0 in the object header can be encoded with a 1-byte size */
             if (H5O_get_hdr_info(&oh_loc, &hdr_info) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (hdr_info.space.total >= 256)
-                TEST_ERROR
+                TEST_ERROR;
 
             PASSED();
 
@@ -1946,22 +1972,22 @@ main(void)
             for (i = 0; i < 40; i++) {
                 time_new = (i + 1) * 1000 + 1000000;
                 if (H5O_msg_create(&oh_loc, H5O_MTIME_ID, 0, 0, &time_new) < 0)
-                    FAIL_STACK_ERROR
+                    FAIL_STACK_ERROR;
             } /* end for */
             if (H5AC_prep_for_file_flush(f) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_flush(f) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_secure_from_file_flush(f) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_expunge_entry(f, H5AC_OHDR, oh_loc.addr, H5AC__NO_FLAGS_SET) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
 
             /* Make certain that chunk #0 in the object header will be encoded with a 2-byte size */
             if (H5O_get_hdr_info(&oh_loc, &hdr_info) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (hdr_info.space.total < 256)
-                TEST_ERROR
+                TEST_ERROR;
 
             PASSED();
 
@@ -1972,18 +1998,18 @@ main(void)
              */
             TESTING("close & re-open object header");
             if (H5O_close(&oh_loc, NULL) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5Fclose(file) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if ((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (NULL == (f = (H5F_t *)H5VL_object(file)))
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_ignore_tags(f) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             oh_loc.file = f;
             if (H5O_open(&oh_loc) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             PASSED();
 
             /*
@@ -1994,15 +2020,15 @@ main(void)
             for (i = 0; i < 10; i++) {
                 time_new = (i + 1) * 1000 + 10;
                 if (H5O_msg_create(&oh_loc, H5O_MTIME_NEW_ID, 0, 0, &time_new) < 0)
-                    FAIL_STACK_ERROR
+                    FAIL_STACK_ERROR;
                 if (H5AC_prep_for_file_flush(f) < 0)
-                    FAIL_STACK_ERROR
+                    FAIL_STACK_ERROR;
                 if (H5AC_flush(f) < 0)
-                    FAIL_STACK_ERROR
+                    FAIL_STACK_ERROR;
                 if (H5AC_secure_from_file_flush(f) < 0)
-                    FAIL_STACK_ERROR
+                    FAIL_STACK_ERROR;
                 if (H5AC_expunge_entry(f, H5AC_OHDR, oh_loc.addr, H5AC__NO_FLAGS_SET) < 0)
-                    FAIL_STACK_ERROR
+                    FAIL_STACK_ERROR;
             } /* end for */
             PASSED();
 
@@ -2011,13 +2037,13 @@ main(void)
              */
             TESTING("message deletion");
             if (H5O_msg_remove(&oh_loc, H5O_MTIME_NEW_ID, H5O_ALL, TRUE) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5O_msg_remove(&oh_loc, H5O_MTIME_ID, H5O_ALL, TRUE) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5O_msg_read(&oh_loc, H5O_MTIME_NEW_ID, &ro))
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5O_msg_read(&oh_loc, H5O_MTIME_ID, &ro))
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             PASSED();
 
             /*
@@ -2027,19 +2053,19 @@ main(void)
             TESTING("constant message handling");
             time_new = 22222222;
             if (H5O_msg_create(&oh_loc, H5O_MTIME_NEW_ID, H5O_MSG_FLAG_CONSTANT, 0, &time_new) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_prep_for_file_flush(f) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_flush(f) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_secure_from_file_flush(f) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (H5AC_expunge_entry(f, H5AC_OHDR, oh_loc.addr, H5AC__NO_FLAGS_SET) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (NULL == H5O_msg_read(&oh_loc, H5O_MTIME_NEW_ID, &ro))
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if (ro != time_new)
-                TEST_ERROR
+                TEST_ERROR;
             time_new = 33333333;
             H5E_BEGIN_TRY
             {
@@ -2047,20 +2073,20 @@ main(void)
             }
             H5E_END_TRY;
             if (ret >= 0)
-                TEST_ERROR
+                TEST_ERROR;
             if (H5O_msg_remove(&oh_loc, H5O_MTIME_NEW_ID, H5O_ALL, TRUE) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             PASSED();
 
             /* release resources */
             TESTING("object header closing");
             if (H5O_close(&oh_loc, NULL) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             PASSED();
 
             /* Close the file we created */
             if (H5Fclose(file) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Test reading datasets with undefined object header messages
              * and the various "fail/mark if unknown" object header message flags
@@ -2068,7 +2094,7 @@ main(void)
             HDputs("Accessing objects with unknown header messages: H5O_BOGUS_VALID_ID");
             if (single_file_vfd) {
                 if (test_unknown(H5O_BOGUS_VALID_ID, filename, fapl) < 0)
-                    TEST_ERROR
+                    TEST_ERROR;
             } /* end if */
             else {
                 SKIPPED();
@@ -2077,7 +2103,7 @@ main(void)
             HDputs("Accessing objects with unknown header messages: H5O_BOGUS_INVALID_ID");
             if (single_file_vfd) {
                 if (test_unknown(H5O_BOGUS_INVALID_ID, filename, fapl) < 0)
-                    TEST_ERROR
+                    TEST_ERROR;
             } /* end if */
             else {
                 SKIPPED();
@@ -2086,22 +2112,22 @@ main(void)
 
             /* Test object header creation metadata cache issues */
             if (test_ohdr_cache(filename, fapl) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             if (test_minimized_dset_ohdr_attribute_addition(fapl) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             if (test_minimized_dset_ohdr_size_comparisons(fapl) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             if (test_minimized_dset_ohdr_with_filter(fapl) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             if (test_minimized_dset_ohdr_modification_times(fapl) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             if (test_minimized_dset_ohdr_fillvalue_backwards_compatability(fapl) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
         } /* high */
     }     /* low */
@@ -2111,21 +2137,21 @@ main(void)
 
     /* Verify symbol table messages are cached */
     if (h5_verify_cached_stabs(FILENAME, fapl) < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     if (H5FD__supports_swmr_test(env_h5_drvr)) {
         /* A test to exercise the re-read of the object header for SWMR access */
         if (test_ohdr_swmr(TRUE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (test_ohdr_swmr(FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
     }
     else
         HDputs("Skipped SWMR tests for SWMR-incompatible VFD");
 
     /* Pop API context */
     if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     api_ctx_pushed = FALSE;
 
     HDputs("All object header tests passed.");