summaryrefslogtreecommitdiffstats
path: root/tools/test/h5diff/testh5diff.sh.in
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2019-02-28 20:29:04 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2019-02-28 20:29:04 (GMT)
commit7f797174c7a013359e94d1aa5d6540a5629aa550 (patch)
tree0320bfdb5418ab23978afbb1777539270f04c1f2 /tools/test/h5diff/testh5diff.sh.in
parent5eef94f83f4875b64ffe7f9cea05d965bddbd802 (diff)
parent7eb65dbad45f473a953db595147b88d03f671658 (diff)
downloadhdf5-7f797174c7a013359e94d1aa5d6540a5629aa550.zip
hdf5-7f797174c7a013359e94d1aa5d6540a5629aa550.tar.gz
hdf5-7f797174c7a013359e94d1aa5d6540a5629aa550.tar.bz2
Merge branch 'hdf5_1_10_5' into 1.10/master
Diffstat (limited to 'tools/test/h5diff/testh5diff.sh.in')
-rw-r--r--tools/test/h5diff/testh5diff.sh.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/test/h5diff/testh5diff.sh.in b/tools/test/h5diff/testh5diff.sh.in
index c464f94..557d2ff 100644
--- a/tools/test/h5diff/testh5diff.sh.in
+++ b/tools/test/h5diff/testh5diff.sh.in
@@ -226,6 +226,7 @@ $SRC_H5DIFF_TESTFILES/h5diff_451.txt
$SRC_H5DIFF_TESTFILES/h5diff_452.txt
$SRC_H5DIFF_TESTFILES/h5diff_453.txt
$SRC_H5DIFF_TESTFILES/h5diff_454.txt
+$SRC_H5DIFF_TESTFILES/dangling_link.err
$SRC_H5DIFF_TESTFILES/h5diff_455.txt
$SRC_H5DIFF_TESTFILES/h5diff_456.txt
$SRC_H5DIFF_TESTFILES/h5diff_457.txt
@@ -286,6 +287,7 @@ $SRC_H5DIFF_TESTFILES/h5diff_62.txt
$SRC_H5DIFF_TESTFILES/h5diff_63.txt
$SRC_H5DIFF_TESTFILES/h5diff_600.txt
$SRC_H5DIFF_TESTFILES/h5diff_601.txt
+$SRC_H5DIFF_TESTFILES/h5diff_601_ERR.err
$SRC_H5DIFF_TESTFILES/h5diff_603.txt
$SRC_H5DIFF_TESTFILES/h5diff_604.txt
$SRC_H5DIFF_TESTFILES/h5diff_605.txt
@@ -462,8 +464,9 @@ TESTING() {
#
TOOLTEST() {
expect="$TESTDIR/$1"
+ expect_err="$TESTDIR/`basename $1 .txt`.err"
actual="$TESTDIR/`basename $1 .txt`.out"
- actual_err="$TESTDIR/`basename $1 .txt`.err"
+ actual_err="$TESTDIR/`basename $1 .txt`.out.err"
actual_sav=${actual}-sav
actual_err_sav=${actual_err}-sav
shift
@@ -488,7 +491,6 @@ TOOLTEST() {
STDOUT_FILTER $actual
cp $actual_err $actual_err_sav
STDERR_FILTER $actual_err
- cat $actual_err >> $actual
# don't add exit code check in pmode, as it causes failure. (exit code
# is from mpirun not tool)
# if any problem occurs relate to an exit code, it will be caught in