summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2004-07-30 03:34:15 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2004-07-30 03:34:15 (GMT)
commitc4015e03e5a7bdd0331d9a547bac2a2a94098ab9 (patch)
tree48f555c8e85d98d1f72c059bd34400cf22cc6bb2 /test
parentabf5d5cf60cea890a9efb1260abfeecb14cbc655 (diff)
downloadhdf5-c4015e03e5a7bdd0331d9a547bac2a2a94098ab9.zip
hdf5-c4015e03e5a7bdd0331d9a547bac2a2a94098ab9.tar.gz
hdf5-c4015e03e5a7bdd0331d9a547bac2a2a94098ab9.tar.bz2
[svn-r8969] Purpose:
Bug fix. Description: Address two problems: - The computation of the scanline in the szip filter was being performed in the "can apply" callback routine instead of the "set local" routine. - The routine which allocated all the chunks for an entire dataset (which is invoked when the allocation time is early or late, rather than incremental) wasn't recording a failed filter in the information for the chunk, causing the library to believe that the chunk had the filter applied when it really hadn't. Solution: - Move the scanline computation to the "set local" callback. - Record the filter mask with each chunk created when allocating them. Platforms tested: FreeBSD 4.10 (sleipnir) w/szip Too obscure to require h5committest
Diffstat (limited to 'test')
-rw-r--r--test/tmisc.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/test/tmisc.c b/test/tmisc.c
index bb528ae..802c542 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -240,8 +240,8 @@ unsigned m13_rdata[MISC13_DIM1][MISC13_DIM2]; /* Data read from dataset
#define MISC21_SPACE_RANK 2
#define MISC21_SPACE_DIM0 7639
#define MISC21_SPACE_DIM1 6308
-#define MISC21_CHUNK_DIM0 1024
-#define MISC21_CHUNK_DIM1 1024
+#define MISC21_CHUNK_DIM0 2048
+#define MISC21_CHUNK_DIM1 2048
/****************************************************************
**
@@ -3493,6 +3493,7 @@ test_misc20(void)
** don't exactly match the dataspace.
**
****************************************************************/
+#ifdef H5_HAVE_FILTER_SZIP
static void
test_misc21(void)
{
@@ -3520,7 +3521,7 @@ test_misc21(void)
/* Set custom DCPL properties */
ret = H5Pset_chunk (dcpl, MISC21_SPACE_RANK, chunk_size);
CHECK(ret, FAIL, "H5Pset_chunk");
- ret = H5Pset_deflate (dcpl, 6);
+ ret = H5Pset_szip (dcpl, H5_SZIP_NN_OPTION_MASK, 8);
CHECK(ret, FAIL, "H5Pset_deflate");
ret = H5Pset_alloc_time (dcpl, H5D_ALLOC_TIME_LATE);
CHECK(ret, FAIL, "H5Pset_alloc_time");
@@ -3549,6 +3550,7 @@ test_misc21(void)
HDfree(buf);
} /* end test_misc21() */
+#endif /* H5_HAVE_FILTER_SZIP */
/****************************************************************
**
@@ -3581,9 +3583,9 @@ test_misc(void)
test_misc18(); /* Test new object header information in H5G_stat_t struct */
test_misc19(); /* Test incrementing & decrementing ref count on IDs */
test_misc20(); /* Test problems with truncated dimensions in version 2 of storage layout message */
-#ifdef H5_HAVE_FILTER_DEFLATE
+#ifdef H5_HAVE_FILTER_SZIP
test_misc21(); /* Test that "late" allocation time is treated the same as "incremental", for chunked datasets w/a filters */
-#endif /* H5_HAVE_FILTER_DEFLATE */
+#endif /* H5_HAVE_FILTER_SZIP */
} /* test_misc() */