Skip to content

Commit

Permalink
Merge commit 'c8a192445a' into fix_GH-4941
Browse files Browse the repository at this point in the history
  • Loading branch information
bmribler committed Nov 4, 2024
2 parents 65b3b37 + c8a1924 commit 079ee59
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions test/th5o.c
Original file line number Diff line number Diff line change
Expand Up @@ -1921,7 +1921,7 @@ visit2_obj_cb(hid_t obj_id, const char *name, const H5O_info1_t H5_ATTR_UNUSED *
if (op_data->fields == H5O_INFO_NUM_ATTRS)
if (oinfo.num_attrs != NUM_ATTRS)
return H5_ITER_ERROR;

/* Advance to next location in expected output */
op_data->idx++;

Expand Down Expand Up @@ -1999,32 +1999,32 @@ test_h5o_visit2(void)

/* Visit root with H5O_INFO_META_SIZE */
udata.idx = 0; /* first object, i.e., root group */
fields = udata.fields = H5O_INFO_META_SIZE;
ret = H5Ovisit2(obj_id, idx_type, order, visit2_obj_cb, &udata, fields);
fields = udata.fields = H5O_INFO_META_SIZE;
ret = H5Ovisit2(obj_id, idx_type, order, visit2_obj_cb, &udata, fields);
CHECK(ret, FAIL, "H5Ovisit2");

/* Verify that all objects were visitted */
VERIFY(udata.idx, NUM_OBJS, "idx should be the same as NUM_OBJS");

/* Visit root with H5O_INFO_BASIC */
udata.idx = 0; /* first object, i.e., root group */
fields = udata.fields = H5O_INFO_BASIC;
ret = H5Ovisit2(obj_id, idx_type, order, visit2_obj_cb, &udata, fields);
fields = udata.fields = H5O_INFO_BASIC;
ret = H5Ovisit2(obj_id, idx_type, order, visit2_obj_cb, &udata, fields);
CHECK(ret, FAIL, "H5Ovisit2");

/* Verify that all objects were visitted */
VERIFY(udata.idx, NUM_OBJS, "idx should be the same as NUM_OBJS");

/* Visit root with H5O_INFO_ALL */
udata.idx = 0; /* first object, i.e., root group */
fields = udata.fields = H5O_INFO_ALL;
ret = H5Ovisit2(obj_id, idx_type, order, visit2_obj_cb, &udata, fields);
fields = udata.fields = H5O_INFO_ALL;
ret = H5Ovisit2(obj_id, idx_type, order, visit2_obj_cb, &udata, fields);
CHECK(ret, FAIL, "H5Ovisit2");

/* Visit root with H5O_INFO_NUM_ATTRS */
udata.idx = 0; /* first object, i.e., root group */
fields = udata.fields = H5O_INFO_NUM_ATTRS;
ret = H5Ovisit2(obj_id, idx_type, order, visit2_obj_cb, &udata, fields);
fields = udata.fields = H5O_INFO_NUM_ATTRS;
ret = H5Ovisit2(obj_id, idx_type, order, visit2_obj_cb, &udata, fields);
CHECK(ret, FAIL, "H5Ovisit2");

/* Verify that all objects were visitted */
Expand Down

0 comments on commit 079ee59

Please sign in to comment.