|
From: Paul F. <pa...@so...> - 2023-01-27 07:24:28
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=57c1641d042e7554143c11af3b52f2efc924ace4 commit 57c1641d042e7554143c11af3b52f2efc924ace4 Author: Paul Floyd <pj...@wa...> Date: Fri Jan 27 08:22:19 2023 +0100 Linux regtest: some extra filtering for helgrind bug392331 Was failing on rhel 7.6 Diff: --- helgrind/tests/Makefile.am | 4 +++- helgrind/tests/bug392331.stderr.exp | 6 ------ helgrind/tests/bug392331.vgtest | 1 + helgrind/tests/filter_bug392331 | 12 ++++++++++++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am index 0a8bd5744b..65f18f1435 100755 --- a/helgrind/tests/Makefile.am +++ b/helgrind/tests/Makefile.am @@ -6,7 +6,9 @@ dist_noinst_SCRIPTS = filter_stderr \ filter_helgrind \ filter_xml \ filter_freebsd.awk \ - filter_stderr_freebsd + filter_stderr_freebsd \ + filter_bug392331 + EXTRA_DIST = \ annotate_hbefore.vgtest annotate_hbefore.stdout.exp \ diff --git a/helgrind/tests/bug392331.stderr.exp b/helgrind/tests/bug392331.stderr.exp index f278e3b089..b61e64f40d 100644 --- a/helgrind/tests/bug392331.stderr.exp +++ b/helgrind/tests/bug392331.stderr.exp @@ -7,15 +7,12 @@ Thread #x is the program's root thread Thread #x: pthread_cond_{signal,broadcast}: dubious: associated lock is not held by any thread at 0x........: pthread_cond_signal_WRK (hg_intercepts.c:...) by 0x........: pthread_cond_signal (hg_intercepts.c:...) - ... by 0x........: main (bug392331.cpp:47) ---Thread-Announcement------------------------------------------ Thread #x was created - ... by 0x........: pthread_create@* (hg_intercepts.c:...) - ... by 0x........: main (bug392331.cpp:38) ---------------------------------------------------------------- @@ -23,9 +20,6 @@ Thread #x was created Thread #x: pthread_cond_{signal,broadcast}: dubious: associated lock is not held by any thread at 0x........: pthread_cond_signal_WRK (hg_intercepts.c:...) by 0x........: pthread_cond_signal (hg_intercepts.c:...) - ... by 0x........: worker_thread() (bug392331.cpp:33) - ... by 0x........: mythread_wrapper (hg_intercepts.c:...) - ... diff --git a/helgrind/tests/bug392331.vgtest b/helgrind/tests/bug392331.vgtest index c160dcd40e..3889b15f77 100644 --- a/helgrind/tests/bug392331.vgtest +++ b/helgrind/tests/bug392331.vgtest @@ -1,3 +1,4 @@ prereq: test -e bug392331 vgopts: -q prog: bug392331 +stderr_filter: filter_bug392331 diff --git a/helgrind/tests/filter_bug392331 b/helgrind/tests/filter_bug392331 new file mode 100755 index 0000000000..9cbd5d04e2 --- /dev/null +++ b/helgrind/tests/filter_bug392331 @@ -0,0 +1,12 @@ +#! /bin/sh + +# at least on fedora 3{6|7} the first stanza contains +# by 0x........: pthread_cond_signal (hg_intercepts.c:...) +# ... +# but on rhel 7.6 at least there is no ellipsis +# To make life easier, filter all of them not just the first + +./filter_stderr "$@" | + +sed '/^ \.\.\./d' + |