summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtools/testh5dump.sh8
-rwxr-xr-xtools/testh5ls.sh4
2 files changed, 8 insertions, 4 deletions
diff --git a/tools/testh5dump.sh b/tools/testh5dump.sh
index f38209e..03acf2a 100755
--- a/tools/testh5dump.sh
+++ b/tools/testh5dump.sh
@@ -13,7 +13,7 @@ verbose=yes
if test "X$srcdir" = X; then
srcdir=.
fi
-mkdir testfiles >/dev/null 2>&1
+test -d testfiles || mkdir testfiles
# Print a line-line message left justified in a field of 70 characters
# beginning with the word "Testing".
@@ -38,14 +38,16 @@ TOOLTEST()
full=`pwd`/$h5tool
# Run test.
+ # Stderr is included in stdout so that the diff can detect
+ # any unexpected output from that stream too.
TESTING $h5tool $@
(
echo "#############################"
echo "Expected output for '$h5tool $@'"
echo "#############################"
cd $srcdir/testfiles
- $RUNSERIAL $h5tool_bin "$@" 2>/dev/null
- ) >$actual
+ $RUNSERIAL $h5tool_bin "$@"
+ ) >$actual 2>& 1
if $CMP $expect $actual; then
echo " PASSED"
diff --git a/tools/testh5ls.sh b/tools/testh5ls.sh
index 7681b47..9f659fc 100755
--- a/tools/testh5ls.sh
+++ b/tools/testh5ls.sh
@@ -14,7 +14,7 @@ verbose=yes
if test "X$srcdir" = X; then
srcdir=.
fi
-mkdir testfiles >/dev/null 2>&1
+test -d testfiles || mkdir testfiles
# Print a line-line message left justified in a field of 70 characters
# beginning with the word "Testing".
@@ -39,6 +39,8 @@ TOOLTEST()
shift
# Run test.
+ # Stderr is included in stdout so that the diff can detect
+ # any unexpected output from that stream too.
TESTING $h5tool $@
(
echo "#############################"