summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2007-12-06 19:21:46 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2007-12-06 19:21:46 (GMT)
commit110a7d4869b546f5b73ba726f749870e7cd04674 (patch)
tree8b7860821351ef2dc076e9a756d5f7b67b6443c2
parentc15315539b27acfc4a15a84bff7a8f3d7a5daccb (diff)
downloadhdf5-110a7d4869b546f5b73ba726f749870e7cd04674.zip
hdf5-110a7d4869b546f5b73ba726f749870e7cd04674.tar.gz
hdf5-110a7d4869b546f5b73ba726f749870e7cd04674.tar.bz2
[svn-r14325] Eliminate unwanted output and remove superfluous sed script. Tested on kagiso, linew, and smirom.
-rwxr-xr-xtools/h5ls/testh5ls.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/h5ls/testh5ls.sh b/tools/h5ls/testh5ls.sh
index b914fcd..cef5730 100755
--- a/tools/h5ls/testh5ls.sh
+++ b/tools/h5ls/testh5ls.sh
@@ -49,6 +49,7 @@ TESTING() {
TOOLTEST() {
expect="$srcdir/../testfiles/$1"
actual="../testfiles/`basename $1 .ls`.out"
+ actual_err="../testfiles/`basename $1 .ls`.err"
shift
retvalexpect=$1
shift
@@ -63,10 +64,10 @@ TOOLTEST() {
echo "#############################"
cd $srcdir/../testfiles
$RUNSERIAL $H5LS_BIN "$@"
- ) >$actual 2>&1
+ ) >$actual 2>$actual_err
exitcode=$?
- sed 's/Modified:.*/Modified: XXXX-XX-XX XX:XX:XX XXX/' $actual
+ cat $actual_err >> $actual
if [ $exitcode -ne $retvalexpect ]; then
echo "*FAILED*"
nerrors="`expr $nerrors + 1`"
@@ -92,7 +93,7 @@ TOOLTEST() {
# Clean up output file
if test -z "$HDF5_NOCLEANUP"; then
- rm -f $actual
+ rm -f $actual $actual_err
fi
}