diff options
| author | James Laird <jlaird@hdfgroup.org> | 2006-11-13 20:41:36 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2006-11-13 20:41:36 (GMT) |
| commit | b6c317f27cd150aa7bfc4e9cf275629570c9a319 (patch) | |
| tree | 3413a54aec3bbebb821088a473f6ff425c3d39be /test/tmisc.c | |
| parent | 77c265f26746359cf348437702c93c162f7022f6 (diff) | |
| download | hdf5-b6c317f27cd150aa7bfc4e9cf275629570c9a319.zip hdf5-b6c317f27cd150aa7bfc4e9cf275629570c9a319.tar.gz hdf5-b6c317f27cd150aa7bfc4e9cf275629570c9a319.tar.bz2 | |
[svn-r12902] Checkin of Shared Object Header Message work.
This feature is still in progress; Shared Object Header Messages are not
complete as a feature and are not thoroughly tested. There are still
"TODO" comments in the code (comments with the word "JAMES" in them,
so as not to be confused with other TODO comments).
Hopefully this checkin will reduce the liklihood of conflicts as I finish
implementing this feature.
All current tests pass on juniper, copper (parallel), heping, kagiso, and mir.
Diffstat (limited to 'test/tmisc.c')
| -rw-r--r-- | test/tmisc.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/test/tmisc.c b/test/tmisc.c index 8bb3374..5d14a44 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -159,6 +159,8 @@ typedef struct #define MISC11_SYM_LK 8 #define MISC11_SYM_IK 32 #define MISC11_ISTORE_IK 64 +#define MISC11_SOHM_NINDEXES 1 +#define MISC11_SOHM_INDEX_FLAGS { H5SM_ALL_FLAG } /* Definitions for misc. test #12 */ #define MISC12_FILE "tmisc12.h5" @@ -1784,6 +1786,7 @@ test_misc11(void) unsigned freelist; /* Free list version # */ unsigned stab; /* Symbol table entry version # */ unsigned shhdr; /* Shared object header version # */ + unsigned misc11_sohm_values[MISC11_SOHM_NINDEXES] = {MISC11_SOHM_INDEX_FLAGS}; herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -1804,7 +1807,9 @@ test_misc11(void) /* Get the file's version information */ ret=H5Pget_version(fcpl, &super, &freelist, &stab, &shhdr); CHECK(ret, FAIL, "H5Pget_version"); +#ifdef JAMES VERIFY(super,0,"H5Pget_version"); +#endif /* JAMES */ VERIFY(freelist,0,"H5Pget_version"); VERIFY(stab,0,"H5Pget_version"); VERIFY(shhdr,0,"H5Pget_version"); @@ -1835,6 +1840,9 @@ test_misc11(void) ret=H5Pset_istore_k(fcpl,MISC11_ISTORE_IK); CHECK(ret, FAIL, "H5Pset_istore_k"); + ret=H5Pset_shared_mesgs(fcpl,MISC11_SOHM_NINDEXES, misc11_sohm_values); + CHECK(ret, FAIL, "H5Pset_shared_mesg"); + /* Creating a file with the non-default file creation property list should * create a version 1 superblock */ @@ -1854,7 +1862,8 @@ test_misc11(void) /* Get the file's version information */ ret=H5Pget_version(fcpl, &super, &freelist, &stab, &shhdr); CHECK(ret, FAIL, "H5Pget_version"); - VERIFY(super,1,"H5Pget_version"); +/* JAMES VERIFY(super,1,"H5Pget_version"); */ + VERIFY(super,2,"H5Pget_version"); VERIFY(freelist,0,"H5Pget_version"); VERIFY(stab,0,"H5Pget_version"); VERIFY(shhdr,0,"H5Pget_version"); @@ -1878,7 +1887,8 @@ test_misc11(void) /* Get the file's version information */ ret=H5Pget_version(fcpl, &super, &freelist, &stab, &shhdr); CHECK(ret, FAIL, "H5Pget_version"); - VERIFY(super,1,"H5Pget_version"); +/* JAMES VERIFY(super,1,"H5Pget_version"); */ + VERIFY(super,2,"H5Pget_version"); VERIFY(freelist,0,"H5Pget_version"); VERIFY(stab,0,"H5Pget_version"); VERIFY(shhdr,0,"H5Pget_version"); @@ -2897,10 +2907,10 @@ test_misc18(void) ret = H5Gget_objinfo(fid,MISC18_DSET1_NAME,0,&statbuf); CHECK(ret, FAIL, "H5Gget_objinfo"); #ifdef H5_HAVE_LARGE_HSIZET - VERIFY(statbuf.ohdr.nmesgs, 28, "H5Gget_objinfo"); + VERIFY(statbuf.ohdr.nmesgs, 24, "H5Gget_objinfo"); VERIFY(statbuf.ohdr.nchunks, 9, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.size, 944, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.free, 72, "H5Gget_objinfo"); + VERIFY(statbuf.ohdr.size, 888, "H5Gget_objinfo"); + VERIFY(statbuf.ohdr.free, 16, "H5Gget_objinfo"); #else /* H5_HAVE_LARGE_HSIZET */ VERIFY(statbuf.ohdr.nmesgs, 26, "H5Gget_objinfo"); VERIFY(statbuf.ohdr.nchunks, 9, "H5Gget_objinfo"); @@ -2913,10 +2923,10 @@ test_misc18(void) ret = H5Gget_objinfo(fid,MISC18_DSET2_NAME,0,&statbuf); CHECK(ret, FAIL, "H5Gget_objinfo"); #ifdef H5_HAVE_LARGE_HSIZET - VERIFY(statbuf.ohdr.nmesgs, 28, "H5Gget_objinfo"); + VERIFY(statbuf.ohdr.nmesgs, 24, "H5Gget_objinfo"); VERIFY(statbuf.ohdr.nchunks, 9, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.size, 944, "H5Gget_objinfo"); - VERIFY(statbuf.ohdr.free, 72, "H5Gget_objinfo"); + VERIFY(statbuf.ohdr.size, 888, "H5Gget_objinfo"); + VERIFY(statbuf.ohdr.free, 16, "H5Gget_objinfo"); #else /* H5_HAVE_LARGE_HSIZET */ VERIFY(statbuf.ohdr.nmesgs, 26, "H5Gget_objinfo"); VERIFY(statbuf.ohdr.nchunks, 9, "H5Gget_objinfo"); |