diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/.distdep | 341 | ||||
-rw-r--r-- | test/links.c | 18 | ||||
-rw-r--r-- | test/mtime.c | 10 | ||||
-rw-r--r-- | test/tselect.c | 17 |
4 files changed, 195 insertions, 191 deletions
diff --git a/test/.distdep b/test/.distdep index 87bac02..c2dccae 100644 --- a/test/.distdep +++ b/test/.distdep @@ -1,3 +1,34 @@ +testhdf5.o: \ + testhdf5.c \ + testhdf5.h \ + ../src/H5private.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5Eprivate.h \ + ../src/H5Epublic.h +tattr.o: \ + tattr.c \ + testhdf5.h \ + ../src/H5private.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5Eprivate.h \ + ../src/H5Epublic.h \ + ../src/H5Ipublic.h \ + ../src/hdf5.h \ + ../src/H5Apublic.h \ + ../src/H5ACpublic.h \ + ../src/H5Bpublic.h \ + ../src/H5Dpublic.h \ + ../src/H5Fpublic.h \ + ../src/H5Gpublic.h \ + ../src/H5HGpublic.h \ + ../src/H5HLpublic.h \ + ../src/H5MFpublic.h \ + ../src/H5MMpublic.h \ + ../src/H5Opublic.h \ + ../src/H5Ppublic.h \ + ../src/H5Zpublic.h tfile.o: \ tfile.c \ testhdf5.h \ @@ -69,6 +100,29 @@ tohdr.o: \ ../src/H5Tprivate.h \ ../src/H5Tpublic.h \ ../src/H5Sprivate.h +tselect.o: \ + tselect.c \ + testhdf5.h \ + ../src/H5private.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5Eprivate.h \ + ../src/H5Epublic.h \ + ../src/H5Ipublic.h \ + ../src/hdf5.h \ + ../src/H5Apublic.h \ + ../src/H5ACpublic.h \ + ../src/H5Bpublic.h \ + ../src/H5Dpublic.h \ + ../src/H5Fpublic.h \ + ../src/H5Gpublic.h \ + ../src/H5HGpublic.h \ + ../src/H5HLpublic.h \ + ../src/H5MFpublic.h \ + ../src/H5MMpublic.h \ + ../src/H5Opublic.h \ + ../src/H5Ppublic.h \ + ../src/H5Zpublic.h tstab.o: \ tstab.c \ testhdf5.h \ @@ -98,99 +152,32 @@ tstab.o: \ ../src/H5Tprivate.h \ ../src/H5Tpublic.h \ ../src/H5Sprivate.h -external.o: \ - external.c \ - ../src/hdf5.h \ +th5s.o: \ + th5s.c \ + testhdf5.h \ + ../src/H5private.h \ ../src/H5public.h \ ../src/H5config.h \ - ../src/H5Ipublic.h \ - ../src/H5Apublic.h \ - ../src/H5ACpublic.h \ - ../src/H5Bpublic.h \ - ../src/H5Dpublic.h \ + ../src/H5Eprivate.h \ ../src/H5Epublic.h \ - ../src/H5Fpublic.h \ - ../src/H5Gpublic.h \ - ../src/H5HGpublic.h \ - ../src/H5HLpublic.h \ - ../src/H5MFpublic.h \ - ../src/H5MMpublic.h \ - ../src/H5Opublic.h \ - ../src/H5Ppublic.h \ - ../src/H5Zpublic.h \ - ../src/H5Spublic.h \ - ../src/H5Tpublic.h -shtype.o: \ - shtype.c \ - ../src/hdf5.h \ - ../src/H5public.h \ - ../src/H5config.h \ ../src/H5Ipublic.h \ - ../src/H5Apublic.h \ - ../src/H5ACpublic.h \ + ../src/H5Bprivate.h \ ../src/H5Bpublic.h \ - ../src/H5Dpublic.h \ - ../src/H5Epublic.h \ + ../src/H5Fprivate.h \ ../src/H5Fpublic.h \ - ../src/H5Gpublic.h \ - ../src/H5HGpublic.h \ - ../src/H5HLpublic.h \ - ../src/H5MFpublic.h \ - ../src/H5MMpublic.h \ - ../src/H5Opublic.h \ - ../src/H5Ppublic.h \ - ../src/H5Zpublic.h \ - ../src/H5Spublic.h -iopipe.o: \ - iopipe.c \ - ../src/hdf5.h \ - ../src/H5public.h \ - ../src/H5config.h \ - ../src/H5Ipublic.h \ - ../src/H5Apublic.h \ - ../src/H5ACpublic.h \ - ../src/H5Bpublic.h \ ../src/H5Dpublic.h \ - ../src/H5Epublic.h \ - ../src/H5Fpublic.h \ - ../src/H5Gpublic.h \ - ../src/H5HGpublic.h \ - ../src/H5HLpublic.h \ - ../src/H5MFpublic.h \ - ../src/H5MMpublic.h \ - ../src/H5Opublic.h \ - ../src/H5Ppublic.h \ - ../src/H5Zpublic.h \ + ../src/H5Sprivate.h \ ../src/H5Spublic.h \ - ../src/H5Tpublic.h -hyperslab.o: \ - hyperslab.c \ - ../src/H5private.h \ - ../src/H5public.h \ - ../src/H5config.h \ - ../src/H5MMprivate.h \ - ../src/H5MMpublic.h -extend.o: \ - extend.c \ - ../src/hdf5.h \ - ../src/H5public.h \ - ../src/H5config.h \ - ../src/H5Ipublic.h \ - ../src/H5Apublic.h \ - ../src/H5ACpublic.h \ - ../src/H5Bpublic.h \ - ../src/H5Dpublic.h \ - ../src/H5Epublic.h \ - ../src/H5Fpublic.h \ + ../src/H5Gprivate.h \ ../src/H5Gpublic.h \ - ../src/H5HGpublic.h \ - ../src/H5HLpublic.h \ - ../src/H5MFpublic.h \ - ../src/H5MMpublic.h \ + ../src/H5Oprivate.h \ ../src/H5Opublic.h \ - ../src/H5Ppublic.h \ - ../src/H5Zpublic.h \ - ../src/H5Spublic.h + ../src/H5HGprivate.h \ + ../src/H5HGpublic.h \ + ../src/H5Tprivate.h \ + ../src/H5Tpublic.h \ + ../src/H5Zprivate.h \ + ../src/H5Zpublic.h dtypes.o: \ dtypes.c \ ../src/hdf5.h \ @@ -211,6 +198,7 @@ dtypes.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ + ../src/H5Rpublic.h \ ../src/H5Spublic.h \ ../src/H5Tpublic.h \ ../src/H5Tpkg.h \ @@ -218,22 +206,13 @@ dtypes.o: \ ../src/H5Fprivate.h \ ../src/H5private.h \ ../src/H5Tprivate.h -bittests.o: \ - bittests.c \ - ../src/H5Tpkg.h \ - ../src/H5HGprivate.h \ - ../src/H5HGpublic.h \ +hyperslab.o: \ + hyperslab.c \ + ../src/H5private.h \ ../src/H5public.h \ ../src/H5config.h \ - ../src/H5Fprivate.h \ - ../src/H5Fpublic.h \ - ../src/H5Ipublic.h \ - ../src/H5private.h \ - ../src/H5Dpublic.h \ - ../src/H5Tprivate.h \ - ../src/H5Tpublic.h \ - ../src/H5Gprivate.h \ - ../src/H5Gpublic.h + ../src/H5MMprivate.h \ + ../src/H5MMpublic.h istore.o: \ istore.c \ ../src/H5private.h \ @@ -262,27 +241,31 @@ istore.o: \ ../src/H5Sprivate.h \ ../src/H5Spublic.h \ ../src/H5Zprivate.h -gheap.o: \ - gheap.c \ - ../src/H5private.h \ +dsets.o: \ + dsets.c \ + ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ - ../src/H5Eprivate.h \ - ../src/H5Epublic.h \ ../src/H5Ipublic.h \ - ../src/H5Fprivate.h \ - ../src/H5Fpublic.h \ + ../src/H5Apublic.h \ + ../src/H5ACpublic.h \ + ../src/H5Bpublic.h \ ../src/H5Dpublic.h \ - ../src/H5Gprivate.h \ + ../src/H5Epublic.h \ + ../src/H5Fpublic.h \ ../src/H5Gpublic.h \ - ../src/H5Bprivate.h \ - ../src/H5Bpublic.h \ - ../src/H5HGprivate.h \ ../src/H5HGpublic.h \ - ../src/H5Pprivate.h \ - ../src/H5Ppublic.h -ragged.o: \ - ragged.c \ + ../src/H5HLpublic.h \ + ../src/H5MFpublic.h \ + ../src/H5MMpublic.h \ + ../src/H5Opublic.h \ + ../src/H5Ppublic.h \ + ../src/H5Zpublic.h \ + ../src/H5Rpublic.h \ + ../src/H5Spublic.h \ + ../src/H5Tpublic.h +cmpd_dset.o: \ + cmpd_dset.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -303,30 +286,39 @@ ragged.o: \ ../src/H5Zpublic.h \ ../src/H5Rpublic.h \ ../src/H5Spublic.h \ - ../src/H5Tpublic.h \ - ../src/H5private.h -testhdf5.o: \ - testhdf5.c \ - testhdf5.h \ - ../src/H5private.h \ + ../src/H5Tpublic.h +extend.o: \ + extend.c \ + ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ - ../src/H5Eprivate.h \ - ../src/H5Epublic.h -tattr.o: \ - tattr.c \ - testhdf5.h \ - ../src/H5private.h \ + ../src/H5Ipublic.h \ + ../src/H5Apublic.h \ + ../src/H5ACpublic.h \ + ../src/H5Bpublic.h \ + ../src/H5Dpublic.h \ + ../src/H5Epublic.h \ + ../src/H5Fpublic.h \ + ../src/H5Gpublic.h \ + ../src/H5HGpublic.h \ + ../src/H5HLpublic.h \ + ../src/H5MFpublic.h \ + ../src/H5MMpublic.h \ + ../src/H5Opublic.h \ + ../src/H5Ppublic.h \ + ../src/H5Zpublic.h \ + ../src/H5Rpublic.h +external.o: \ + external.c \ + ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ - ../src/H5Eprivate.h \ - ../src/H5Epublic.h \ ../src/H5Ipublic.h \ - ../src/hdf5.h \ ../src/H5Apublic.h \ ../src/H5ACpublic.h \ ../src/H5Bpublic.h \ ../src/H5Dpublic.h \ + ../src/H5Epublic.h \ ../src/H5Fpublic.h \ ../src/H5Gpublic.h \ ../src/H5HGpublic.h \ @@ -335,21 +327,21 @@ tattr.o: \ ../src/H5MMpublic.h \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ - ../src/H5Zpublic.h -tselect.o: \ - tselect.c \ - testhdf5.h \ - ../src/H5private.h \ + ../src/H5Zpublic.h \ + ../src/H5Rpublic.h \ + ../src/H5Spublic.h \ + ../src/H5Tpublic.h +iopipe.o: \ + iopipe.c \ + ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ - ../src/H5Eprivate.h \ - ../src/H5Epublic.h \ ../src/H5Ipublic.h \ - ../src/hdf5.h \ ../src/H5Apublic.h \ ../src/H5ACpublic.h \ ../src/H5Bpublic.h \ ../src/H5Dpublic.h \ + ../src/H5Epublic.h \ ../src/H5Fpublic.h \ ../src/H5Gpublic.h \ ../src/H5HGpublic.h \ @@ -358,35 +350,31 @@ tselect.o: \ ../src/H5MMpublic.h \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ - ../src/H5Zpublic.h -th5s.o: \ - th5s.c \ - testhdf5.h \ + ../src/H5Zpublic.h \ + ../src/H5Rpublic.h \ + ../src/H5Spublic.h \ + ../src/H5Tpublic.h +gheap.o: \ + gheap.c \ ../src/H5private.h \ ../src/H5public.h \ ../src/H5config.h \ ../src/H5Eprivate.h \ ../src/H5Epublic.h \ ../src/H5Ipublic.h \ - ../src/H5Bprivate.h \ - ../src/H5Bpublic.h \ ../src/H5Fprivate.h \ ../src/H5Fpublic.h \ ../src/H5Dpublic.h \ - ../src/H5Sprivate.h \ - ../src/H5Spublic.h \ ../src/H5Gprivate.h \ ../src/H5Gpublic.h \ - ../src/H5Oprivate.h \ - ../src/H5Opublic.h \ + ../src/H5Bprivate.h \ + ../src/H5Bpublic.h \ ../src/H5HGprivate.h \ ../src/H5HGpublic.h \ - ../src/H5Tprivate.h \ - ../src/H5Tpublic.h \ - ../src/H5Zprivate.h \ - ../src/H5Zpublic.h -dsets.o: \ - dsets.c \ + ../src/H5Pprivate.h \ + ../src/H5Ppublic.h +shtype.o: \ + shtype.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -405,11 +393,9 @@ dsets.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ - ../src/H5Rpublic.h \ - ../src/H5Spublic.h \ - ../src/H5Tpublic.h -cmpd_dset.o: \ - cmpd_dset.c \ + ../src/H5Rpublic.h +big.o: \ + big.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -430,9 +416,10 @@ cmpd_dset.o: \ ../src/H5Zpublic.h \ ../src/H5Rpublic.h \ ../src/H5Spublic.h \ - ../src/H5Tpublic.h -big.o: \ - big.c \ + ../src/H5Tpublic.h \ + ../src/H5private.h +links.o: \ + links.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -452,11 +439,9 @@ big.o: \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ ../src/H5Rpublic.h \ - ../src/H5Spublic.h \ - ../src/H5Tpublic.h \ - ../src/H5private.h -links.o: \ - links.c \ + ../src/H5Spublic.h +chunk.o: \ + chunk.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -477,8 +462,24 @@ links.o: \ ../src/H5Zpublic.h \ ../src/H5Rpublic.h \ ../src/H5Spublic.h -chunk.o: \ - chunk.c \ +bittests.o: \ + bittests.c \ + ../src/H5Tpkg.h \ + ../src/H5HGprivate.h \ + ../src/H5HGpublic.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5Fprivate.h \ + ../src/H5Fpublic.h \ + ../src/H5Ipublic.h \ + ../src/H5private.h \ + ../src/H5Dpublic.h \ + ../src/H5Tprivate.h \ + ../src/H5Tpublic.h \ + ../src/H5Gprivate.h \ + ../src/H5Gpublic.h +mtime.o: \ + mtime.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -498,9 +499,11 @@ chunk.o: \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ ../src/H5Rpublic.h \ - ../src/H5Spublic.h -mtime.o: \ - mtime.c \ + ../src/H5Spublic.h \ + ../src/H5Tpublic.h \ + ../src/H5private.h +ragged.o: \ + ragged.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ diff --git a/test/links.c b/test/links.c index 0a0f807..013d8b8 100644 --- a/test/links.c +++ b/test/links.c @@ -176,8 +176,8 @@ cklinks(void) } /* Hard link */ - if (H5Gget_stat(file, "d1", TRUE, &sb1)<0) goto error; - if (H5Gget_stat(file, "grp1/hard", TRUE, &sb2)<0) goto error; + if (H5Gget_objinfo(file, "d1", TRUE, &sb1)<0) goto error; + if (H5Gget_objinfo(file, "grp1/hard", TRUE, &sb2)<0) goto error; if (H5G_DATASET!=sb2.type) { puts("*FAILED*"); puts(" Unexpected object type should have been a dataset"); @@ -191,7 +191,7 @@ cklinks(void) } /* Symbolic link */ - if (H5Gget_stat(file, "grp1/soft", TRUE, &sb2)<0) goto error; + if (H5Gget_objinfo(file, "grp1/soft", TRUE, &sb2)<0) goto error; if (H5G_DATASET!=sb2.type) { puts("*FAILED*"); puts(" Unexpected object type should have been a dataset"); @@ -214,14 +214,14 @@ cklinks(void) /* Dangling link */ H5E_BEGIN_TRY { - status = H5Gget_stat(file, "grp1/dangle", TRUE, &sb2); + status = H5Gget_objinfo(file, "grp1/dangle", TRUE, &sb2); } H5E_END_TRY; if (status>=0) { puts("*FAILED*"); - puts(" H5Gget_stat() should have failed for a dangling link."); + puts(" H5Gget_objinfo() should have failed for a dangling link."); goto error; } - if (H5Gget_stat(file, "grp1/dangle", FALSE, &sb2)<0) goto error; + if (H5Gget_objinfo(file, "grp1/dangle", FALSE, &sb2)<0) goto error; if (H5G_LINK!=sb2.type) { puts("*FAILED*"); puts(" Unexpected object type should have been a symbolic link"); @@ -238,14 +238,14 @@ cklinks(void) /* Recursive link */ H5E_BEGIN_TRY { - status = H5Gget_stat(file, "grp1/recursive", TRUE, &sb2); + status = H5Gget_objinfo(file, "grp1/recursive", TRUE, &sb2); } H5E_END_TRY; if (status>=0) { puts("*FAILED*"); - puts(" H5Gget_stat() should have failed for a recursive link."); + puts(" H5Gget_objinfo() should have failed for a recursive link."); goto error; } - if (H5Gget_stat(file, "grp1/recursive", FALSE, &sb2)<0) goto error; + if (H5Gget_objinfo(file, "grp1/recursive", FALSE, &sb2)<0) goto error; if (H5G_LINK!=sb2.type) { puts("*FAILED*"); puts(" Unexpected object type should have been a symbolic link"); diff --git a/test/mtime.c b/test/mtime.c index 401d7d7..a2e32c1 100644 --- a/test/mtime.c +++ b/test/mtime.c @@ -120,21 +120,21 @@ main(void) /* * Open the file and get the modification time. We'll test the new - * H5Gget_stat() arguments too: being able to stat something without knowing + * H5Gget_objinfo() arguments too: being able to stat something without knowing * its name. */ if ((file = H5Fopen(FILE_NAME_1, H5F_ACC_RDONLY, H5P_DEFAULT))<0) return 1; - if (H5Gget_stat(file, "dset", TRUE, &sb1)<0) return 1; + if (H5Gget_objinfo(file, "dset", TRUE, &sb1)<0) return 1; if ((dset=H5Dopen(file, "dset"))<0) return 1; - if (H5Gget_stat(dset, ".", TRUE, &sb2)<0) return 1; + if (H5Gget_objinfo(dset, ".", TRUE, &sb2)<0) return 1; if (H5Dclose(dset)<0) return 1; if (H5Fclose(file)<0) return 1; - /* Compare times from the two ways of calling H5Gget_stat() */ + /* Compare times from the two ways of calling H5Gget_objinfo() */ if (sb1.objno[0]!=sb2.objno[0] || sb1.objno[1]!=sb2.objno[1] || sb1.mtime!=sb2.mtime) { puts("*FAILED*"); - puts(" Calling H5Gget_stat() with the dataset ID returned different"); + puts(" Calling H5Gget_objinfo() with the dataset ID returned different"); puts(" values than calling it with a file and dataset name."); return 1; } diff --git a/test/tselect.c b/test/tselect.c index 3223cdb..e38bbda 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -491,6 +491,7 @@ test_select_combo(void) *tbuf2; /* temporary buffer pointer */ intn i,j; /* Counters */ herr_t ret; /* Generic return value */ +hbool_t valid; /* Generic boolean return value */ /* Output message about test being performed */ MESSAGE(5, ("Testing Combination of Hyperslab & Element Selection Functions\n")); @@ -1153,21 +1154,21 @@ test_select_hyper_offset(void) ret = H5Soffset_simple(sid1,offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, TRUE, "H5Svalid_offset"); + VERIFY(valid, TRUE, "H5Sselect_valid"); /* Check an invalid offset */ offset[0]=10; offset[1]=0; offset[2]=0; ret = H5Soffset_simple(sid1,offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, FALSE, "H5Svalid_offset"); + VERIFY(valid, FALSE, "H5Sselect_valid"); /* Reset offset */ offset[0]=0; offset[1]=0; offset[2]=0; ret = H5Soffset_simple(sid1,offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, TRUE, "H5Svalid_offset"); + VERIFY(valid, TRUE, "H5Sselect_valid"); /* Select 15x26 hyperslab for memory dataset */ start[0]=15; start[1]=0; @@ -1182,7 +1183,7 @@ test_select_hyper_offset(void) ret = H5Soffset_simple(sid2,offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid2); - VERIFY(valid, TRUE, "H5Svalid_offset"); + VERIFY(valid, TRUE, "H5Sselect_valid"); /* Create a dataset */ dataset=H5Dcreate(fid1,"Dataset1",H5T_NATIVE_UCHAR,sid1,H5P_DEFAULT); @@ -1314,21 +1315,21 @@ test_select_point_offset(void) ret = H5Soffset_simple(sid1,offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, TRUE, "H5Svalid_offset"); + VERIFY(valid, TRUE, "H5Sselect_valid"); /* Check an invalid offset */ offset[0]=10; offset[1]=0; offset[2]=0; ret = H5Soffset_simple(sid1,offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, FALSE, "H5Svalid_offset"); + VERIFY(valid, FALSE, "H5Sselect_valid"); /* Reset offset */ offset[0]=0; offset[1]=0; offset[2]=0; ret = H5Soffset_simple(sid1,offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid1); - VERIFY(valid, TRUE, "H5Svalid_offset"); + VERIFY(valid, TRUE, "H5Sselect_valid"); /* Select sequence of ten points for write dataset */ coord2[0][0]=12; coord2[0][1]= 3; @@ -1349,7 +1350,7 @@ test_select_point_offset(void) ret = H5Soffset_simple(sid2,offset); CHECK(ret, FAIL, "H5Soffset_simple"); valid = H5Sselect_valid(sid2); - VERIFY(valid, TRUE, "H5Svalid_offset"); + VERIFY(valid, TRUE, "H5Sselect_valid"); /* Create a dataset */ dataset=H5Dcreate(fid1,"Dataset1",H5T_NATIVE_UCHAR,sid1,H5P_DEFAULT); |