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

diff --git a/test/enc_dec_plist_cross_platform.c b/test/enc_dec_plist_cross_platform.c
index 3030d7c..cafe475 100644
--- a/test/enc_dec_plist_cross_platform.c
+++ b/test/enc_dec_plist_cross_platform.c
@@ -33,121 +33,121 @@ main(void)
     /******* ENCODE/DECODE DCPLS *****/
     TESTING("Default DCPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/def_dcpl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
     TESTING("DCPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/dcpl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE DAPLS *****/
     TESTING("Default DAPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/def_dapl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
     TESTING("DAPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/dapl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE DXPLS *****/
     TESTING("Default DXPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/def_dxpl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
     TESTING("DXPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/dxpl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE GCPLS *****/
     TESTING("Default GCPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/def_gcpl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
     TESTING("GCPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/gcpl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE LCPLS *****/
     TESTING("Default LCPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/def_lcpl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
     TESTING("LCPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/lcpl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE LAPLS *****/
     TESTING("Default LAPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/def_lapl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
     TESTING("LAPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/lapl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE OCPLS *****/
     TESTING("Default OCPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/def_ocpl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
     TESTING("OCPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/ocpl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE OCPYPLS *****/
     TESTING("Default OCPYPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/def_ocpypl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
     TESTING("OCPYPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/ocpypl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE FCPLS *****/
     TESTING("Default FCPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/def_fcpl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
     TESTING("FCPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/fcpl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE FAPLS *****/
     TESTING("Default FAPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/def_fapl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
     TESTING("FAPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/fapl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE STRCPLS *****/
     TESTING("Default STRCPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/def_strcpl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
     TESTING("STRCPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/strcpl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE ACPLS *****/
     TESTING("Default ACPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/def_acpl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
     TESTING("ACPL Encoding/Decoding");
     if (test_plists("testfiles/plist_files/acpl_") < 0)
-        FAIL_STACK_ERROR
+        FAIL_STACK_ERROR;
     PASSED();
 
     return 0;
@@ -173,50 +173,50 @@ test_plists(const char *filename_prefix)
             /* Generate filename for file 1 */
             if (HDsnprintf(filename, sizeof(filename), "%s%s%s", filename_prefix,
                            config_1 & CONFIG_64 ? "64" : "32", config_1 & CONFIG_LE ? "le" : "be") < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Read file 1 */
             testfile = H5_get_srcdir_filename(filename);
             if ((fd_1 = HDopen(testfile, O_RDONLY)) < 0)
-                TEST_ERROR
+                TEST_ERROR;
             size_1 = (size_t)HDlseek(fd_1, (HDoff_t)0, SEEK_END);
             HDlseek(fd_1, (HDoff_t)0, SEEK_SET);
             buf_1 = (void *)HDmalloc(size_1);
             if (HDread(fd_1, buf_1, size_1) < 0)
-                TEST_ERROR
+                TEST_ERROR;
             HDclose(fd_1);
 
             /* Generate filename for file 2 */
             if (HDsnprintf(filename, sizeof(filename), "%s%s%s", filename_prefix,
                            config_2 & CONFIG_64 ? "64" : "32", config_2 & CONFIG_LE ? "le" : "be") < 0)
-                TEST_ERROR
+                TEST_ERROR;
 
             /* Read file 1 */
             testfile = H5_get_srcdir_filename(filename);
             if ((fd_2 = HDopen(testfile, O_RDONLY)) < 0)
-                TEST_ERROR
+                TEST_ERROR;
             size_2 = (size_t)HDlseek(fd_2, (HDoff_t)0, SEEK_END);
             HDlseek(fd_2, (HDoff_t)0, SEEK_SET);
             buf_2 = (void *)HDmalloc(size_2);
             if (HDread(fd_2, buf_2, size_2) < 0)
-                TEST_ERROR
+                TEST_ERROR;
             HDclose(fd_2);
 
             /* Decode property lists */
             if ((plist_1 = H5Pdecode(buf_1)) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if ((plist_2 = H5Pdecode(buf_2)) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
 
             /* Compare decoded property lists */
             if (!H5Pequal(plist_1, plist_2))
-                FAIL_PUTS_ERROR("PLIST encoding/decoding comparison failed\n")
+                FAIL_PUTS_ERROR("PLIST encoding/decoding comparison failed\n");
 
             /* Close */
             if ((H5Pclose(plist_1)) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
             if ((H5Pclose(plist_2)) < 0)
-                FAIL_STACK_ERROR
+                FAIL_STACK_ERROR;
 
             HDfree(buf_1);
             HDfree(buf_2);