summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2019-10-11 20:02:54 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2019-10-11 20:02:54 (GMT)
commit1fa1ec619011a1ba13935a5c68f217e60f20c0a7 (patch)
tree0cf682df6376db930f2fb86e99bf6eb39ccee868 /test
parentaf2e625041ee761f5e88d0ea221a356c28302841 (diff)
parent75f2ed6167b094431fce2b4b700b3cf9da564c51 (diff)
downloadhdf5-1fa1ec619011a1ba13935a5c68f217e60f20c0a7.zip
hdf5-1fa1ec619011a1ba13935a5c68f217e60f20c0a7.tar.gz
hdf5-1fa1ec619011a1ba13935a5c68f217e60f20c0a7.tar.bz2
Merge pull request #2001 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:1_12_alpha_merges to hdf5_1_12
* commit '75f2ed6167b094431fce2b4b700b3cf9da564c51': Fixed a bug (HDFFV-10899) where the behavior of the deprecated H5Gget_objinfo() call had changed and passing in a non-existing soft link with a statbuf of NULL passed instead of failed (as it should as per the RM). The HDF5 1.8 and 1.10 behavior was restored and H5Gget_objinfo() will now fail and return -1 as before. Fixed the java assert issue with H5O cache corking calls. Corrected missing parallel #ifdefs. Converted H5O MD cache cork calls to use the VOL. Marked up H5Fget/set_mpi_atomicity() to use the VOL.
Diffstat (limited to 'test')
-rw-r--r--test/links.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/test/links.c b/test/links.c
index 4eb4126..916ad88 100644
--- a/test/links.c
+++ b/test/links.c
@@ -1576,6 +1576,10 @@ test_deprec(hid_t fapl, hbool_t new_format)
if(H5Gget_linkval(group2_id, "soft_link_to_group1", sb_soft1.linklen, tmpstr) < 0) FAIL_STACK_ERROR
if(HDstrcmp("link_to_group1", tmpstr)) TEST_ERROR
+ /* Test non-existing links with H5Gget_objinfo */
+ H5E_BEGIN_TRY {
+ if(H5Gget_objinfo(file_id, "/group2/soft_link_no_exist", TRUE, NULL) >= 0) FAIL_STACK_ERROR
+ } H5E_END_TRY;
/* Test the dangling soft link */
if(H5Gget_objinfo(file_id, "/group2/dangle_soft_link", FALSE, &sb_soft2) < 0) FAIL_STACK_ERROR
@@ -14103,7 +14107,8 @@ main(void)
nerrors += group_info_old(fapl) < 0 ? 1 : 0;
if (minimize_dset_oh) {
- if (H5Pclose(dcpl_g) < 0) TEST_ERROR;
+ if (H5Pclose(dcpl_g) < 0)
+ TEST_ERROR;
dcpl_g = -1;
}
} /* [un]minimized dataset object headers */
@@ -14141,5 +14146,5 @@ main(void)
error:
HDputs("*** TESTS FAILED ***");
HDexit(EXIT_FAILURE);
-}
+} /* end main() */