drd/tests/pth_barrier[23]: Filter output such that only the error count is kept
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11940 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 191316b..e85a671 100644
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -3,6 +3,7 @@
dist_noinst_SCRIPTS = \
compare_error_count_with \
+ filter_error_count \
filter_error_summary \
filter_stderr \
filter_stderr_and_thread_no \
diff --git a/drd/tests/filter_error_count b/drd/tests/filter_error_count
new file mode 100755
index 0000000..89dc2b4
--- /dev/null
+++ b/drd/tests/filter_error_count
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Filter the error output of Valgrind such that only the line with the error
+# summary is kept. Bart Van Assche, February 26, 2008.
+
+sed -n \
+ -e 's/^.*\(ERROR SUMMARY.*\) ([^()]*)$/\1/' \
+ -e 's/^\(ERROR SUMMARY: [0-9]* errors\).*$/\1/' \
+ -e '/ERROR SUMMARY/p'
diff --git a/drd/tests/pth_barrier2.stderr.exp b/drd/tests/pth_barrier2.stderr.exp
index bb25d52..4a04a26 100644
--- a/drd/tests/pth_barrier2.stderr.exp
+++ b/drd/tests/pth_barrier2.stderr.exp
@@ -1 +1 @@
-ERROR SUMMARY: 32 errors from 1 contexts
+ERROR SUMMARY: 32 errors
diff --git a/drd/tests/pth_barrier2.vgtest b/drd/tests/pth_barrier2.vgtest
index 1fe9408..56a897b 100644
--- a/drd/tests/pth_barrier2.vgtest
+++ b/drd/tests/pth_barrier2.vgtest
@@ -1,4 +1,4 @@
prereq: test -e pth_barrier && ./supported_libpthread
prog: pth_barrier
args: 2 32 1
-stderr_filter: filter_error_summary
+stderr_filter: filter_error_count
diff --git a/drd/tests/pth_barrier3.stderr.exp b/drd/tests/pth_barrier3.stderr.exp
index 6c5b8a3..d3c07b9 100644
--- a/drd/tests/pth_barrier3.stderr.exp
+++ b/drd/tests/pth_barrier3.stderr.exp
@@ -1 +1 @@
-ERROR SUMMARY: 31 errors from 1 contexts
+ERROR SUMMARY: 31 errors
diff --git a/drd/tests/pth_barrier3.vgtest b/drd/tests/pth_barrier3.vgtest
index c17edb1..8c24a03 100644
--- a/drd/tests/pth_barrier3.vgtest
+++ b/drd/tests/pth_barrier3.vgtest
@@ -1,4 +1,4 @@
prereq: test -e pth_barrier && ./supported_libpthread
prog: pth_barrier
args: 32 1 1
-stderr_filter: filter_error_summary
+stderr_filter: filter_error_count