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, 188 insertions, 188 deletions

diff --git a/test/vfd.c b/test/vfd.c
index afe2dde..412f202 100644
--- a/test/vfd.c
+++ b/test/vfd.c
@@ -216,28 +216,28 @@ test_sec2(void)
 
     /* Check that the VFD feature flags are correct */
     if ((driver_id = H5Pget_driver(fapl_id)) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5FDdriver_query(driver_id, &driver_flags) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_AGGREGATE_METADATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_ACCUMULATE_METADATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_DATA_SIEVE))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_AGGREGATE_SMALLDATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_POSIX_COMPAT_HANDLE))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_SUPPORTS_SWMR_IO))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_DEFAULT_VFD_COMPATIBLE))
-        TEST_ERROR
+        TEST_ERROR;
     /* Check for extra flags not accounted for above */
     if (driver_flags != (H5FD_FEAT_AGGREGATE_METADATA | H5FD_FEAT_ACCUMULATE_METADATA | H5FD_FEAT_DATA_SIEVE |
                          H5FD_FEAT_AGGREGATE_SMALLDATA | H5FD_FEAT_POSIX_COMPAT_HANDLE |
                          H5FD_FEAT_SUPPORTS_SWMR_IO | H5FD_FEAT_DEFAULT_VFD_COMPATIBLE))
-        TEST_ERROR
+        TEST_ERROR;
 
     if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
         TEST_ERROR;
@@ -360,26 +360,26 @@ test_core(void)
      * so backing-store related flags will not be returned here.
      */
     if ((driver_id = H5Pget_driver(fapl_id)) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5FDdriver_query(driver_id, &driver_flags) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_AGGREGATE_METADATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_ACCUMULATE_METADATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_DATA_SIEVE))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_AGGREGATE_SMALLDATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_ALLOW_FILE_IMAGE))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_CAN_USE_FILE_IMAGE_CALLBACKS))
-        TEST_ERROR
+        TEST_ERROR;
     /* Check for extra flags not accounted for above */
     if (driver_flags !=
         (H5FD_FEAT_AGGREGATE_METADATA | H5FD_FEAT_ACCUMULATE_METADATA | H5FD_FEAT_DATA_SIEVE |
          H5FD_FEAT_AGGREGATE_SMALLDATA | H5FD_FEAT_ALLOW_FILE_IMAGE | H5FD_FEAT_CAN_USE_FILE_IMAGE_CALLBACKS))
-        TEST_ERROR
+        TEST_ERROR;
 
     if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
         TEST_ERROR;
@@ -428,7 +428,7 @@ test_core(void)
      * they are correct.
      */
     if (H5Pget_fapl_core(fapl_id_out, &increment, &backing_store) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (increment != (size_t)CORE_INCREMENT)
         FAIL_PUTS_ERROR("incorrect increment from file fapl");
     if (backing_store != TRUE)
@@ -953,7 +953,7 @@ test_family_opens(char *fname, hid_t fa_pl)
     }
     H5E_END_TRY;
     if (file >= 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     /* Case 2: reopen file with correct name template but default property list */
     H5E_BEGIN_TRY
@@ -962,7 +962,7 @@ test_family_opens(char *fname, hid_t fa_pl)
     }
     H5E_END_TRY;
     if (file >= 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     /* Case 3: reopen file with wrong member size */
     if (H5Pset_fapl_family(fa_pl, (hsize_t)128, H5P_DEFAULT) < 0)
@@ -974,7 +974,7 @@ test_family_opens(char *fname, hid_t fa_pl)
     }
     H5E_END_TRY;
     if (file >= 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     /* Case 4: reopen file with wrong name template */
     HDstrcpy(wrong_name, fname);
@@ -993,7 +993,7 @@ test_family_opens(char *fname, hid_t fa_pl)
     }
     H5E_END_TRY;
     if (file >= 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     return 0;
 
@@ -1049,21 +1049,21 @@ test_family(void)
 
     /* Check that the VFD feature flags are correct */
     if ((driver_id = H5Pget_driver(fapl)) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5FDdriver_query(driver_id, &driver_flags) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_AGGREGATE_METADATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_ACCUMULATE_METADATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_DATA_SIEVE))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_AGGREGATE_SMALLDATA))
-        TEST_ERROR
+        TEST_ERROR;
     /* Check for extra flags not accounted for above */
     if (driver_flags != (H5FD_FEAT_AGGREGATE_METADATA | H5FD_FEAT_ACCUMULATE_METADATA | H5FD_FEAT_DATA_SIEVE |
                          H5FD_FEAT_AGGREGATE_SMALLDATA))
-        TEST_ERROR
+        TEST_ERROR;
 
     if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         TEST_ERROR;
