diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/links.c | 1 | ||||
| -rw-r--r-- | test/tfile.c | 16 | ||||
| -rw-r--r-- | test/th5o.c | 14 |
3 files changed, 14 insertions, 17 deletions
diff --git a/test/links.c b/test/links.c index 966802a..329b9a2 100644 --- a/test/links.c +++ b/test/links.c @@ -6306,7 +6306,6 @@ external_link_strong(hid_t fapl, hbool_t new_format) if(H5Gclose(gid2) < 0) TEST_ERROR if(H5Fclose(fid2) < 0) TEST_ERROR - PASSED(); return 0; diff --git a/test/tfile.c b/test/tfile.c index ed33c91..773ff1d 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -701,7 +701,6 @@ test_file_close(void) ret = H5Fclose(fid2); CHECK(ret, FAIL, "H5Fclose"); - /* Test behavior while opening file multiple times with file close * degree WEAK */ ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_WEAK); @@ -752,7 +751,6 @@ test_file_close(void) ret = H5Gclose(group_id3); CHECK(ret, FAIL, "H5Gclose"); - /* Test behavior while opening file multiple times with file close * degree DEFAULT */ ret = H5Pset_fclose_degree(fapl_id, H5F_CLOSE_DEFAULT); @@ -1123,7 +1121,7 @@ test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1, fid4 = H5Fcreate(FILE3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); CHECK(fid4, FAIL, "H5Fcreate"); - /* test object count of all files IDs open */ + /* test object count of all files open */ oid_count = H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_FILE); CHECK(oid_count, FAIL, "H5Fget_obj_count"); VERIFY(oid_count, OBJ_ID_COUNT_4, "H5Fget_obj_count"); @@ -1152,7 +1150,7 @@ test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1, oid_count = H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_ALL); CHECK(oid_count, FAIL, "H5Fget_obj_count"); VERIFY(oid_count, OBJ_ID_COUNT_8, "H5Fget_obj_count"); - + if(oid_count > 0) { hid_t *oid_list; @@ -1168,19 +1166,19 @@ test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1, id_type = H5Iget_type(oid_list[i]); switch(id_type) { - case H5I_FILE: + case H5I_FILE_PUBLIC: if(oid_list[i] != fid1 && oid_list[i] != fid2 - && oid_list[i] != fid3 && oid_list[i] != fid4) + && oid_list[i] != fid3 && oid_list[i] != fid4) ERROR("H5Fget_obj_ids"); break; - case H5I_GROUP: + case H5I_GROUP_PUBLIC: if(oid_list[i] != gid1 && oid_list[i] != gid2 - && oid_list[i] != gid3) + && oid_list[i] != gid3) ERROR("H5Fget_obj_ids"); break; - case H5I_DATASET: + case H5I_DATASET_PUBLIC: VERIFY(oid_list[i], did, "H5Fget_obj_ids"); break; diff --git a/test/th5o.c b/test/th5o.c index c46751e..c878b34 100644 --- a/test/th5o.c +++ b/test/th5o.c @@ -93,11 +93,11 @@ test_h5o_open(void) /* Make sure that each is the right kind of ID */ id_type = H5Iget_type(grp); - VERIFY(id_type, H5I_GROUP, "H5Iget_type for group ID"); + VERIFY(id_type, H5I_GROUP_PUBLIC, "H5Iget_type for group ID"); id_type = H5Iget_type(dtype); - VERIFY(id_type, H5I_DATATYPE, "H5Iget_type for datatype ID"); + VERIFY(id_type, H5I_DATATYPE_PUBLIC, "H5Iget_type for datatype ID"); id_type = H5Iget_type(dset); - VERIFY(id_type, H5I_DATASET, "H5Iget_type for dataset ID"); + VERIFY(id_type, H5I_DATASET_PUBLIC, "H5Iget_type for dataset ID"); /* Do something more complex with each of the IDs to make sure they "work" */ ret = H5Gget_info(grp, &ginfo); @@ -162,7 +162,7 @@ test_h5o_close(void) /* Create the group and close it with H5Oclose */ grp = H5Gcreate2(fid, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); CHECK(grp, FAIL, "H5Gcreate2"); - VERIFY(H5Iget_type(grp), H5I_GROUP, "H5Iget_type"); + VERIFY(H5Iget_type(grp), H5I_GROUP_PUBLIC, "H5Iget_type"); ret = H5Oclose(grp); CHECK(ret, FAIL, "H5Oclose"); @@ -306,11 +306,11 @@ test_h5o_open_by_addr(void) /* Make sure that each is the right kind of ID */ id_type = H5Iget_type(grp); - VERIFY(id_type, H5I_GROUP, "H5Iget_type for group ID"); + VERIFY(id_type, H5I_GROUP_PUBLIC, "H5Iget_type for group ID"); id_type = H5Iget_type(dtype); - VERIFY(id_type, H5I_DATATYPE, "H5Iget_type for datatype ID"); + VERIFY(id_type, H5I_DATATYPE_PUBLIC, "H5Iget_type for datatype ID"); id_type = H5Iget_type(dset); - VERIFY(id_type, H5I_DATASET, "H5Iget_type for dataset ID"); + VERIFY(id_type, H5I_DATASET_PUBLIC, "H5Iget_type for dataset ID"); /* Do something more complex with each of the IDs to make sure they "work" */ ret = H5Gget_info(grp, &ginfo); |