mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r9014]

Browse Source 
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:
This commit is contained in:
Elena Pourmal 2004-08-04 15:27:28 -05:00
parent acd568da0d
commit 7de13f9663
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/tmisc.c
View File

@ -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 */

6
tools/h5repack/testh5repack_main.c
View File

@ -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)