From 174c18de1daab578a7884005dc84d62c126c0f5d Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 29 Jul 2011 07:22:29 +0000 Subject: [PATCH] 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 --- drd/tests/Makefile.am | 1 + drd/tests/filter_error_count | 9 +++++++++ drd/tests/pth_barrier2.stderr.exp | 2 +- drd/tests/pth_barrier2.vgtest | 2 +- drd/tests/pth_barrier3.stderr.exp | 2 +- drd/tests/pth_barrier3.vgtest | 2 +- 6 files changed, 14 insertions(+), 4 deletions(-) create mode 100755 drd/tests/filter_error_count diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am index 191316bb8a..e85a67167c 100644 --- a/drd/tests/Makefile.am +++ b/drd/tests/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/Makefile.tool-tests.am 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 0000000000..89dc2b40c7 --- /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 bb25d5288a..4a04a26189 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 1fe94089a6..56a897b839 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 6c5b8a3576..d3c07b9c25 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 c17edb19a0..8c24a03c62 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 -- 2.47.2