summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2003-09-29 20:35:00 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2003-09-29 20:35:00 (GMT)
commit72aed6fded430a43cef3d6e5baf9a95cc4c7148c (patch)
tree24cec85be73c5ffdda64072bebebb63615e3d583 /test
parent9db7c79487c31ffb363131a6a194a17a24276ecc (diff)
downloadhdf5-72aed6fded430a43cef3d6e5baf9a95cc4c7148c.zip
hdf5-72aed6fded430a43cef3d6e5baf9a95cc4c7148c.tar.gz
hdf5-72aed6fded430a43cef3d6e5baf9a95cc4c7148c.tar.bz2
[svn-r7523] Purpose: bug fix
Description: Standard output of Error API test has some non-standard information Solution: use sed to remove non-standard information Platforms tested: h5committest
Diffstat (limited to 'test')
-rw-r--r--test/testerror.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/testerror.sh b/test/testerror.sh
index 18ca593..3e73362 100644
--- a/test/testerror.sh
+++ b/test/testerror.sh
@@ -51,6 +51,7 @@ TEST() {
expect2="$srcdir/testfiles/$1_2"
actual="./testfiles/`basename $1`.out"
actual_err="./testfiles/`basename $1`.err"
+ actual_ext="./testfiles/`basename $1`.ext"
shift
# Run test.
@@ -62,7 +63,9 @@ TEST() {
cd $srcdir/testfiles
$RUNSERIAL $TEST_ERR_BIN
) >$actual 2>$actual_err
- cat $actual_err >> $actual
+ # Extract file name, line number, version and thread IDs because they may be different
+ sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' -e 's/line [0-9]*/line (number)/' -e 's/[1-9].[0-9].[0-9]/version (number)/' $actual_err > $actual_ext
+ cat $actual_ext >> $actual
if $CMP $expect1 $actual; then
echo " PASSED"
@@ -77,7 +80,7 @@ TEST() {
# Clean up output file
if test -z "$HDF5_NOCLEANUP"; then
- rm -f $actual $actual_err
+ rm -f $actual $actual_err $actual_ext
fi
}