diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-02-15 15:57:54 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-02-15 15:57:54 (GMT) |
| commit | 84fdfb68636d3d52cb2187d0b095bebfb7330663 (patch) | |
| tree | 6de6aacf894533940c8f128d6917b5e15dc22813 | |
| parent | a77a08b02fb31e87f451a39640e4376e49878097 (diff) | |
| parent | db60f70286910498ca40291841a55114cf0ea3f7 (diff) | |
| download | hdf5-84fdfb68636d3d52cb2187d0b095bebfb7330663.zip hdf5-84fdfb68636d3d52cb2187d0b095bebfb7330663.tar.gz hdf5-84fdfb68636d3d52cb2187d0b095bebfb7330663.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'db60f70286910498ca40291841a55114cf0ea3f7':
Fix for daily test failure Fix for test/testhdf5.sh for configuration with --enable-using-memchecker.
| -rw-r--r-- | test/tfile.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/tfile.c b/test/tfile.c index 1678fb6..de1f362 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -5518,7 +5518,12 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr) H5E_BEGIN_TRY { fid = H5Fopen(FILE8, H5F_ACC_RDWR | (is_swmr ? H5F_ACC_SWMR_WRITE : 0), new_fapl); } H5E_END_TRY; - ok = fid >= 0; + + /* Get the internal file pointer if the open succeeds */ + if((ok = fid >= 0)) { + f = (H5F_t *)H5I_object(fid); + CHECK(f, NULL, "H5I_object"); + } /* Verify the file open succeeds or fails */ switch(super_vers) { |