diff options
| author | Robert E. McGrath <mcgrath@ncsa.uiuc.edu> | 2004-11-02 19:12:06 (GMT) |
|---|---|---|
| committer | Robert E. McGrath <mcgrath@ncsa.uiuc.edu> | 2004-11-02 19:12:06 (GMT) |
| commit | 3f0abcc71f1803b59d8ca64b9ec642235fdfc1c9 (patch) | |
| tree | cdad2edff464edf39f132edc8082615f1ca51738 /test/tmisc.c | |
| parent | f7c4277bbbbe531ba37b36bb6b2e1b3f2966efea (diff) | |
| download | hdf5-3f0abcc71f1803b59d8ca64b9ec642235fdfc1c9.zip hdf5-3f0abcc71f1803b59d8ca64b9ec642235fdfc1c9.tar.gz hdf5-3f0abcc71f1803b59d8ca64b9ec642235fdfc1c9.tar.bz2 | |
[svn-r9494] Purpose:
Fix SZIP filter to dynmically detect encoder.
Description:
Solution:
See:
http://hdf.ncsa.uiuc.edu/RFC/SZIP/Szip_dynamic_12_Oct.pdf
Changes to library tests, contingent on detecting SZIP encoder.
Diffstat (limited to 'test/tmisc.c')
| -rw-r--r-- | test/tmisc.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/test/tmisc.c b/test/tmisc.c index 65a0110..3447b82 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -3499,7 +3499,8 @@ test_misc20(void) and encoder is available. EIP 2004/8/04 */ -#if defined H5_HAVE_FILTER_SZIP && defined H5_SZIP_CAN_ENCODE +#if defined H5_HAVE_FILTER_SZIP + /**************************************************************** ** ** test_misc21(): Test that late allocation time is treated the same @@ -3517,6 +3518,7 @@ test_misc21(void) chunk_size[2]={MISC21_CHUNK_DIM0,MISC21_CHUNK_DIM1}; herr_t ret; /* Generic return value */ + if (h5_szip_can_encode() != 1) return; /* Output message about test being performed */ MESSAGE(5, ("Testing late allocation time w/chunks & filters\n")); @@ -3595,6 +3597,7 @@ test_misc22(void) unsigned int cd_values[32]; int correct; + if (h5_szip_can_encode() != 1) return; idts[0]=H5Tcopy(H5T_NATIVE_UINT8); idts[1]=H5Tcopy(H5T_NATIVE_UINT16); idts[2]=H5Tcopy(H5T_NATIVE_UINT32); @@ -3708,7 +3711,7 @@ test_misc22(void) HDfree(buf); } /* end test_misc22() */ -#endif /* H5_SZIP_CAN_ENCODE & H5_HAVE_FILTER_SZIP */ +#endif /* H5_HAVE_FILTER_SZIP */ /**************************************************************** ** @@ -3741,10 +3744,10 @@ 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 */ -#if defined H5_HAVE_FILTER_SZIP & defined H5_SZIP_CAN_ENCODE +#if defined H5_HAVE_FILTER_SZIP 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 & H5_HAVE_FILTER_SZIP */ +#endif /* H5_HAVE_FILTER_SZIP */ } /* test_misc() */ @@ -3789,8 +3792,9 @@ cleanup_misc(void) HDremove(MISC18_FILE); HDremove(MISC19_FILE); HDremove(MISC20_FILE); -#if defined H5_HAVE_FILTER_SZIP & defined H5_SZIP_CAN_ENCODE +#if defined H5_HAVE_FILTER_SZIP HDremove(MISC21_FILE); HDremove(MISC22_FILE); -#endif /* H5_SZIP_CAN_ENCODE & H5_HAVE_FILTER_SZIP */ +#endif /* H5_HAVE_FILTER_SZIP */ } + |