diff options
| author | Elena Pourmal <epourmal@hdfgroup.org> | 2004-08-04 20:24:42 (GMT) |
|---|---|---|
| committer | Elena Pourmal <epourmal@hdfgroup.org> | 2004-08-04 20:24:42 (GMT) |
| commit | 28ab722e861cbdaa2eb4b42d140c14dd878815f6 (patch) | |
| tree | 5e67399c1314e8cc1b5b809cdd10c3ca6ad09c22 | |
| parent | 71e29531eb9098ced2e92a87c9581fd128caedef (diff) | |
| download | hdf5-28ab722e861cbdaa2eb4b42d140c14dd878815f6.zip hdf5-28ab722e861cbdaa2eb4b42d140c14dd878815f6.tar.gz hdf5-28ab722e861cbdaa2eb4b42d140c14dd878815f6.tar.bz2 | |
[svn-r9013]
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.c | 13 | ||||
| -rw-r--r-- | tools/h5repack/testh5repack_main.c | 6 |
2 files changed, 12 insertions, 7 deletions
diff --git a/test/tmisc.c b/test/tmisc.c index aa11d3a..81221cd 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -3385,6 +3385,13 @@ test_misc20(void) } /* end test_misc20() */ +/* + test_misc21 and test_misc22 should be executed only 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 @@ -3393,7 +3400,6 @@ test_misc20(void) ** don't exactly match the dataspace. ** ****************************************************************/ -#ifdef H5_HAVE_FILTER_SZIP static void test_misc21(void) { @@ -3450,7 +3456,6 @@ test_misc21(void) HDfree(buf); } /* end test_misc21() */ -#endif /* H5_HAVE_FILTER_SZIP */ /**************************************************************** ** @@ -3459,8 +3464,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) { @@ -3629,8 +3632,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) |