The results of the hg03_inherit are now independent of the Linux platform it is run on.

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

diff --git a/exp-drd/tests/hg03_inherit.stderr.exp b/exp-drd/tests/hg03_inherit.stderr.exp
index 960bb7dd9ed437d697af04645fb3ae2a7a5858f3..79f0241150ea9fc73719612aa7c13e8d6f5efa85 100644 (file)
--- a/exp-drd/tests/hg03_inherit.stderr.exp
+++ b/exp-drd/tests/hg03_inherit.stderr.exp
@@ -3,25 +3,17 @@ Thread 3:
 Conflicting store by thread 3/3 at 0x........ size 4
    at 0x........: t2 (hg03_inherit.c:28)
    by 0x........: vg_thread_wrapper (drd_pthread_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/1)
-   at 0x........: pthread_join (drd_pthread_intercepts.c:?)
-   by 0x........: main (hg03_inherit.c:49)
-Other segment end (thread 1/1)
-   at 0x........: (within libpthread-?.?.so)
-   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
 
 Conflicting store by thread 3/3 at 0x........ size 4
    at 0x........: t2 (hg03_inherit.c:29)
    by 0x........: vg_thread_wrapper (drd_pthread_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/1)
-   at 0x........: pthread_join (drd_pthread_intercepts.c:?)
-   by 0x........: main (hg03_inherit.c:49)
-Other segment end (thread 1/1)
-   at 0x........: (within libpthread-?.?.so)
-   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
 
 ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)

diff --git a/exp-drd/tests/hg03_inherit.vgtest b/exp-drd/tests/hg03_inherit.vgtest
index a3327ceafc3d53f0f58e3d8096657f1374671561..947e955f9cd19d6a35ecb7a8804a34b5d57e7750 100644 (file)
--- a/exp-drd/tests/hg03_inherit.vgtest
+++ b/exp-drd/tests/hg03_inherit.vgtest
@@ -1,2 +1,2 @@
 prog: hg03_inherit
-vgopts: --num-callers=2
+vgopts: --show-confl-seg=no