Added an output variant for exp-drd/tests/hg03_inherit.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7593

diff --git a/exp-drd/tests/Makefile.am b/exp-drd/tests/Makefile.am
index 91a96ca94765ed486f632832a88e773532d6e7b3..202e6d799823591e7c48a2f4521966378441a1d7 100644 (file)
--- a/exp-drd/tests/Makefile.am
+++ b/exp-drd/tests/Makefile.am
@@ -30,6 +30,7 @@ EXTRA_DIST =                                        \
        hg02_deadlock.stderr.exp-linuxthreads       \
        hg02_deadlock.vgtest                        \
        hg03_inherit.stderr.exp                     \
+       hg03_inherit.stderr.exp2                    \
        hg03_inherit.stderr.exp-linuxthreads        \
        hg03_inherit.vgtest                         \
        hg04_race.stderr.exp                        \

diff --git a/exp-drd/tests/filter_stderr b/exp-drd/tests/filter_stderr
index a4b8e19cd447a7815496e13b9848698e792b3888..57c869f104351dbbeb9e6bdbd31aa7a0ad44d442 100755 (executable)
--- a/exp-drd/tests/filter_stderr
+++ b/exp-drd/tests/filter_stderr
@@ -18,6 +18,7 @@ sed \
 -e "/^Copyright (C) 2006-200., and GNU GPL'd, by Bart Van Assche.$/d" \
 -e "s/\(pthread_create.c:[0-9]*\)/in libpthread-?.?.so/" \
 -e "s:[A-Za-z_]* (in [^ ]*libpthread-[0-9.]*\.so):(within libpthread-?.?.so):" \
+-e "s:(within /lib/ld-[0-9.]*\.so):(within ld-?.?.so):" \
 -e "s/ (\([a-zA-Z_]*\.c\):[0-9]*)/ (\1:?)/" \
 -e "s/ (\([a-zA-Z_]*\.cpp\):[0-9]*)/ (\1:?)/" |
 

diff --git a/exp-drd/tests/hg03_inherit.stderr.exp2 b/exp-drd/tests/hg03_inherit.stderr.exp2
new file mode 100644 (file)
index 0000000..2d580ea
--- /dev/null
+++ b/exp-drd/tests/hg03_inherit.stderr.exp2
@@ -0,0 +1,33 @@
+
+Thread 3:
+Conflicting store by thread 3 at 0x........ size 4
+   at 0x........: t2 (hg03_inherit.c:28)
+   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: (within libpthread-?.?.so)
+   by 0x........: clone (in /...libc...)
+Location 0x........ is 0 bytes inside shared[1],
+declared at hg03_inherit.c:11, in frame #? of thread 3
+Other segment start (thread 1)
+   at 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: main (hg03_inherit.c:49)
+Other segment end (thread 1)
+   at 0x........: (within ld-?.?.so)
+   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: main (hg03_inherit.c:63)
+
+Conflicting store by thread 3 at 0x........ size 4
+   at 0x........: t2 (hg03_inherit.c:29)
+   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: (within libpthread-?.?.so)
+   by 0x........: clone (in /...libc...)
+Location 0x........ is 0 bytes inside shared[1],
+declared at hg03_inherit.c:11, in frame #? of thread 3
+Other segment start (thread 1)
+   at 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: main (hg03_inherit.c:49)
+Other segment end (thread 1)
+   at 0x........: (within ld-?.?.so)
+   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: main (hg03_inherit.c:63)
+
+ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)