summaryrefslogtreecommitdiffstats
path: root/tools/h5dump
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2010-08-23 22:30:44 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2010-08-23 22:30:44 (GMT)
commit8c184576461bfd8bbcc2189ecda2b87fd40cf597 (patch)
tree1175b58e939d9b493863330d1a806b1f1cdca54e /tools/h5dump
parent0f95a9d5ab47a609f50c7554e46f60b625df07e8 (diff)
downloadhdf5-8c184576461bfd8bbcc2189ecda2b87fd40cf597.zip
hdf5-8c184576461bfd8bbcc2189ecda2b87fd40cf597.tar.gz
hdf5-8c184576461bfd8bbcc2189ecda2b87fd40cf597.tar.bz2
[svn-r19282] Fix test scripts (Cmake needs to capture output yet)
linux script needed -R and double compare: Tested: local linux
Diffstat (limited to 'tools/h5dump')
-rw-r--r--tools/h5dump/CMakeLists.txt1
-rw-r--r--tools/h5dump/testh5dump.sh.in28
2 files changed, 22 insertions, 7 deletions
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt
index 45f8b96..2d64248 100644
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@@ -70,6 +70,7 @@ IF (BUILD_TESTING)
tattr-3.ddl
tattrreg.ddl
tattrregR.ddl
+ tbinregR.ddl
tbigdims.ddl
tboot1.ddl
tboot2.ddl
diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in
index 9c28ed9..50ff098 100644
--- a/tools/h5dump/testh5dump.sh.in
+++ b/tools/h5dump/testh5dump.sh.in
@@ -144,11 +144,14 @@ TOOLTEST1() {
}
-# same as TOOLTEST1 but compares generated file to Expected output
+# same as TOOLTEST1 but compares generated file to expected output
+# and compares the generated data file to the expected data file
# used for the binary tests that expect a full path in -o without -b
TOOLTEST2() {
- expect="$srcdir/../testfiles/`basename $1 .exp`.txt"
+ expectdata="$srcdir/../testfiles/$1"
+ expect="$srcdir/../testfiles/`basename $1 .exp`.ddl"
+ actualdata="../testfiles/`basename $1 .exp`.txt"
actual="../testfiles/`basename $1 .exp`.out"
actual_err="../testfiles/`basename $1 .exp`.err"
shift
@@ -167,17 +170,28 @@ TOOLTEST2() {
echo " CREATED"
cp $actual $expect
elif $CMP $expect $actual; then
- echo " PASSED"
+ if [ ! -f $expectdata ]; then
+ # Create the expect data file if it doesn't yet exist.
+ echo " CREATED"
+ cp $actualdata $expectdata
+ elif $CMP $expectdata $actualdata; then
+ echo " PASSED"
+ else
+ echo "*FAILED*"
+ echo " Expected datafile (*.exp) differs from actual datafile (*.txt)"
+ nerrors="`expr $nerrors + 1`"
+ test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/ /'
+ fi
else
echo "*FAILED*"
- echo " Expected result (*.ddl) differs from actual result (*.txt)"
+ echo " Expected result (*.ddl) differs from actual result (*.out)"
nerrors="`expr $nerrors + 1`"
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
fi
-
+
# Clean up output file
if test -z "$HDF5_NOCLEANUP"; then
- rm -f $actual $actual_err
+ rm -f $actual $actualdata $actual_err
fi
}
@@ -532,7 +546,7 @@ TOOLTEST tdataregR.ddl -R tdatareg.h5
TOOLTEST tattrreg.ddl tattrreg.h5
TOOLTEST tattrregR.ddl -R tattrreg.h5
-TOOLTEST2 tbinregR.exp -d /Dataset1 -s 0 -y -o $TESTDIR/tbinregR.txt tdatareg.h5
+TOOLTEST2 tbinregR.exp -d /Dataset1 -s 0 -R -y -o $TESTDIR/tbinregR.txt tdatareg.h5
# Clean up text output files
if test -z "$HDF5_NOCLEANUP"; then