|
From: <sv...@va...> - 2008-03-17 17:22:49
|
Author: bart
Date: 2008-03-17 17:22:55 +0000 (Mon, 17 Mar 2008)
New Revision: 7725
Log:
Attempt to make this test independent of the Linux distribution it is run on.
Removed:
trunk/exp-drd/tests/hg03_inherit.stderr.exp2
Modified:
trunk/exp-drd/tests/Makefile.am
trunk/exp-drd/tests/hg03_inherit.stderr.exp
trunk/exp-drd/tests/hg03_inherit.vgtest
Modified: trunk/exp-drd/tests/Makefile.am
===================================================================
--- trunk/exp-drd/tests/Makefile.am 2008-03-17 16:38:51 UTC (rev 7724)
+++ trunk/exp-drd/tests/Makefile.am 2008-03-17 17:22:55 UTC (rev 7725)
@@ -30,7 +30,6 @@
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 \
Modified: trunk/exp-drd/tests/hg03_inherit.stderr.exp
===================================================================
--- trunk/exp-drd/tests/hg03_inherit.stderr.exp 2008-03-17 16:38:51 UTC (rev 7724)
+++ trunk/exp-drd/tests/hg03_inherit.stderr.exp 2008-03-17 17:22:55 UTC (rev 7725)
@@ -3,8 +3,6 @@
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 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 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)
Deleted: trunk/exp-drd/tests/hg03_inherit.stderr.exp2
===================================================================
--- trunk/exp-drd/tests/hg03_inherit.stderr.exp2 2008-03-17 16:38:51 UTC (rev 7724)
+++ trunk/exp-drd/tests/hg03_inherit.stderr.exp2 2008-03-17 17:22:55 UTC (rev 7725)
@@ -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)
Modified: trunk/exp-drd/tests/hg03_inherit.vgtest
===================================================================
--- trunk/exp-drd/tests/hg03_inherit.vgtest 2008-03-17 16:38:51 UTC (rev 7724)
+++ trunk/exp-drd/tests/hg03_inherit.vgtest 2008-03-17 17:22:55 UTC (rev 7725)
@@ -1 +1,2 @@
prog: hg03_inherit
+vgopts: --num-callers=2
|