summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Arber <larber@ncsa.uiuc.edu>2005-07-13 17:42:21 (GMT)
committerLeon Arber <larber@ncsa.uiuc.edu>2005-07-13 17:42:21 (GMT)
commit48e977e9c8f556fbc5fc20f0aa4dafcc1511c59c (patch)
treedb4441fdb58e229953354b697aa30d51a21746d8
parenteffd73de4108ca45d1ce7c74b01a1d12b7f9a336 (diff)
downloadhdf5-48e977e9c8f556fbc5fc20f0aa4dafcc1511c59c.zip
hdf5-48e977e9c8f556fbc5fc20f0aa4dafcc1511c59c.tar.gz
hdf5-48e977e9c8f556fbc5fc20f0aa4dafcc1511c59c.tar.bz2
[svn-r11069] Purpose:
Bug fix Description: The testh5diff.sh script fails on mcr because of random srun messages thrown into the output Solution: Added some code to filter out the srun messages before the output is compared. Platforms tested: LLNL mcr Misc. update:
-rwxr-xr-xtools/h5diff/testh5diff.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh
index 3ff3853..68be352 100755
--- a/tools/h5diff/testh5diff.sh
+++ b/tools/h5diff/testh5diff.sh
@@ -92,9 +92,10 @@ STDERR_FILTER() {
< $tmp_file > $result_file
fi
# Filter LANL MPI messages
+ # and LLNL srun messages
if test -n "$pmode"; then
cp $result_file $tmp_file
- sed -e '/^LA-MPI:/d' \
+ sed -e '/^LA-MPI:/d' -e '/^srun:/d' \
< $tmp_file > $result_file
fi
rm -f $tmp_file