summaryrefslogtreecommitdiffstats
path: root/tools/h5repack
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2009-06-15 19:25:04 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2009-06-15 19:25:04 (GMT)
commita44e5df96ef35b66468433fc2440227a86c5590c (patch)
tree43cd534b7b6a703f071043598d8f7695c7c1772e /tools/h5repack
parent6ce6f90de84afba6c41f5ae7e8d09b011353fcce (diff)
downloadhdf5-a44e5df96ef35b66468433fc2440227a86c5590c.zip
hdf5-a44e5df96ef35b66468433fc2440227a86c5590c.tar.gz
hdf5-a44e5df96ef35b66468433fc2440227a86c5590c.tar.bz2
[svn-r17053] merge 17052 from trunk
Add a run to the h5repack shell script to read a family file The file used for input is located in the common source tools for testfiles, in tools/testfiles Modified the h5repack shell script to read files from this location (h5repack reads its input files from a dedicated testfiles location in h5repack/testfiles) Changed the h5diff open file call to use h5tools_fopen, so that it can open all file drivers Tested: linux
Diffstat (limited to 'tools/h5repack')
-rwxr-xr-xtools/h5repack/h5repack.sh.in38
1 files changed, 38 insertions, 0 deletions
diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in
index a09e8b9..01c33ef 100755
--- a/tools/h5repack/h5repack.sh.in
+++ b/tools/h5repack/h5repack.sh.in
@@ -54,6 +54,7 @@ FILE13=h5repack_soffset.h5
FILE14=h5repack_layouto.h5 # A file with an older version of the layout message
# (copy of test/tlayouto.h5)
FILE15=h5repack_named_dtypes.h5
+FILE16=tfamily%05d.h5 # located in common testfiles folder
nerrors=0
@@ -140,6 +141,8 @@ TOOLTEST()
rm -f $outfile
}
+# same as TOOLTEST, but it uses the old syntax -i input_file -o output_file
+#
TOOLTEST0()
{
# Run test.
@@ -168,6 +171,38 @@ TOOLTEST0()
rm -f $outfile
}
+
+# same as TOOLTEST, but it uses the common testfiles at $srcdir/../testfiles/
+# used to test the family driver, where these files reside
+#
+TOOLTEST1()
+{
+ # Run test.
+ # Tflops interprets "$@" as "" when no parameter is given (e.g., the
+ # case of missing file name). Changed it to use $@ till Tflops fixes it.
+ TESTING $H5REPACK $@
+
+ infile=$srcdir/../testfiles/$1
+ path=`pwd`
+ outfile=$path/out.$1
+ shift
+ if [ "`uname -s`" = "TFLOPS O/S" ]; then
+ $RUNSERIAL $H5REPACK_BIN $@ $infile $outfile
+ else
+ $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
+ fi
+
+ RET=$?
+ if [ $RET != 0 ] ; then
+ echo "*FAILED*"
+ nerrors="`expr $nerrors + 1`"
+ else
+ echo " PASSED"
+ DIFFTEST $infile $outfile
+ fi
+ rm -f $outfile
+}
+
#
# The tests
# We use the files generated by h5repacktst
@@ -514,6 +549,9 @@ TOOLTEST $FILE1 -f GZIP=1
# Check repacking file with committed datatypes in odd configurations
TOOLTEST $FILE15
+# tests family driver (file is located in common testfiles folder, uses TOOLTEST1
+TOOLTEST1 $FILE16
+
if test $nerrors -eq 0 ; then
echo "All $H5REPACK tests passed."
fi