Unified two expected output files.

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

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 01a6f74a530f3ea44dbe79da0c57002a7e0b461d..8cb44946508927e4f543511a8b719f02e08976a3 100644 (file)
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -27,7 +27,6 @@ EXTRA_DIST =                                        \
        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                           \

diff --git a/drd/tests/annotate_trace_memory.stderr.exp b/drd/tests/annotate_trace_memory.stderr.exp
index d1528fa91fade1a8409c9e6fb0bc5705cf27a886..97b1007cc0ba68207b45675ec772d1b3a92b245b 100644 (file)
--- a/drd/tests/annotate_trace_memory.stderr.exp
+++ b/drd/tests/annotate_trace_memory.stderr.exp
@@ -4,17 +4,12 @@ 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........: 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:?)

diff --git a/drd/tests/annotate_trace_memory.stderr.exp-ppc b/drd/tests/annotate_trace_memory.stderr.exp-ppc
deleted file mode 100644 (file)
index 1ebf012..0000000
--- a/drd/tests/annotate_trace_memory.stderr.exp-ppc
+++ /dev/null
@@ -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)

diff --git a/drd/tests/annotate_trace_memory.vgtest b/drd/tests/annotate_trace_memory.vgtest
index 337d5a8385572c524e124a9db5a963b8041e9181..fc674fc797365832e73eff273d739be38206af73 100644 (file)
--- a/drd/tests/annotate_trace_memory.vgtest
+++ b/drd/tests/annotate_trace_memory.vgtest
@@ -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