[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:

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