Attempt to make this test independent of the Linux distribution it is run on.

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

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

diff --git a/exp-drd/tests/hg03_inherit.stderr.exp b/exp-drd/tests/hg03_inherit.stderr.exp
index 5533a7c4f19d9704f79842421d4cd9391e667828..960bb7dd9ed437d697af04645fb3ae2a7a5858f3 100644 (file)
--- a/exp-drd/tests/hg03_inherit.stderr.exp
+++ b/exp-drd/tests/hg03_inherit.stderr.exp
@@ -3,8 +3,6 @@ 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)
@@ -13,13 +11,10 @@ Other segment start (thread 1/1)
 Other segment end (thread 1/1)
    at 0x........: (within libpthread-?.?.so)
    by 0x........: pthread_join (drd_pthread_intercepts.c:?)
-   by 0x........: main (hg03_inherit.c:63)
 
 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)
@@ -28,6 +23,5 @@ Other segment start (thread 1/1)
 Other segment end (thread 1/1)
    at 0x........: (within libpthread-?.?.so)
    by 0x........: pthread_join (drd_pthread_intercepts.c:?)
-   by 0x........: main (hg03_inherit.c:63)
 
 ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)

diff --git a/exp-drd/tests/hg03_inherit.stderr.exp2 b/exp-drd/tests/hg03_inherit.stderr.exp2
deleted file mode 100644 (file)
index e809a53..0000000
--- a/exp-drd/tests/hg03_inherit.stderr.exp2
+++ /dev/null
@@ -1,33 +0,0 @@
-
-Thread 3:
-Conflicting store by thread 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)
-   at 0x........: pthread_join (drd_pthread_intercepts.c:?)
-   by 0x........: main (hg03_inherit.c:49)
-Other segment end (thread 1)
-   at 0x........: (within ld-?.?.so)
-   by 0x........: pthread_join (drd_pthread_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_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)
-   at 0x........: pthread_join (drd_pthread_intercepts.c:?)
-   by 0x........: main (hg03_inherit.c:49)
-Other segment end (thread 1)
-   at 0x........: (within ld-?.?.so)
-   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
-   by 0x........: main (hg03_inherit.c:63)
-
-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 b3ac0395a74e40d64899172908fb308aad9b799b..a3327ceafc3d53f0f58e3d8096657f1374671561 100644 (file)
--- a/exp-drd/tests/hg03_inherit.vgtest
+++ b/exp-drd/tests/hg03_inherit.vgtest
@@ -1 +1,2 @@
 prog: hg03_inherit
+vgopts: --num-callers=2