diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-11-29 17:52:46 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-11-29 17:52:46 (GMT) |
| commit | 30bd7247d80f08aee4fc7038df86c43258344de8 (patch) | |
| tree | af53166b8b03dd7dfa77020250a61cbe6fc56037 /test | |
| parent | d79c73320eae00152cb3380b107af36aa2b29b19 (diff) | |
| parent | 3d2beeec1fb63c8c2bac4658df382ea7a9d61e05 (diff) | |
| download | hdf5-30bd7247d80f08aee4fc7038df86c43258344de8.zip hdf5-30bd7247d80f08aee4fc7038df86c43258344de8.tar.gz hdf5-30bd7247d80f08aee4fc7038df86c43258344de8.tar.bz2 | |
Merge branch 'develop' into expanded_eoc_test
Diffstat (limited to 'test')
| -rw-r--r-- | test/ohdr.c | 3 | ||||
| -rw-r--r-- | test/tfile.c | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/test/ohdr.c b/test/ohdr.c index e613a98..1478c5c 100644 --- a/test/ohdr.c +++ b/test/ohdr.c @@ -609,9 +609,8 @@ main(void) H5F_t *f = NULL; char filename[1024]; H5O_hdr_info_t hdr_info; /* Object info */ - H5O_loc_t oh_loc, oh_loc2; /* Object header locations */ + H5O_loc_t oh_loc; /* Object header locations */ time_t time_new, ro; - int chunkno; /* Chunk index for message */ int i; /* Local index variable */ unsigned b; /* Index for "new format" loop */ herr_t ret; /* Generic return value */ diff --git a/test/tfile.c b/test/tfile.c index 833d2d9..d6cb427 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -2268,12 +2268,11 @@ test_file_double_file_dataset_open(hbool_t new_format) CHECK(ret, FAIL, "H5Dwrite"); /* Closing */ + /* (Leave sid1 open for later use) */ ret = H5Dclose(did1); CHECK(ret, FAIL, "H5Dclose"); ret = H5Tclose(tid1); CHECK(ret, FAIL, "H5Tclose"); - ret = H5Sclose(sid1); - CHECK(ret, FAIL, "H5Sclose"); ret = H5Pclose(dcpl); CHECK(ret, FAIL, "H5Dclose"); @@ -2392,6 +2391,8 @@ test_file_double_file_dataset_open(hbool_t new_format) HDmemset(buffer, 0, sizeof(char*) * 5); ret = H5Dread(did2, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer); CHECK(ret, FAIL, "H5Dread"); + ret = H5Dvlen_reclaim(tid2, sid1, H5P_DEFAULT, buffer); + CHECK(ret, FAIL, "H5Dvlen_reclaim"); /* Second file's dataset close */ ret = H5Dclose(did2); @@ -2404,6 +2405,9 @@ test_file_double_file_dataset_open(hbool_t new_format) /* First file's dataset read */ HDmemset(buffer, 0, sizeof(char*) * 5); ret = H5Dread(did1, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer); + CHECK(ret, FAIL, "H5Dread"); + ret = H5Dvlen_reclaim(tid2, sid1, H5P_DEFAULT, buffer); + CHECK(ret, FAIL, "H5Dvlen_reclaim"); /* First file's dataset close */ ret = H5Dclose(did1); @@ -2416,6 +2420,8 @@ test_file_double_file_dataset_open(hbool_t new_format) /* Closing */ ret = H5Tclose(tid1); CHECK(ret, FAIL, "H5Tclose"); + ret = H5Sclose(sid1); + CHECK(ret, FAIL, "H5Sclose"); ret = H5Tclose(tid2); CHECK(ret, FAIL, "H5Tclose"); |