@@ -1560,21 +1560,21 @@ test_multi(void)
 
     /* Check that the VFD feature flags are correct */
     if ((driver_id = H5Pget_driver(fapl)) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5FDdriver_query(driver_id, &driver_flags) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_DATA_SIEVE))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_AGGREGATE_SMALLDATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_USE_ALLOC_SIZE))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_PAGED_AGGR))
-        TEST_ERROR
+        TEST_ERROR;
     /* Check for extra flags not accounted for above */
     if (driver_flags != (H5FD_FEAT_DATA_SIEVE | H5FD_FEAT_AGGREGATE_SMALLDATA | H5FD_FEAT_USE_ALLOC_SIZE |
                          H5FD_FEAT_PAGED_AGGR))
-        TEST_ERROR
+        TEST_ERROR;
 
     if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         TEST_ERROR;
@@ -1661,7 +1661,7 @@ test_multi(void)
 
     /* Create and write attribute for the root group. */
     if ((root = H5Gopen2(file, "/", H5P_DEFAULT)) < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     /* Attribute string. */
     if ((atype = H5Tcopy(H5T_C_S1)) < 0)
@@ -1966,28 +1966,28 @@ test_log(void)
 
     /* Check that the VFD feature flags are correct */
     if ((driver_id = H5Pget_driver(fapl)) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5FDdriver_query(driver_id, &driver_flags) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_AGGREGATE_METADATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_ACCUMULATE_METADATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_DATA_SIEVE))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_AGGREGATE_SMALLDATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_POSIX_COMPAT_HANDLE))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_SUPPORTS_SWMR_IO))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_DEFAULT_VFD_COMPATIBLE))
-        TEST_ERROR
+        TEST_ERROR;
     /* Check for extra flags not accounted for above */
     if (driver_flags != (H5FD_FEAT_AGGREGATE_METADATA | H5FD_FEAT_ACCUMULATE_METADATA | H5FD_FEAT_DATA_SIEVE |
                          H5FD_FEAT_AGGREGATE_SMALLDATA | H5FD_FEAT_POSIX_COMPAT_HANDLE |
                          H5FD_FEAT_SUPPORTS_SWMR_IO | H5FD_FEAT_DEFAULT_VFD_COMPATIBLE))
-        TEST_ERROR
+        TEST_ERROR;
 
     /* Create the test file */
     if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
@@ -2079,23 +2079,23 @@ test_stdio(void)
 
     /* Check that the VFD feature flags are correct */
     if ((driver_id = H5Pget_driver(fapl)) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5FDdriver_query(driver_id, &driver_flags) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_AGGREGATE_METADATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_ACCUMULATE_METADATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_DATA_SIEVE))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_AGGREGATE_SMALLDATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_DEFAULT_VFD_COMPATIBLE))
-        TEST_ERROR
+        TEST_ERROR;
     /* Check for extra flags not accounted for above */
     if (driver_flags != (H5FD_FEAT_AGGREGATE_METADATA | H5FD_FEAT_ACCUMULATE_METADATA | H5FD_FEAT_DATA_SIEVE |
                          H5FD_FEAT_AGGREGATE_SMALLDATA | H5FD_FEAT_DEFAULT_VFD_COMPATIBLE))
-        TEST_ERROR
+        TEST_ERROR;
 
     if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         TEST_ERROR;
@@ -2197,28 +2197,28 @@ test_windows(void)
 
     /* Check that the VFD feature flags are correct */
     if ((driver_id = H5Pget_driver(fapl)) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5FDdriver_query(driver_id, &driver_flags) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_AGGREGATE_METADATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_ACCUMULATE_METADATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_DATA_SIEVE))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_AGGREGATE_SMALLDATA))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_POSIX_COMPAT_HANDLE))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_SUPPORTS_SWMR_IO))
-        TEST_ERROR
+        TEST_ERROR;
     if (!(driver_flags & H5FD_FEAT_DEFAULT_VFD_COMPATIBLE))
-        TEST_ERROR
+        TEST_ERROR;
     /* Check for extra flags not accounted for above */
     if (driver_flags != (H5FD_FEAT_AGGREGATE_METADATA | H5FD_FEAT_ACCUMULATE_METADATA | H5FD_FEAT_DATA_SIEVE |
                          H5FD_FEAT_AGGREGATE_SMALLDATA | H5FD_FEAT_POSIX_COMPAT_HANDLE |
                          H5FD_FEAT_SUPPORTS_SWMR_IO | H5FD_FEAT_DEFAULT_VFD_COMPATIBLE))
-        TEST_ERROR
+        TEST_ERROR;
 
     if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         TEST_ERROR;
@@ -2351,11 +2351,11 @@ test_ros3(void)
         TEST_ERROR;
 
     if (!(driver_flags & H5FD_FEAT_DATA_SIEVE))
