diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2021-03-25 18:28:38 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 18:28:38 (GMT) |
| commit | c81afbff45edb56b16d17d37c444485b587d51fd (patch) | |
| tree | cb4e526186d350a177723963837983ec8dc047c3 | |
| parent | 3176c92453204c7720050d60873e4d988f68247a (diff) | |
| parent | 0011a5e758c2efa386fbeaa81553852c90c48e86 (diff) | |
| download | hdf5-c81afbff45edb56b16d17d37c444485b587d51fd.zip hdf5-c81afbff45edb56b16d17d37c444485b587d51fd.tar.gz hdf5-c81afbff45edb56b16d17d37c444485b587d51fd.tar.bz2 | |
Merge pull request #518 from derobins/vfd_swmr/thg_standards
Vfd swmr/thg standards
| -rw-r--r-- | src/H5Fvfd_swmr.c | 4 | ||||
| -rw-r--r-- | test/tfile.c | 5 | ||||
| -rw-r--r-- | test/vfd_swmr.c | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/H5Fvfd_swmr.c b/src/H5Fvfd_swmr.c index f97439a..8d1888b 100644 --- a/src/H5Fvfd_swmr.c +++ b/src/H5Fvfd_swmr.c @@ -293,12 +293,12 @@ H5F_vfd_swmr_close_or_flush(H5F_t *f, hbool_t closing) /* Close the md file */ if (HDclose(shared->vfd_swmr_md_fd) < 0) - HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "unable to close the metadata file"); + HSYS_GOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "unable to close the metadata file"); shared->vfd_swmr_md_fd = -1; /* Unlink the md file */ if (HDunlink(shared->vfd_swmr_config.md_file_path) < 0) - HGOTO_ERROR(H5E_FILE, H5E_CANTREMOVE, FAIL, "unable to unlink the metadata file"); + HSYS_GOTO_ERROR(H5E_FILE, H5E_CANTREMOVE, FAIL, "unable to unlink the metadata file"); /* Close the free-space manager for the metadata file */ if (H5MV_close(f) < 0) diff --git a/test/tfile.c b/test/tfile.c index 34f3389..a56498b 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -1677,6 +1677,10 @@ test_file_is_accessible(const char *env_h5_drvr) * are enforced by the OS. */ +/* XXX: VFD SWMR: Currently fails on VFD SWMR due to differences in the + * open file scheme. + */ +#ifndef H5_HAVE_WIN32_API /* Create a file and hold it open */ fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id); CHECK(fid, H5I_INVALID_HID, "H5Fcreate"); @@ -1688,6 +1692,7 @@ test_file_is_accessible(const char *env_h5_drvr) /* Close file */ ret = H5Fclose(fid); CHECK(ret, FAIL, "H5Fclose"); +#endif /*******************************/ /* Non-default user block size */ diff --git a/test/vfd_swmr.c b/test/vfd_swmr.c index 04a2eaf..0910409 100644 --- a/test/vfd_swmr.c +++ b/test/vfd_swmr.c @@ -3494,6 +3494,9 @@ main(void) nerrors += test_file_fapl(); #ifndef H5_HAVE_WIN32_API +/* XXX: VFD SWMR: Fails on Win32 due to problems unlinking the metadata file. + * The OS claims another process is using the file. + */ nerrors += test_writer_create_open_flush(); nerrors += test_writer_md(); #endif @@ -3501,9 +3504,7 @@ main(void) nerrors += test_multiple_file_opens(); nerrors += test_multiple_file_opens_concur(); -#ifndef H5_HAVE_WIN32_API nerrors += test_same_file_opens(); -#endif nerrors += test_enable_disable_eot(); nerrors += test_disable_enable_eot_concur(); |