diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-12-18 21:06:44 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-12-18 21:06:44 (GMT) |
| commit | 9769d008b0d610f3dd0bff5f3ef083d01c506c35 (patch) | |
| tree | c4f60023c3f1a482918baafa8195217004658823 /test/tattr.c | |
| parent | f327d12ebdd069812896d52de70fff65024fba42 (diff) | |
| download | hdf5-9769d008b0d610f3dd0bff5f3ef083d01c506c35.zip hdf5-9769d008b0d610f3dd0bff5f3ef083d01c506c35.tar.gz hdf5-9769d008b0d610f3dd0bff5f3ef083d01c506c35.tar.bz2 | |
[svn-r13072] Description:
Push support for shared attributes into more dark corners of the "dense"
attribute storage support.
Tested on:
Linux/32 2.6 (chicago)
Linux/64 2.6 (chicago2)
Diffstat (limited to 'test/tattr.c')
| -rw-r--r-- | test/tattr.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/test/tattr.c b/test/tattr.c index 04350a8..964773e 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -1706,7 +1706,7 @@ test_attr_dense_create(hid_t fcpl, hid_t fapl) MESSAGE(5, ("Testing Dense Attribute Storage Creation\n")); /* Create file */ - fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); + fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl); CHECK(fid, FAIL, "H5Fcreate"); /* Create dataspace for dataset */ @@ -1812,7 +1812,7 @@ test_attr_dense_open(hid_t fcpl, hid_t fapl) MESSAGE(5, ("Testing Opening Attributes in Dense Storage\n")); /* Create file */ - fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); + fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl); CHECK(fid, FAIL, "H5Fcreate"); /* Create dataspace for dataset */ @@ -1933,7 +1933,7 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl) MESSAGE(5, ("Testing Deleting Attributes in Dense Storage\n")); /* Create file */ - fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); + fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl); CHECK(fid, FAIL, "H5Fcreate"); /* Create dataspace for dataset */ @@ -1983,6 +1983,23 @@ HDfprintf(stderr, "max_compact = %u, min_dense = %u\n", max_compact, min_dense); ret = H5Sclose(sid); CHECK(ret, FAIL, "H5Sclose"); + /* Close Dataset */ + ret = H5Dclose(dataset); + CHECK(ret, FAIL, "H5Dclose"); + + /* Close file */ + ret = H5Fclose(fid); + CHECK(ret, FAIL, "H5Fclose"); + + + /* Re-open file */ + fid = H5Fopen(FILENAME, H5F_ACC_RDWR, fapl); + CHECK(fid, FAIL, "H5Fopen"); + + /* Open dataset */ + dataset = H5Dopen(fid, DSET1_NAME); + CHECK(dataset, FAIL, "H5Dopen"); + /* Delete attributes until the attributes revert to compact storage again */ for(u--; u >= min_dense; u--) { /* Delete attribute */ @@ -2099,12 +2116,12 @@ test_attr(void) hid_t my_fcpl; /* Set the FCPL for shared or not */ - if(new_format) { + if(use_shared) { MESSAGE(7, ("testing with shared attributes\n")); my_fcpl = fcpl2; } /* end if */ else { - MESSAGE(7, ("testing with shared attributes\n")); + MESSAGE(7, ("testing without shared attributes\n")); my_fcpl = fcpl; } /* end else */ |