summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2003-04-29 19:49:48 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2003-04-29 19:49:48 (GMT)
commitb58192dfe739118385748c776e8a99c16b82bb03 (patch)
treed2b3181ef6e49db6359eb715b08a1b7b4a81eb8a /test
parent67985f540fe44d0ea57415dd10a592259a25d154 (diff)
downloadhdf5-b58192dfe739118385748c776e8a99c16b82bb03.zip
hdf5-b58192dfe739118385748c776e8a99c16b82bb03.tar.gz
hdf5-b58192dfe739118385748c776e8a99c16b82bb03.tar.bz2
[svn-r6779] Purpose: Backward compatibility change
Description: 1.4 compatibility for H5G_obj_t type and H5Zregister test. Solution: use macro H5_WANT_H5_V1_4_COMPAT Platforms tested: h5committest
Diffstat (limited to 'test')
-rw-r--r--test/dsets.c8
-rw-r--r--test/titerate.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/test/dsets.c b/test/dsets.c
index ee54058..c229e13 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -2253,7 +2253,11 @@ test_can_apply(hid_t file)
printf(" Line %d: Can't set chunk sizes\n",__LINE__);
goto error;
} /* end if */
+#ifdef H5_WANT_H5_V1_4_COMPAT
+ if(H5Zregister (H5Z_FILTER_BOGUS, "bogus", filter_bogus)<0) {
+#else /* H5_WANT_H5_V1_4_COMPAT */
if(H5Zregister (H5Z_CAN_APPLY)<0) {
+#endif /* H5_WANT_H5_V1_4_COMPAT */
H5_FAILED();
printf(" Line %d: Can't register 'can apply' filter\n",__LINE__);
goto error;
@@ -2555,7 +2559,11 @@ test_set_local(const char *filename, hid_t fapl)
printf(" Line %d: Can't set chunk sizes\n",__LINE__);
goto error;
} /* end if */
+#ifdef H5_WANT_H5_V1_4_COMPAT
+ if(H5Zregister (H5Z_FILTER_BOGUS2, "bogus2", filter_bogus2)<0) {
+#else /* H5_WANT_H5_V1_4_COMPAT */
if(H5Zregister (H5Z_SET_LOCAL)<0) {
+#endif /* H5_WANT_H5_V1_4_COMPAT */
H5_FAILED();
printf(" Line %d: Can't register 'set local' filter\n",__LINE__);
goto error;
diff --git a/test/titerate.c b/test/titerate.c
index ebe12ec..63c6281 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -671,8 +671,8 @@ static void test_grp_memb_funcs(void)
obj_names[i]=HDstrdup(dataset_name);
CHECK(dnames[i], NULL, "strdup");
- ret = H5Gget_objtype_by_idx(root_group, (hsize_t)i);
- CHECK(ret, H5G_UNKNOWN, "H5Gget_objsname_by_idx");
+ ret = (herr_t)H5Gget_objtype_by_idx(root_group, (hsize_t)i);
+ CHECK(ret, FAIL, "H5Gget_objsname_by_idx");
if(!HDstrcmp(dataset_name, "grp"))
VERIFY(ret, H5G_GROUP, "H5Gget_objsname_by_idx");