Linux regtest: some extra filtering for helgrind bug392331

Was failing on rhel 7.6

diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am
index 0a8bd5744bfe564323dab9484766599d16f60581..65f18f1435aabc3e5d66eebe4461ebc47940a87c 100755 (executable)
--- 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 f278e3b0896c7f273ba2ae8fe022202dcea336f7..b61e64f40df77e0fcc5c7c1d44ad1c87db978673 100644 (file)
--- 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 c160dcd40e33d79992e570efd3c5523a0bd4626a..3889b15f77c45f7f92f11b102a786d5f62aa95ae 100644 (file)
--- 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 (executable)
index 0000000..9cbd5d0
--- /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'
+