diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-10-12 18:48:27 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-10-12 18:48:27 (GMT) |
| commit | c5a9bb780f5ce444f888b3cfe775bbe07b5d7b95 (patch) | |
| tree | c88344eb76013532fa989256a43278170d0c5c8c /test/links.c | |
| parent | 9863f8481f5f1837270fa0c08a3bc28dd3e34b61 (diff) | |
| download | hdf5-c5a9bb780f5ce444f888b3cfe775bbe07b5d7b95.zip hdf5-c5a9bb780f5ce444f888b3cfe775bbe07b5d7b95.tar.gz hdf5-c5a9bb780f5ce444f888b3cfe775bbe07b5d7b95.tar.bz2 | |
[svn-r28041] Description:
Merge r27811 from trunk to branch.
Tested on:
MacOSX/64 10.10.5 (amazon) w/serial & parallel
(h5committest not required on this branch)
Diffstat (limited to 'test/links.c')
| -rw-r--r-- | test/links.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/test/links.c b/test/links.c index 5242b7b..43088f1 100644 --- a/test/links.c +++ b/test/links.c @@ -3887,11 +3887,8 @@ external_set_elink_fapl3(hbool_t new_format) if(H5Pget(lapl_id, "external link fapl", &out_fapl) < 0) TEST_ERROR if(H5Pclose(lapl_id) < 0) TEST_ERROR - /* Try closing out_fapl should fail since H5Pclose(lapl_id) should also close its fapl */ - H5E_BEGIN_TRY { - ret = H5Pclose(out_fapl); - } H5E_END_TRY; - if(ret != FAIL) TEST_ERROR + /* Try closing out_fapl, should succeed since H5Pget() should clone its fapl */ + if(H5Pclose(out_fapl) < 0) TEST_ERROR /* Verify that the driver for the copied link's fapl is the "core" driver */ if((l_fapl = H5Pget_elink_fapl(new_lapl_id)) < 0) TEST_ERROR @@ -3901,11 +3898,8 @@ external_set_elink_fapl3(hbool_t new_format) if(H5Pget(new_lapl_id, "external link fapl", &out_fapl) < 0) TEST_ERROR if(H5Premove(new_lapl_id, "external link fapl") < 0) TEST_ERROR - /* Try closing out_fapl should fail since the property is removed from new_lapl_id */ - H5E_BEGIN_TRY { - ret = H5Pclose(out_fapl); - } H5E_END_TRY; - if(ret != FAIL) TEST_ERROR + /* Try closing out_fapl, should succeed since H5Pget() should clone its fapl */ + if(H5Pclose(out_fapl) < 0) TEST_ERROR if(H5Pclose(l_fapl) < 0) TEST_ERROR if(H5Pclose(new_lapl_id) < 0) TEST_ERROR |