-        TEST_ERROR
+        TEST_ERROR;
 
     /* Check for extra flags not accounted for above */
     if (driver_flags != (H5FD_FEAT_DATA_SIEVE))
-        TEST_ERROR
+        TEST_ERROR;
 
     PASSED();
     return 0;
@@ -2676,7 +2676,7 @@ driver_is_splitter_compatible(hid_t fapl_id)
     }
 
     if (H5Pclose(split_fapl_id) < 0) {
-        FAIL_PUTS_ERROR("Can't close contained FAPL")
+        FAIL_PUTS_ERROR("Can't close contained FAPL");
     }
     split_fapl_id = H5I_INVALID_HID;
 
@@ -3759,7 +3759,7 @@ test_ctl(void)
     if (H5Pset_driver(fapl_id, driver_id, NULL) < 0)
         PUTS_ERROR("couldn't set testing VFD on FAPL");
 
-    TESTING_2("known op code to terminal VFD (without fail on unknown flag)")
+    TESTING_2("known op code to terminal VFD (without fail on unknown flag)");
 
     op_code = H5FD_CTL__TEST_OPCODE;
     flags   = 0;
@@ -3770,7 +3770,7 @@ test_ctl(void)
 
     PASSED();
 
-    TESTING_2("known op code to terminal VFD (with fail on unknown flag)")
+    TESTING_2("known op code to terminal VFD (with fail on unknown flag)");
 
     op_code = H5FD_CTL__TEST_OPCODE;
     flags   = H5FD_CTL__FAIL_IF_UNKNOWN_FLAG;
@@ -3781,7 +3781,7 @@ test_ctl(void)
 
     PASSED();
 
-    TESTING_2("known op code to terminal VFD (without fail on unknown flag/route to terminal VFD)")
+    TESTING_2("known op code to terminal VFD (without fail on unknown flag/route to terminal VFD)");
 
     op_code = H5FD_CTL__TEST_OPCODE;
     flags   = H5FD_CTL__ROUTE_TO_TERMINAL_VFD_FLAG;
@@ -3792,7 +3792,7 @@ test_ctl(void)
 
     PASSED();
 
-    TESTING_2("known op code to terminal VFD (with fail on unknown flag/route to terminal VFD)")
+    TESTING_2("known op code to terminal VFD (with fail on unknown flag/route to terminal VFD)");
 
     op_code = H5FD_CTL__TEST_OPCODE;
     flags   = H5FD_CTL__FAIL_IF_UNKNOWN_FLAG | H5FD_CTL__ROUTE_TO_TERMINAL_VFD_FLAG;
@@ -3803,7 +3803,7 @@ test_ctl(void)
 
     PASSED();
 
-    TESTING_2("unknown op code to terminal VFD (without fail on unknown flag)")
+    TESTING_2("unknown op code to terminal VFD (without fail on unknown flag)");
 
     op_code = H5FD_CTL_OPC_RESERVED;
     flags   = 0;
@@ -3814,7 +3814,7 @@ test_ctl(void)
 
     PASSED();
 
-    TESTING_2("unknown op code to terminal VFD (with fail on unknown flag)")
+    TESTING_2("unknown op code to terminal VFD (with fail on unknown flag)");
 
     op_code = H5FD_CTL_OPC_RESERVED;
     flags   = H5FD_CTL__FAIL_IF_UNKNOWN_FLAG;
@@ -3825,7 +3825,7 @@ test_ctl(void)
 
     PASSED();
 
-    TESTING_2("unknown op code to terminal VFD (without fail on unknown flag/route to terminal VFD)")
+    TESTING_2("unknown op code to terminal VFD (without fail on unknown flag/route to terminal VFD)");
 
     op_code = H5FD_CTL_OPC_RESERVED;
     flags   = H5FD_CTL__ROUTE_TO_TERMINAL_VFD_FLAG;
@@ -3836,7 +3836,7 @@ test_ctl(void)
 
     PASSED();
 
-    TESTING_2("unknown op code to terminal VFD (with fail on unknown flag/route to terminal VFD)")
+    TESTING_2("unknown op code to terminal VFD (with fail on unknown flag/route to terminal VFD)");
 
     op_code = H5FD_CTL_OPC_RESERVED;
     flags   = H5FD_CTL__FAIL_IF_UNKNOWN_FLAG | H5FD_CTL__ROUTE_TO_TERMINAL_VFD_FLAG;
@@ -3868,7 +3868,7 @@ test_ctl(void)
         PUTS_ERROR("couldn't set splitter VFD on FAPL");
 
     TESTING_2("known op code through passthrough VFD to terminal VFD (without fail on unknown flag/no "
-              "routing flag)")
+              "routing flag)");
 
     op_code = H5FD_CTL__TEST_OPCODE;
     flags   = 0;
