diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2022-05-04 15:49:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-04 15:49:01 (GMT) |
| commit | 838d050a63d310a38f92a510dc94c0656a84bb51 (patch) | |
| tree | 55fe7b05c0408ebf4b28c3bfb5cd9a1d04fb2502 /test/flush2.c | |
| parent | 19a59c29b93c04ae069881da2354d3d7048619b9 (diff) | |
| download | hdf5-838d050a63d310a38f92a510dc94c0656a84bb51.zip hdf5-838d050a63d310a38f92a510dc94c0656a84bb51.tar.gz hdf5-838d050a63d310a38f92a510dc94c0656a84bb51.tar.bz2 | |
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
Diffstat (limited to 'test/flush2.c')
| -rw-r--r-- | test/flush2.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/test/flush2.c b/test/flush2.c index b6c7761..6965cef 100644 --- a/test/flush2.c +++ b/test/flush2.c @@ -248,7 +248,7 @@ main(void) h5_reset(); if ((fapl_id = h5_fileaccess()) < 0) - PUTS_ERROR("bad vfd-dependent fapl") + PUTS_ERROR("bad vfd-dependent fapl"); /* Check if the current VFD supports SWMR */ driver = HDgetenv(HDF5_DRIVER); @@ -262,7 +262,7 @@ main(void) if (file_ok(filename, fapl_id, check_second_dset)) PASSED(); else - TEST_ERROR + TEST_ERROR; /* TEST 2 */ /* Check the case where the file was flushed (w/SWMR) */ @@ -271,23 +271,23 @@ main(void) h5_fixname(FILENAME[1], fapl_id, filename, sizeof(filename)); check_second_dset = FALSE; if (clear_status_flags(filename, fapl_id) < 0) - TEST_ERROR + TEST_ERROR; if (file_ok(filename, fapl_id, check_second_dset)) PASSED(); else - TEST_ERROR + TEST_ERROR; } /* end if */ else - SKIPPED() + SKIPPED(); /* TEST 3 */ /* Check the case where the file was not flushed */ TESTING("H5Fflush (part2 without flush)"); /* Turn the error stack off (failures expected) */ if (H5Eget_auto2(H5E_DEFAULT, &func, NULL) < 0) - FAIL_STACK_ERROR + FAIL_STACK_ERROR; if (H5Eset_auto2(H5E_DEFAULT, NULL, NULL) < 0) - FAIL_STACK_ERROR + FAIL_STACK_ERROR; h5_fixname(FILENAME[2], fapl_id, filename, sizeof(filename)); check_second_dset = FALSE; if (file_ok(filename, fapl_id, check_second_dset)) { @@ -295,14 +295,14 @@ main(void) SKIPPED(); HDputs(" the DLL will flush the file even when calling _exit, skip this test temporarily"); #else - TEST_ERROR + TEST_ERROR; #endif } /* end if */ else PASSED(); /* Turn the error stack back on */ if (H5Eset_auto2(H5E_DEFAULT, func, NULL) < 0) - FAIL_STACK_ERROR + FAIL_STACK_ERROR; /* TEST 4 */ /* Check the case where the file was not flushed (w/SWMR) */ @@ -310,29 +310,29 @@ main(void) if (vfd_supports_swmr) { /* Turn the error stack off (failures expected) */ if (H5Eget_auto2(H5E_DEFAULT, &func, NULL) < 0) - FAIL_STACK_ERROR + FAIL_STACK_ERROR; if (H5Eset_auto2(H5E_DEFAULT, NULL, NULL) < 0) - FAIL_STACK_ERROR + FAIL_STACK_ERROR; h5_fixname(FILENAME[3], fapl_id, filename, sizeof(filename)); check_second_dset = FALSE; if (clear_status_flags(filename, fapl_id) < 0) - TEST_ERROR + TEST_ERROR; if (file_ok(filename, fapl_id, check_second_dset)) { #if defined H5_HAVE_WIN32_API && !defined(hdf5_EXPORTS) SKIPPED(); HDputs(" the DLL will flush the file even when calling _exit, skip this test temporarily"); #else - TEST_ERROR + TEST_ERROR; #endif } /* end if */ else PASSED(); /* Turn the error stack back on */ if (H5Eset_auto2(H5E_DEFAULT, func, NULL) < 0) - FAIL_STACK_ERROR + FAIL_STACK_ERROR; } /* end if */ else - SKIPPED() + SKIPPED(); /* TEST 5 */ /* Check the case where the file was flushed, but more data was @@ -344,7 +344,7 @@ main(void) if (file_ok(filename, fapl_id, check_second_dset)) PASSED(); else - TEST_ERROR + TEST_ERROR; /* TEST 6 */ /* Check the case where the file was flushed, but more data was @@ -355,14 +355,14 @@ main(void) check_second_dset = TRUE; h5_fixname(FILENAME[5], fapl_id, filename, sizeof(filename)); if (clear_status_flags(filename, fapl_id) < 0) - TEST_ERROR + TEST_ERROR; if (file_ok(filename, fapl_id, check_second_dset)) PASSED(); else - TEST_ERROR + TEST_ERROR; } /* end if */ else - SKIPPED() + SKIPPED(); /* TEST 7 */ /* Check the case where the file was flushed, but more data was added @@ -371,24 +371,24 @@ main(void) TESTING("H5Fflush (part2 with flush and later addition)"); /* Turn the error stack off (failures expected) */ if (H5Eget_auto2(H5E_DEFAULT, &func, NULL) < 0) - FAIL_STACK_ERROR + FAIL_STACK_ERROR; if (H5Eset_auto2(H5E_DEFAULT, NULL, NULL) < 0) - FAIL_STACK_ERROR + FAIL_STACK_ERROR; h5_fixname(FILENAME[6], fapl_id, filename, sizeof(filename)); check_second_dset = TRUE; if (file_ok(filename, fapl_id, check_second_dset)) { #if defined H5_HAVE_WIN32_API && !defined(hdf5_EXPORTS) - SKIPPED() + SKIPPED(); HDputs(" the DLL will flush the file even when calling _exit, skip this test temporarily"); #else - TEST_ERROR + TEST_ERROR; #endif } /* end if */ else PASSED(); /* Turn the error stack back on */ if (H5Eset_auto2(H5E_DEFAULT, func, NULL) < 0) - FAIL_STACK_ERROR + FAIL_STACK_ERROR; /* TEST 8 */ /* Check the case where the file was flushed, but more data was added @@ -398,29 +398,29 @@ main(void) if (vfd_supports_swmr) { /* Turn the error stack off (failures expected) */ if (H5Eget_auto2(H5E_DEFAULT, &func, NULL) < 0) - FAIL_STACK_ERROR + FAIL_STACK_ERROR; if (H5Eset_auto2(H5E_DEFAULT, NULL, NULL) < 0) - FAIL_STACK_ERROR + FAIL_STACK_ERROR; h5_fixname(FILENAME[7], fapl_id, filename, sizeof(filename)); check_second_dset = TRUE; if (clear_status_flags(filename, fapl_id) < 0) - TEST_ERROR + TEST_ERROR; if (file_ok(filename, fapl_id, check_second_dset)) { #if defined H5_HAVE_WIN32_API && !defined(hdf5_EXPORTS) SKIPPED(); HDputs(" the DLL will flush the file even when calling _exit, skip this test temporarily"); #else - TEST_ERROR + TEST_ERROR; #endif } /* end if */ else PASSED(); /* Turn the error stack back on */ if (H5Eset_auto2(H5E_DEFAULT, func, NULL) < 0) - FAIL_STACK_ERROR + FAIL_STACK_ERROR; } /* end if */ else - SKIPPED() + SKIPPED(); if (!vfd_supports_swmr) HDprintf("NOTE: Some tests were skipped since the current VFD lacks SWMR support\n"); |