|
From: <sv...@va...> - 2009-06-03 09:47:28
|
Author: bart
Date: 2009-06-03 10:47:16 +0100 (Wed, 03 Jun 2009)
New Revision: 10225
Log:
Unified two expected output files.
Removed:
trunk/drd/tests/annotate_trace_memory.stderr.exp-ppc
Modified:
trunk/drd/tests/Makefile.am
trunk/drd/tests/annotate_trace_memory.stderr.exp
trunk/drd/tests/annotate_trace_memory.vgtest
Modified: trunk/drd/tests/Makefile.am
===================================================================
--- trunk/drd/tests/Makefile.am 2009-06-03 09:30:19 UTC (rev 10224)
+++ trunk/drd/tests/Makefile.am 2009-06-03 09:47:16 UTC (rev 10225)
@@ -27,7 +27,6 @@
annotate_ignore_read.stderr.exp \
annotate_ignore_read.vgtest \
annotate_trace_memory.stderr.exp \
- annotate_trace_memory.stderr.exp-ppc \
annotate_trace_memory.vgtest \
atomic_var.stderr.exp \
atomic_var.vgtest \
Modified: trunk/drd/tests/annotate_trace_memory.stderr.exp
===================================================================
--- trunk/drd/tests/annotate_trace_memory.stderr.exp 2009-06-03 09:30:19 UTC (rev 10224)
+++ trunk/drd/tests/annotate_trace_memory.stderr.exp 2009-06-03 09:47:16 UTC (rev 10225)
@@ -4,17 +4,12 @@
store 0x........ size 4 (vg 2 / drd 2 / vc ...)
at 0x........: test01::Worker() (tsan_unittest.cpp:?)
by 0x........: MyThread::ThreadBody(MyThread*) (tsan_thread_wrappers_pthread.h:?)
- by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
- by 0x........: (within libpthread-?.?.so)
- by 0x........: clone (in /...libc...)
store 0x........ size 4 (vg 1 / drd 1 / vc ...)
at 0x........: test01::Parent() (tsan_unittest.cpp:?)
by 0x........: test01::Run() (tsan_unittest.cpp:?)
- by 0x........: main (tsan_unittest.cpp:?)
Conflicting store by thread x/x at 0x........ size 4
at 0x........: test01::Parent() (tsan_unittest.cpp:?)
by 0x........: test01::Run() (tsan_unittest.cpp:?)
- by 0x........: main (tsan_unittest.cpp:?)
Allocation context: BSS section of tsan_unittest
load 0x........ size 4 (vg 1 / drd 1 / vc ...)
at 0x........: test01::Run() (tsan_unittest.cpp:?)
Deleted: trunk/drd/tests/annotate_trace_memory.stderr.exp-ppc
===================================================================
--- trunk/drd/tests/annotate_trace_memory.stderr.exp-ppc 2009-06-03 09:30:19 UTC (rev 10224)
+++ trunk/drd/tests/annotate_trace_memory.stderr.exp-ppc 2009-06-03 09:47:16 UTC (rev 10225)
@@ -1,23 +0,0 @@
-
-FLAGS [phb=1, fm=0]
-test01: positive
-store 0x........ size 4 (vg 2 / drd 2 / vc ...)
- at 0x........: test01::Worker() (tsan_unittest.cpp:?)
- by 0x........: MyThread::ThreadBody(MyThread*) (tsan_thread_wrappers_pthread.h:?)
- by 0x........: (within libpthread-?.?.so)
- by 0x........: clone (in /...libc...)
-store 0x........ size 4 (vg 1 / drd 1 / vc ...)
- at 0x........: test01::Parent() (tsan_unittest.cpp:?)
- by 0x........: test01::Run() (tsan_unittest.cpp:?)
- by 0x........: main (tsan_unittest.cpp:?)
-Conflicting store by thread x/x at 0x........ size 4
- at 0x........: test01::Parent() (tsan_unittest.cpp:?)
- by 0x........: test01::Run() (tsan_unittest.cpp:?)
- by 0x........: main (tsan_unittest.cpp:?)
-Allocation context: BSS section of tsan_unittest
-load 0x........ size 4 (vg 1 / drd 1 / vc ...)
- at 0x........: test01::Run() (tsan_unittest.cpp:?)
- by 0x........: main (tsan_unittest.cpp:?)
- GLOB=2
-
-ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
Modified: trunk/drd/tests/annotate_trace_memory.vgtest
===================================================================
--- trunk/drd/tests/annotate_trace_memory.vgtest 2009-06-03 09:30:19 UTC (rev 10224)
+++ trunk/drd/tests/annotate_trace_memory.vgtest 2009-06-03 09:47:16 UTC (rev 10225)
@@ -1,5 +1,5 @@
prereq: test -e tsan_unittest && ./supported_libpthread
-vgopts: --var-info=yes --check-stack-var=yes --show-confl-seg=no
+vgopts: --var-info=yes --check-stack-var=yes --show-confl-seg=no --num-callers=2
prog: tsan_unittest
args: 1
stderr_filter: filter_stderr_and_thread_no
|