summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElena Pourmal <epourmal@hdfgroup.org>2004-08-04 20:27:28 (GMT)
committerElena Pourmal <epourmal@hdfgroup.org>2004-08-04 20:27:28 (GMT)
commit7de13f9663045620afbd2cb42db9851a0636468f (patch)
tree4892797de3a88708b054dd09027f1da6b64395ff
parentacd568da0def5d7eff79e207a4cfe4ab9661286d (diff)
downloadhdf5-7de13f9663045620afbd2cb42db9851a0636468f.zip
hdf5-7de13f9663045620afbd2cb42db9851a0636468f.tar.gz
hdf5-7de13f9663045620afbd2cb42db9851a0636468f.tar.bz2
[svn-r9014]
Purpose: Small bug fix Description: When SZIP filter is present but encoding is not enabled test_misc21 and h5repack tests failed. Solution: Those tests should not run in this situation at all. Used conditonal compilation to disable the tests. Platforms tested: sol (today I will enable the daily tests with the szip library that doesn't have encoder for few other platforms) Misc. update:
-rw-r--r--test/tmisc.c15
-rw-r--r--tools/h5repack/testh5repack_main.c6
2 files changed, 13 insertions, 8 deletions
diff --git a/test/tmisc.c b/test/tmisc.c
index 1620831..00ba268 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -3493,7 +3493,14 @@ test_misc20(void)
CHECK(ret, FAIL, "H5Fclose");
} /* end test_misc20() */
-
+
+/*
+ test_misc21 and test_misc22 should be executed when SZIP is present
+ and encoder is available.
+ EIP 2004/8/04
+*/
+#ifdef H5_HAVE_FILTER_SZIP
+#ifdef H5_SZIP_CAN_ENCODE
/****************************************************************
**
** test_misc21(): Test that late allocation time is treated the same
@@ -3502,7 +3509,6 @@ test_misc20(void)
** don't exactly match the dataspace.
**
****************************************************************/
-#ifdef H5_HAVE_FILTER_SZIP
static void
test_misc21(void)
{
@@ -3559,7 +3565,6 @@ test_misc21(void)
HDfree(buf);
} /* end test_misc21() */
-#endif /* H5_HAVE_FILTER_SZIP */
/****************************************************************
**
@@ -3568,8 +3573,6 @@ test_misc21(void)
** Tests for precision and offset combo's.
**
****************************************************************/
-#ifdef H5_HAVE_FILTER_SZIP
-#ifdef H5_SZIP_CAN_ENCODE
static void
test_misc22(void)
{
@@ -3738,8 +3741,8 @@ test_misc(void)
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_SZIP
- test_misc21(); /* Test that "late" allocation time is treated the same as "incremental", for chunked datasets w/a filters */
#ifdef H5_SZIP_CAN_ENCODE
+ test_misc21(); /* Test that "late" allocation time is treated the same as "incremental", for chunked datasets w/a filters */
test_misc22(); /* check szip bits per pixel */
#endif /* H5_SZIP_CAN_ENCODE */
#endif /* H5_HAVE_FILTER_SZIP */
diff --git a/tools/h5repack/testh5repack_main.c b/tools/h5repack/testh5repack_main.c
index af19db2..8c1239f 100644
--- a/tools/h5repack/testh5repack_main.c
+++ b/tools/h5repack/testh5repack_main.c
@@ -915,7 +915,8 @@ TESTING(" addding shuffle filter to all");
TESTING(" filter conversion from deflate to szip");
-#if defined (H5_HAVE_FILTER_SZIP) && defined (H5_HAVE_FILTER_DEFLATE) \
+#if defined (H5_HAVE_FILTER_SZIP) && defined (H5_SZIP_CAN_ENCODE) \
+ && defined (H5_HAVE_FILTER_DEFLATE) \
&& defined (H5_HAVE_FILTER_FLETCHER32) && defined (H5_HAVE_FILTER_SHUFFLE)
if (h5repack_init (&pack_options, 0)<0)
@@ -938,7 +939,8 @@ TESTING(" addding shuffle filter to all");
TESTING(" filter conversion from szip to deflate");
-#if defined (H5_HAVE_FILTER_SZIP) && defined (H5_HAVE_FILTER_DEFLATE) \
+#if defined (H5_HAVE_FILTER_SZIP) && defined (H5_SZIP_CAN_ENCODE) \
+ && defined (H5_HAVE_FILTER_DEFLATE) \
&& defined (H5_HAVE_FILTER_FLETCHER32) && defined (H5_HAVE_FILTER_SHUFFLE)
if (h5repack_init (&pack_options, 0)<0)