diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2019-06-17 15:28:58 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2019-06-17 15:28:58 (GMT) |
| commit | f7c2a75404c84bebc96d4c5515eb4395f8c9bdf7 (patch) | |
| tree | 4088ff1236723f0fcb60d547848f6d7cb76661b2 /test/objcopy.c | |
| parent | cbc95dee3c794fb7099e8a4c5f25ca56e981c31a (diff) | |
| parent | dfdc27b04b2e8bcd1985ba90ce6553d8b3805fda (diff) | |
| download | hdf5-f7c2a75404c84bebc96d4c5515eb4395f8c9bdf7.zip hdf5-f7c2a75404c84bebc96d4c5515eb4395f8c9bdf7.tar.gz hdf5-f7c2a75404c84bebc96d4c5515eb4395f8c9bdf7.tar.bz2 | |
Merge pull request #1729 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/HDFFV-10800-h5ocopy-failure to develop
* commit 'dfdc27b04b2e8bcd1985ba90ce6553d8b3805fda':
Fix release notes based on feedback from pull request.
Fix for HDFFV-10800 H5Ocopy failure: The value for the H5F_LIBVER_V18 index in H5O_fill_ver_bounds[], the format version bounds array for fill value message, should be version 3 not 2.
Diffstat (limited to 'test/objcopy.c')
| -rw-r--r-- | test/objcopy.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/objcopy.c b/test/objcopy.c index df1c0e4..e35eea3 100644 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -2136,7 +2136,7 @@ test_copy_dataset_versionbounds(hid_t fcpl_src, hid_t fapl_src) char src_fname[NAME_BUF_SIZE]; /* Name of source file */ char dst_fname[NAME_BUF_SIZE]; /* Name of destination file */ H5F_libver_t low, high; /* File format bounds */ - unsigned srcdset_fillversion; /* Fill version of source dataset */ + unsigned srcdset_layoutversion; /* Layout version of source dataset */ int i, j; /* Local index variables */ H5D_t *dsetp = NULL; /* Pointer to internal dset structure */ herr_t ret; /* Generic return value */ @@ -2179,7 +2179,8 @@ test_copy_dataset_versionbounds(hid_t fcpl_src, hid_t fapl_src) /* Get the internal dset ptr to get the fill version for verifying later */ if ((dsetp = (H5D_t *)H5VL_object(did_src)) == NULL) TEST_ERROR - srcdset_fillversion = dsetp->shared->dcpl_cache.fill.version; + + srcdset_layoutversion = dsetp->shared->layout.version; /* Close dataspace */ if(H5Sclose(sid) < 0) TEST_ERROR @@ -2224,9 +2225,9 @@ test_copy_dataset_versionbounds(hid_t fcpl_src, hid_t fapl_src) /* If copy failed, check if the failure is expected */ if (ret < 0) { - /* Failure is valid if fill version of source dataset is + /* Failure is valid if layout version of source dataset is greater than destination */ - if (srcdset_fillversion <= H5O_fill_ver_bounds[high]) + if (srcdset_layoutversion <= H5O_layout_ver_bounds[high]) TEST_ERROR /* Close the DST file before continue */ |