summaryrefslogtreecommitdiffstats
path: root/tools/h5repack
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 /tools/h5repack
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:
Diffstat (limited to 'tools/h5repack')
-rw-r--r--tools/h5repack/testh5repack_main.c6
1 files changed, 4 insertions, 2 deletions
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)