mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-19 16:50:46 +08:00
[svn-r22674] Remove checks for filters are available because the h5dump tests never used the filters in the tests. "-H" option excludes data.
HDFFV-8125
This commit is contained in:
Allen Byrne
parent
4f4db8799c
commit
eb4fd07b5a
tools/h5dump
@ -781,35 +781,6 @@ IF (BUILD_TESTING)
|
||||
ENDIF (HDF5_ENABLE_USING_MEMCHECKER)
|
||||
ENDMACRO (ADD_XML_H5_TEST file)
|
||||
|
||||
# --------------------------------------------------------------------
|
||||
# See which filters are usable (and skip tests for filters we
|
||||
# don't have). Do this by searching H5pubconf.h to see which
|
||||
# filters are defined.
|
||||
# --------------------------------------------------------------------
|
||||
IF (H5_HAVE_FILTER_DEFLATE)
|
||||
SET (USE_FILTER_DEFLATE "true")
|
||||
ENDIF (H5_HAVE_FILTER_DEFLATE)
|
||||
|
||||
IF (H5_HAVE_FILTER_SZIP)
|
||||
SET (USE_FILTER_SZIP "true")
|
||||
ENDIF (H5_HAVE_FILTER_SZIP)
|
||||
|
||||
IF (H5_HAVE_FILTER_SHUFFLE)
|
||||
SET (USE_FILTER_SHUFFLE "true")
|
||||
ENDIF (H5_HAVE_FILTER_SHUFFLE)
|
||||
|
||||
IF (H5_HAVE_FILTER_FLETCHER32)
|
||||
SET (USE_FILTER_FLETCHER32 "true")
|
||||
ENDIF (H5_HAVE_FILTER_FLETCHER32)
|
||||
|
||||
IF (H5_HAVE_FILTER_NBIT)
|
||||
SET (USE_FILTER_NBIT "true")
|
||||
ENDIF (H5_HAVE_FILTER_NBIT)
|
||||
|
||||
IF (H5_HAVE_FILTER_SCALEOFFSET)
|
||||
SET (USE_FILTER_SCALEOFFSET "true")
|
||||
ENDIF (H5_HAVE_FILTER_SCALEOFFSET)
|
||||
|
||||
##############################################################################
|
||||
##############################################################################
|
||||
### T H E T E S T S HDF5_ENABLE_USING_MEMCHECKER ###
|
||||
@ -1299,53 +1270,25 @@ IF (BUILD_TESTING)
|
||||
|
||||
# tests for filters
|
||||
# SZIP
|
||||
SET (TESTTYPE "TEST")
|
||||
IF (NOT USE_FILTER_SZIP)
|
||||
SET (TESTTYPE "SKIP")
|
||||
ENDIF (NOT USE_FILTER_SZIP)
|
||||
ADD_SKIP_H5_TEST (tszip 0 ${TESTTYPE} --enable-error-stack -H -p -d szip tfilters.h5)
|
||||
ADD_H5_TEST (tszip 0 --enable-error-stack -H -p -d szip tfilters.h5)
|
||||
|
||||
# deflate
|
||||
SET (TESTTYPE "TEST")
|
||||
IF (NOT USE_FILTER_DEFLATE)
|
||||
SET (TESTTYPE "SKIP")
|
||||
ENDIF (NOT USE_FILTER_DEFLATE)
|
||||
ADD_SKIP_H5_TEST (tdeflate 0 ${TESTTYPE} --enable-error-stack -H -p -d deflate tfilters.h5)
|
||||
ADD_H5_TEST (tdeflate 0 --enable-error-stack -H -p -d deflate tfilters.h5)
|
||||
|
||||
# shuffle
|
||||
SET (TESTTYPE "TEST")
|
||||
IF (NOT USE_FILTER_SHUFFLE)
|
||||
SET (TESTTYPE "SKIP")
|
||||
ENDIF (NOT USE_FILTER_SHUFFLE)
|
||||
ADD_SKIP_H5_TEST (tshuffle 0 ${TESTTYPE} --enable-error-stack -H -p -d shuffle tfilters.h5)
|
||||
ADD_H5_TEST (tshuffle 0 --enable-error-stack -H -p -d shuffle tfilters.h5)
|
||||
|
||||
# fletcher32
|
||||
SET (TESTTYPE "TEST")
|
||||
IF (NOT USE_FILTER_FLETCHER32)
|
||||
SET (TESTTYPE "SKIP")
|
||||
ENDIF (NOT USE_FILTER_FLETCHER32)
|
||||
ADD_SKIP_H5_TEST (tfletcher32 0 ${TESTTYPE} --enable-error-stack -H -p -d fletcher32 tfilters.h5)
|
||||
ADD_H5_TEST (tfletcher32 0 --enable-error-stack -H -p -d fletcher32 tfilters.h5)
|
||||
|
||||
# nbit
|
||||
SET (TESTTYPE "TEST")
|
||||
IF (NOT USE_FILTER_NBIT)
|
||||
SET (TESTTYPE "SKIP")
|
||||
ENDIF (NOT USE_FILTER_NBIT)
|
||||
ADD_SKIP_H5_TEST (tnbit 0 ${TESTTYPE} --enable-error-stack -H -p -d nbit tfilters.h5)
|
||||
ADD_H5_TEST (tnbit 0 --enable-error-stack -H -p -d nbit tfilters.h5)
|
||||
|
||||
# scaleoffset
|
||||
SET (TESTTYPE "TEST")
|
||||
IF (NOT USE_FILTER_SCALEOFFSET)
|
||||
SET (TESTTYPE "SKIP")
|
||||
ENDIF (NOT USE_FILTER_SCALEOFFSET)
|
||||
ADD_SKIP_H5_TEST (tscaleoffset 0 ${TESTTYPE} --enable-error-stack -H -p -d scaleoffset tfilters.h5)
|
||||
ADD_H5_TEST (tscaleoffset 0 --enable-error-stack -H -p -d scaleoffset tfilters.h5)
|
||||
|
||||
# all
|
||||
SET (TESTTYPE "TEST")
|
||||
IF (NOT USE_FILTER_SZIP OR NOT USE_FILTER_SHUFFLE OR NOT USE_FILTER_FLETCHER32 OR NOT USE_FILTER_DEFLATE OR NOT USE_FILTER_NBIT OR NOT USE_FILTER_SCALEOFFSET)
|
||||
SET (TESTTYPE "SKIP")
|
||||
ENDIF (NOT USE_FILTER_SZIP OR NOT USE_FILTER_SHUFFLE OR NOT USE_FILTER_FLETCHER32 OR NOT USE_FILTER_DEFLATE OR NOT USE_FILTER_NBIT OR NOT USE_FILTER_SCALEOFFSET)
|
||||
ADD_SKIP_H5_TEST (tallfilters 0 ${TESTTYPE} --enable-error-stack -H -p -d all tfilters.h5)
|
||||
ADD_H5_TEST (tallfilters 0 --enable-error-stack -H -p -d all tfilters.h5)
|
||||
|
||||
# user defined
|
||||
ADD_H5_TEST (tuserfilter 0 --enable-error-stack -H -p -d myfilter tfilters.h5)
|
||||
|
||||
@ -15,14 +15,6 @@
|
||||
#
|
||||
# Tests for the h5dump tool
|
||||
|
||||
# Determine which filters are available
|
||||
USE_FILTER_SZIP="@USE_FILTER_SZIP@"
|
||||
USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@"
|
||||
USE_FILTER_SHUFFLE="@USE_FILTER_SHUFFLE@"
|
||||
USE_FILTER_FLETCHER32="@USE_FILTER_FLETCHER32@"
|
||||
USE_FILTER_NBIT="@USE_FILTER_NBIT@"
|
||||
USE_FILTER_SCALEOFFSET="@USE_FILTER_SCALEOFFSET@"
|
||||
|
||||
TESTNAME=h5dump
|
||||
EXIT_SUCCESS=0
|
||||
EXIT_FAILURE=1
|
||||
@ -881,54 +873,19 @@ TOOLTEST texceedsubblock.ddl --enable-error-stack -d 1d -k 1,3 taindices.h5
|
||||
|
||||
# tests for filters
|
||||
# SZIP
|
||||
option="--enable-error-stack -H -p -d szip tfilters.h5"
|
||||
if test $USE_FILTER_SZIP != "yes"; then
|
||||
SKIP $option
|
||||
else
|
||||
TOOLTEST tszip.ddl $option
|
||||
fi
|
||||
TOOLTEST tszip.ddl --enable-error-stack -H -p -d szip tfilters.h5
|
||||
# deflate
|
||||
option="--enable-error-stack -H -p -d deflate tfilters.h5"
|
||||
if test $USE_FILTER_DEFLATE != "yes"; then
|
||||
SKIP $option
|
||||
else
|
||||
TOOLTEST tdeflate.ddl $option
|
||||
fi
|
||||
TOOLTEST tdeflate.ddl --enable-error-stack -H -p -d deflate tfilters.h5
|
||||
# shuffle
|
||||
option="--enable-error-stack -H -p -d shuffle tfilters.h5"
|
||||
if test $USE_FILTER_SHUFFLE != "yes"; then
|
||||
SKIP $option
|
||||
else
|
||||
TOOLTEST tshuffle.ddl $option
|
||||
fi
|
||||
TOOLTEST tshuffle.ddl --enable-error-stack -H -p -d shuffle tfilters.h5
|
||||
# fletcher32
|
||||
option="--enable-error-stack -H -p -d fletcher32 tfilters.h5"
|
||||
if test $USE_FILTER_FLETCHER32 != "yes"; then
|
||||
SKIP $option
|
||||
else
|
||||
TOOLTEST tfletcher32.ddl $option
|
||||
fi
|
||||
TOOLTEST tfletcher32.ddl --enable-error-stack -H -p -d fletcher32 tfilters.h5
|
||||
# nbit
|
||||
option="--enable-error-stack -H -p -d nbit tfilters.h5"
|
||||
if test $USE_FILTER_NBIT != "yes"; then
|
||||
SKIP $option
|
||||
else
|
||||
TOOLTEST tnbit.ddl $option
|
||||
fi
|
||||
TOOLTEST tnbit.ddl --enable-error-stack -H -p -d nbit tfilters.h5
|
||||
# scaleoffset
|
||||
option="--enable-error-stack -H -p -d scaleoffset tfilters.h5"
|
||||
if test $USE_FILTER_SCALEOFFSET != "yes"; then
|
||||
SKIP $option
|
||||
else
|
||||
TOOLTEST tscaleoffset.ddl $option
|
||||
fi
|
||||
TOOLTEST tscaleoffset.ddl --enable-error-stack -H -p -d scaleoffset tfilters.h5
|
||||
# all
|
||||
option="--enable-error-stack -H -p -d all tfilters.h5"
|
||||
if test $USE_FILTER_FLETCHER32 != "yes" -o $USE_FILTER_SZIP != "yes" -o $USE_FILTER_DEFLATE != "yes" -o $USE_FILTER_SHUFFLE != "yes" -o $USE_FILTER_NBIT != "yes" -o $USE_FILTER_SCALEOFFSET != "yes"; then
|
||||
SKIP $option
|
||||
else
|
||||
TOOLTEST tallfilters.ddl $option
|
||||
fi
|
||||
TOOLTEST tallfilters.ddl --enable-error-stack -H -p -d all tfilters.h5
|
||||
# user defined
|
||||
TOOLTEST tuserfilter.ddl --enable-error-stack -H -p -d myfilter tfilters.h5
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user