@@ -3884,7 +3884,7 @@ test_ctl(void)
     PASSED();
 
     TESTING_2(
-        "known op code through passthrough VFD to terminal VFD (with fail on unknown flag/no routing flag)")
+        "known op code through passthrough VFD to terminal VFD (with fail on unknown flag/no routing flag)");
 
     op_code = H5FD_CTL__TEST_OPCODE;
     flags   = H5FD_CTL__FAIL_IF_UNKNOWN_FLAG;
@@ -3901,7 +3901,7 @@ test_ctl(void)
     PASSED();
 
     TESTING_2("known op code through passthrough VFD to terminal VFD (without fail on unknown flag/route to "
-              "terminal VFD)")
+              "terminal VFD)");
 
     op_code = H5FD_CTL__TEST_OPCODE;
     flags   = H5FD_CTL__ROUTE_TO_TERMINAL_VFD_FLAG;
@@ -3917,7 +3917,7 @@ test_ctl(void)
     PASSED();
 
     TESTING_2("known op code through passthrough VFD to terminal VFD (with fail on unknown flag/route to "
-              "terminal VFD)")
+              "terminal VFD)");
 
     op_code = H5FD_CTL__TEST_OPCODE;
     flags   = H5FD_CTL__FAIL_IF_UNKNOWN_FLAG | H5FD_CTL__ROUTE_TO_TERMINAL_VFD_FLAG;
@@ -3932,7 +3932,7 @@ test_ctl(void)
 
     PASSED();
 
-    TESTING_2("unknown op code to passthrough VFD (without fail on unknown flag)")
+    TESTING_2("unknown op code to passthrough VFD (without fail on unknown flag)");
 
     op_code = H5FD_CTL_OPC_RESERVED;
     flags   = 0;
@@ -3947,7 +3947,7 @@ test_ctl(void)
 
     PASSED();
 
-    TESTING_2("unknown op code to passthrough VFD (with fail on unknown flag)")
+    TESTING_2("unknown op code to passthrough VFD (with fail on unknown flag)");
 
     op_code = H5FD_CTL_OPC_RESERVED;
     flags   = H5FD_CTL__FAIL_IF_UNKNOWN_FLAG;
@@ -3962,7 +3962,7 @@ test_ctl(void)
 
     PASSED();
 
-    TESTING_2("unknown op code to passthrough VFD (without fail on unknown flag/route to terminal VFD)")
+    TESTING_2("unknown op code to passthrough VFD (without fail on unknown flag/route to terminal VFD)");
 
     op_code = H5FD_CTL_OPC_RESERVED;
     flags   = H5FD_CTL__ROUTE_TO_TERMINAL_VFD_FLAG;
@@ -3980,7 +3980,7 @@ test_ctl(void)
 
     PASSED();
 
-    TESTING_2("unknown op code to passthrough VFD (with fail on unknown flag/route to terminal VFD)")
+    TESTING_2("unknown op code to passthrough VFD (with fail on unknown flag/route to terminal VFD)");
 
     op_code = H5FD_CTL_OPC_RESERVED;
     flags   = H5FD_CTL__FAIL_IF_UNKNOWN_FLAG | H5FD_CTL__ROUTE_TO_TERMINAL_VFD_FLAG;
@@ -3998,7 +3998,7 @@ test_ctl(void)
 
     PASSED();
 
-    TESTING_2("test cleanup")
+    TESTING_2("test cleanup");
 
     HDfree(splitter_config);
 
