summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2007-11-29 19:56:55 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2007-11-29 19:56:55 (GMT)
commit6d4fdcb4a75e5f558ac74b142851d3ba94258149 (patch)
tree430958d35a2d2af38a336f3843aa66092d2ae5dd
parentad7f4300809896e65bc7d5ede5f89c6dbbc3036e (diff)
downloadhdf5-6d4fdcb4a75e5f558ac74b142851d3ba94258149.zip
hdf5-6d4fdcb4a75e5f558ac74b142851d3ba94258149.tar.gz
hdf5-6d4fdcb4a75e5f558ac74b142851d3ba94258149.tar.bz2
[svn-r14309] bug fix: add a check for the presence of a filter in the call to test of long swtich names
add a test for multiple global filters tested: linux, solaris
-rwxr-xr-xtools/h5repack/h5repack.sh.in19
1 files changed, 15 insertions, 4 deletions
diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in
index 9c9de8f..2e411b0 100755
--- a/tools/h5repack/h5repack.sh.in
+++ b/tools/h5repack/h5repack.sh.in
@@ -428,12 +428,23 @@ TOOLTEST $FILE4 -l dset_chunk:CHUNK=18x13
TOOLTEST $FILE1 -n
-################################################################
# long swtiches. use FILE4=h5repack_layout.h5 (no filters)
-###############################################################
-TOOLTEST $FILE4 --layout CHUNK=20x10 --filter GZIP=1 --threshold=10 --native --latest --compact=8 --indexed=6 --ssize=8[:dtype]
-
+arg="$FILE4 --layout CHUNK=20x10 --filter GZIP=1 --threshold=10 --native --latest --compact=8 --indexed=6 --ssize=8[:dtype]"
+if test $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST $arg
+fi
+
+# several global filters
+
+arg="$FILE4 --filter GZIP=1 --filter SHUF"
+if test $USE_FILTER_DEFLATE != "yes" -o $USE_FILTER_SHUFFLE != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST $arg
+fi
if test $nerrors -eq 0 ; then