@@ -4631,7 +4631,7 @@ test_vector_io(const char *vfd_name)
     else {
 
         HDfprintf(stdout, "un-supported VFD\n");
-        TEST_ERROR
+        TEST_ERROR;
     }
 
     /* setup the test vectors -- note that addresses are not set until
@@ -5009,7 +5009,7 @@ test_selection_io_write(H5FD_t *lf, H5FD_mem_t type, uint32_t count, hid_t mem_s
     /* Issue write call */
     if (H5FDwrite_selection(lf, type, H5P_DEFAULT, count, mem_spaces, file_spaces, offsets, element_sizes,
                             (const void **)wbufs) < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     return 0;
 
@@ -5061,14 +5061,14 @@ test_selection_io_read_verify(H5FD_t *lf, H5FD_mem_t type, uint32_t count, hid_t
     /* Issue read call */
     if (H5FDread_selection(lf, type, H5P_DEFAULT, count, mem_spaces, file_spaces, offsets, element_sizes,
                            (void **)rbufs) < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     /* Verify result */
     for (i = 0; i < (int)rbufcount; i++)
         for (j = 0; j < SEL_IO_DIM0 * SEL_IO_DIM1; j++)
             if (rbufs[i][j] != erbufs[i][j]) {
-                H5_FAILED()
-                AT()
+                H5_FAILED();
+                AT();
                 HDprintf("data read from file does not match expected values at mapping array location %d\n",
                          i);
                 HDprintf("expected data: \n");
@@ -5152,26 +5152,26 @@ test_selection_io(const char *vfd_name)
     /* Set property list and file name for target driver */
 
     if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     if (HDstrcmp(vfd_name, "sec2") == 0) {
 
         if (H5Pset_fapl_sec2(fapl_id) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         h5_fixname(FILENAME[0], fapl_id, filename, sizeof(filename));
     }
     else if (HDstrcmp(vfd_name, "stdio") == 0) {
 
         if (H5Pset_fapl_stdio(fapl_id) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         h5_fixname(FILENAME[7], fapl_id, filename, sizeof filename);
     }
     else {
 
         HDfprintf(stdout, "un-supported VFD\n");
-        TEST_ERROR
+        TEST_ERROR;
     }
 
     /* Initialize write buffers */
@@ -5183,13 +5183,13 @@ test_selection_io(const char *vfd_name)
 
     /* Create dataspaces - location 0 will be 1D and location 1 will be 2D */
     if ((mem_spaces[0] = H5Screate_simple(1, dims1, NULL)) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if ((mem_spaces[1] = H5Screate_simple(2, dims2, NULL)) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if ((file_spaces[0] = H5Screate_simple(1, dims1, NULL)) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if ((file_spaces[1] = H5Screate_simple(2, dims2, NULL)) < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     /* Create file */
     flags = H5F_ACC_RDWR | H5F_ACC_CREAT | H5F_ACC_TRUNC;
@@ -5209,7 +5209,7 @@ test_selection_io(const char *vfd_name)
         /* Issue write call */
         if (test_selection_io_write(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], element_sizes,
                                     (int **)&wbufs[0]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Update file buf */
         for (i = 0; i < SEL_IO_DIM0 * SEL_IO_DIM1; i++)
@@ -5218,7 +5218,7 @@ test_selection_io(const char *vfd_name)
         /* Read and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0],
                                           element_sizes, 1, (int **)&fbufs[0], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /*
          * Test 2: Simple 2D contiguous I/O
@@ -5226,7 +5226,7 @@ test_selection_io(const char *vfd_name)
         /* Issue write call */
         if (test_selection_io_write(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], element_sizes,
                                     (int **)&wbufs[1]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Update file buf */
         for (i = 0; i < SEL_IO_DIM0; i++)
@@ -5236,7 +5236,7 @@ test_selection_io(const char *vfd_name)
         /* Read and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1],
                                           element_sizes, 1, (int **)&fbufs[1], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /*
          * Test 3: Strided <> Contiguous 1D I/O
@@ -5250,16 +5250,16 @@ test_selection_io(const char *vfd_name)
         count[0]  = (SEL_IO_DIM0 * SEL_IO_DIM1) / 2;
         block[0]  = 1;
         if (H5Sselect_hyperslab(mem_spaces[0], H5S_SELECT_SET, start, stride, count, block) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Contiguous selection in file */
         if (H5Sselect_hyperslab(file_spaces[0], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Issue write call */
         if (test_selection_io_write(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], element_sizes,
                                     (int **)&wbufs[0]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Update file buf */
         for (i = 0; i < (SEL_IO_DIM0 * SEL_IO_DIM1) / 2; i++)
@@ -5274,18 +5274,18 @@ test_selection_io(const char *vfd_name)
         /* Read and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0],
                                           element_sizes, 1, (int **)&erbufs[0], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Reset selections */
         if (H5Sselect_all(mem_spaces[0]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Sselect_all(file_spaces[0]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Read entire file buffer and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0],
                                           element_sizes, 1, (int **)&fbufs[0], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /*
          * Test 4: Contiguous <> Strided 1D I/O
@@ -5297,18 +5297,18 @@ test_selection_io(const char *vfd_name)
         start[0]  = 1;
         stride[0] = 2;
         if (H5Sselect_hyperslab(mem_spaces[0], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Strided selection in file */
         count[0] = (SEL_IO_DIM0 * SEL_IO_DIM1) / 2;
         block[0] = 1;
         if (H5Sselect_hyperslab(file_spaces[0], H5S_SELECT_SET, start, stride, count, block) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Issue write call */
         if (test_selection_io_write(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], element_sizes,
                                     (int **)&wbufs[0]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Update file buf */
         for (i = 0; i < (SEL_IO_DIM0 * SEL_IO_DIM1) / 2; i++)
@@ -5323,18 +5323,18 @@ test_selection_io(const char *vfd_name)
         /* Read and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0],
                                           element_sizes, 1, (int **)&erbufs[0], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Reset selections */
         if (H5Sselect_all(mem_spaces[0]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Sselect_all(file_spaces[0]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Read entire file buffer and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0],
                                           element_sizes, 1, (int **)&fbufs[0], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /*
          * Test 5: Strided <> Strided 1D I/O
@@ -5348,17 +5348,17 @@ test_selection_io(const char *vfd_name)
         count[0]  = (SEL_IO_DIM0 * SEL_IO_DIM1) / 2;
         block[0]  = 1;
         if (H5Sselect_hyperslab(mem_spaces[0], H5S_SELECT_SET, start, stride, count, block) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Strided selection in file */
         start[0] = 0;
         if (H5Sselect_hyperslab(file_spaces[0], H5S_SELECT_SET, start, stride, count, block) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Issue write call */
         if (test_selection_io_write(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], element_sizes,
                                     (int **)&wbufs[0]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Update file buf */
         for (i = 0; i < (SEL_IO_DIM0 * SEL_IO_DIM1) / 2; i++)
@@ -5373,18 +5373,18 @@ test_selection_io(const char *vfd_name)
         /* Read and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0],
                                           element_sizes, 1, (int **)&erbufs[0], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Reset selections */
         if (H5Sselect_all(mem_spaces[0]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Sselect_all(file_spaces[0]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Read entire file buffer and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0],
                                           element_sizes, 1, (int **)&fbufs[0], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /*
          * Test 6: Strided <> Contiguous 2D I/O
@@ -5399,16 +5399,16 @@ test_selection_io(const char *vfd_name)
         block[0]  = 1;
         block[1]  = 1;
         if (H5Sselect_hyperslab(mem_spaces[1], H5S_SELECT_SET, start, stride, count, block) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Contiguous selection in file */
         if (H5Sselect_hyperslab(file_spaces[1], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Issue write call */
         if (test_selection_io_write(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], element_sizes,
                                     (int **)&wbufs[1]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Update file buf */
         for (i = 0; i < SEL_IO_DIM0 / 2; i++)
@@ -5426,18 +5426,18 @@ test_selection_io(const char *vfd_name)
         /* Read and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1],
                                           element_sizes, 1, (int **)&erbufs[1], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Reset selections */
         if (H5Sselect_all(mem_spaces[1]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Sselect_all(file_spaces[1]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Read entire file buffer and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1],
                                           element_sizes, 1, (int **)&fbufs[1], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /*
          * Test 7: Contiguous <> Strided 2D I/O
@@ -5448,7 +5448,7 @@ test_selection_io(const char *vfd_name)
         count[0] = SEL_IO_DIM0;
         count[1] = SEL_IO_DIM1 / 2;
         if (H5Sselect_hyperslab(mem_spaces[1], H5S_SELECT_SET, start, NULL, count, NULL) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Strided selection in file */
         stride[0] = 1;
@@ -5456,12 +5456,12 @@ test_selection_io(const char *vfd_name)
         block[0]  = 1;
         block[1]  = 1;
         if (H5Sselect_hyperslab(file_spaces[1], H5S_SELECT_SET, start, stride, count, block) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Issue write call */
         if (test_selection_io_write(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], element_sizes,
                                     (int **)&wbufs[1]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Update file buf */
         for (i = 0; i < SEL_IO_DIM0; i++)
@@ -5479,18 +5479,18 @@ test_selection_io(const char *vfd_name)
         /* Read and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1],
                                           element_sizes, 1, (int **)&erbufs[1], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Reset selections */
         if (H5Sselect_all(mem_spaces[1]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Sselect_all(file_spaces[1]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Read entire file buffer and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1],
                                           element_sizes, 1, (int **)&fbufs[1], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /*
          * Test 8: Strided <> Strided 2D I/O
@@ -5509,7 +5509,7 @@ test_selection_io(const char *vfd_name)
         block[0]  = 1;
         block[1]  = 1;
         if (H5Sselect_hyperslab(mem_spaces[1], H5S_SELECT_SET, start, stride, count, block) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Strided selection (across dim 0) in file */
         start[0]  = 1;
@@ -5521,12 +5521,12 @@ test_selection_io(const char *vfd_name)
         block[0]  = 1;
         block[1]  = 1;
         if (H5Sselect_hyperslab(file_spaces[1], H5S_SELECT_SET, start, stride, count, block) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Issue write call */
         if (test_selection_io_write(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], element_sizes,
                                     (int **)&wbufs[1]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Update file buf */
         for (i = 0, i2 = 1, j2 = 0; i < SEL_IO_DIM0; i++)
@@ -5550,18 +5550,18 @@ test_selection_io(const char *vfd_name)
         /* Read and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1],
                                           element_sizes, 1, (int **)&erbufs[1], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Reset selections */
         if (H5Sselect_all(mem_spaces[1]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Sselect_all(file_spaces[1]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Read entire file buffer and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1],
                                           element_sizes, 1, (int **)&fbufs[1], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /*
          * Test 9: Strided 1D <> Strided 2D I/O
@@ -5572,7 +5572,7 @@ test_selection_io(const char *vfd_name)
         count[0]  = (SEL_IO_DIM0 * SEL_IO_DIM1) / 2;
         block[0]  = 1;
         if (H5Sselect_hyperslab(mem_spaces[0], H5S_SELECT_SET, start, stride, count, block) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Strided selection (across dim 1) in file */
         start[0]  = 0;
@@ -5584,12 +5584,12 @@ test_selection_io(const char *vfd_name)
         block[0]  = 1;
         block[1]  = 1;
         if (H5Sselect_hyperslab(file_spaces[1], H5S_SELECT_SET, start, stride, count, block) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Issue write call */
         if (test_selection_io_write(lf, type, 1, &mem_spaces[0], &file_spaces[1], &addrs[1], element_sizes,
                                     (int **)&wbufs[0]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Update file buf */
         for (i = 1, i2 = 0, j2 = 1; i < (SEL_IO_DIM0 * SEL_IO_DIM1); i += 2) {
@@ -5611,18 +5611,18 @@ test_selection_io(const char *vfd_name)
         /* Read and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[1], &addrs[1],
                                           element_sizes, 1, (int **)&erbufs[0], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Reset selections */
         if (H5Sselect_all(mem_spaces[0]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Sselect_all(file_spaces[1]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Read entire file buffer and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[0], &file_spaces[1], &addrs[1],
                                           element_sizes, 1, (int **)&fbufs[1], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /*
          * Test 10: Strided 2D <> Strided 1D I/O
@@ -5637,7 +5637,7 @@ test_selection_io(const char *vfd_name)
         block[0]  = 1;
         block[1]  = 1;
         if (H5Sselect_hyperslab(mem_spaces[1], H5S_SELECT_SET, start, stride, count, block) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Strided selection in file */
         start[0]  = 0;
@@ -5645,12 +5645,12 @@ test_selection_io(const char *vfd_name)
         count[0]  = (SEL_IO_DIM0 * SEL_IO_DIM1) / 2;
         block[0]  = 1;
         if (H5Sselect_hyperslab(file_spaces[0], H5S_SELECT_SET, start, stride, count, block) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Issue write call */
         if (test_selection_io_write(lf, type, 1, &mem_spaces[1], &file_spaces[0], &addrs[0], element_sizes,
                                     (int **)&wbufs[1]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Update file buf */
         for (i = 0, i2 = 0; i < SEL_IO_DIM0; i += 2)
@@ -5671,18 +5671,18 @@ test_selection_io(const char *vfd_name)
         /* Read and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[0], &addrs[0],
                                           element_sizes, 1, (int **)&erbufs[1], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Reset selections */
         if (H5Sselect_all(mem_spaces[1]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Sselect_all(file_spaces[0]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Read entire file buffer and verify */
         if (test_selection_io_read_verify(lf, type, 1, &mem_spaces[1], &file_spaces[0], &addrs[0],
                                           element_sizes, 1, (int **)&fbufs[0], FALSE) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Run tests with full and partial element sizes array */
         for (shorten_element_sizes = 0; shorten_element_sizes <= 1; shorten_element_sizes++) {
@@ -5698,12 +5698,12 @@ test_selection_io(const char *vfd_name)
             count[0]  = (SEL_IO_DIM0 * SEL_IO_DIM1) / 2;
             block[0]  = 1;
             if (H5Sselect_hyperslab(mem_spaces[0], H5S_SELECT_SET, start, stride, count, block) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Strided selection in file (1D) */
             start[0] = 1;
             if (H5Sselect_hyperslab(file_spaces[0], H5S_SELECT_SET, start, stride, count, block) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Strided selection (across dim 0) in memory (2D) */
             start[0]  = 1;
@@ -5715,7 +5715,7 @@ test_selection_io(const char *vfd_name)
             block[0]  = 1;
             block[1]  = 1;
             if (H5Sselect_hyperslab(mem_spaces[1], H5S_SELECT_SET, start, stride, count, block) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Strided selection (across dim 1) in file (2D) */
             start[0]  = 0;
@@ -5727,12 +5727,12 @@ test_selection_io(const char *vfd_name)
             block[0]  = 1;
             block[1]  = 1;
             if (H5Sselect_hyperslab(file_spaces[1], H5S_SELECT_SET, start, stride, count, block) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Issue write call */
             if (test_selection_io_write(lf, type, 2, mem_spaces, file_spaces, addrs, element_sizes,
                                         (int **)wbufs) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Update file bufs */
             for (i = 0; i < (SEL_IO_DIM0 * SEL_IO_DIM1) / 2; i++)
@@ -5763,31 +5763,31 @@ test_selection_io(const char *vfd_name)
             /* Read and verify */
             if (test_selection_io_read_verify(lf, type, 2, mem_spaces, file_spaces, addrs, element_sizes, 2,
                                               (int **)erbufs, FALSE) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Reset selections */
             if (H5Sselect_all(mem_spaces[0]) < 0)
-                TEST_ERROR
+                TEST_ERROR;
             if (H5Sselect_all(file_spaces[0]) < 0)
-                TEST_ERROR
+                TEST_ERROR;
             if (H5Sselect_all(mem_spaces[1]) < 0)
-                TEST_ERROR
+                TEST_ERROR;
             if (H5Sselect_all(file_spaces[1]) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Read entire file buffer and verify */
             if (test_selection_io_read_verify(lf, type, 2, mem_spaces, file_spaces, addrs, element_sizes, 2,
                                               (int **)fbufs, FALSE) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /*
              * Test 12: Strided <> Strided 2D I/O, 2 different selections in the same memory buffer
              */
             /* Switch mem and file spaces to both be 2D */
             if (H5Sset_extent_simple(mem_spaces[0], 2, dims2, NULL) < 0)
-                TEST_ERROR
+                TEST_ERROR;
             if (H5Sset_extent_simple(file_spaces[0], 2, dims2, NULL) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Strided selection in memory (1st) */
             start[0]  = 0;
@@ -5799,12 +5799,12 @@ test_selection_io(const char *vfd_name)
             block[0]  = 1;
             block[1]  = 1;
             if (H5Sselect_hyperslab(mem_spaces[0], H5S_SELECT_SET, start, stride, count, block) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Strided selection (across dim 0) in memory (2nd) */
             start[0] = 1;
             if (H5Sselect_hyperslab(mem_spaces[1], H5S_SELECT_SET, start, stride, count, block) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Strided selection in file (1st) */
             start[0]  = 0;
@@ -5816,7 +5816,7 @@ test_selection_io(const char *vfd_name)
             block[0]  = 1;
             block[1]  = 1;
             if (H5Sselect_hyperslab(file_spaces[0], H5S_SELECT_SET, start, stride, count, block) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Strided selection (across dim 1) in file (2nd) */
             start[0]  = 0;
@@ -5828,7 +5828,7 @@ test_selection_io(const char *vfd_name)
             block[0]  = 1;
             block[1]  = 1;
             if (H5Sselect_hyperslab(file_spaces[1], H5S_SELECT_SET, start, stride, count, block) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Use the same memory buffer for both selections */
             wbufs[0] = wbuf2[0];
@@ -5842,7 +5842,7 @@ test_selection_io(const char *vfd_name)
             /* Issue write call */
             if (test_selection_io_write(lf, type, 2, mem_spaces, file_spaces, addrs, element_sizes,
                                         (int **)wbufs) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Update file bufs - need to reuse 1D array so data stays consistent, so use math to
              * find 1D index into 2D array */
@@ -5881,28 +5881,28 @@ test_selection_io(const char *vfd_name)
             /* Read and verify */
             if (test_selection_io_read_verify(lf, type, 2, mem_spaces, file_spaces, addrs, element_sizes, 1,
                                               (int **)&erbufs[1], shorten_element_sizes ? TRUE : FALSE) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Reset selections */
             if (H5Sselect_all(mem_spaces[0]) < 0)
-                TEST_ERROR
+                TEST_ERROR;
             if (H5Sselect_all(file_spaces[0]) < 0)
-                TEST_ERROR
+                TEST_ERROR;
             if (H5Sselect_all(mem_spaces[1]) < 0)
-                TEST_ERROR
+                TEST_ERROR;
             if (H5Sselect_all(file_spaces[1]) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Read entire file buffer and verify */
             if (test_selection_io_read_verify(lf, type, 2, mem_spaces, file_spaces, addrs, element_sizes, 2,
                                               (int **)fbufs, FALSE) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Reset first spaces to 1D */
             if (H5Sset_extent_simple(mem_spaces[0], 1, dims1, NULL) < 0)
-                TEST_ERROR
+                TEST_ERROR;
             if (H5Sset_extent_simple(file_spaces[0], 1, dims1, NULL) < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Reset write buffer array */
             wbufs[0] = wbuf1;
@@ -5932,9 +5932,9 @@ test_selection_io(const char *vfd_name)
     /* Close dataspaces */
     for (i = 0; i < 2; i++) {
         if (H5Sclose(mem_spaces[i]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Sclose(file_spaces[i]) < 0)
-            TEST_ERROR
+            TEST_ERROR;
     }
 
     PASSED();