|
From: <sv...@va...> - 2011-12-11 10:23:08
|
Author: bart
Date: 2011-12-11 10:18:27 +0000 (Sun, 11 Dec 2011)
New Revision: 12286
Log:
Follow-up for r12281: update regtest expected output
Modified:
trunk/drd/tests/annotate_smart_pointer2.stderr.exp
trunk/drd/tests/annotate_trace_memory.stderr.exp
trunk/drd/tests/annotate_trace_memory_xml.stderr.exp
Modified: trunk/drd/tests/annotate_smart_pointer2.stderr.exp
===================================================================
--- trunk/drd/tests/annotate_smart_pointer2.stderr.exp 2011-12-10 19:48:04 UTC (rev 12285)
+++ trunk/drd/tests/annotate_smart_pointer2.stderr.exp 2011-12-11 10:18:27 UTC (rev 12286)
@@ -1,6 +1,9 @@
Conflicting store by thread x at 0x........ size 4
- at 0x........: main (annotate_smart_pointer.cpp:?)
+ at 0x........: counter::~counter() (annotate_smart_pointer.cpp:?)
+ by 0x........: smart_ptr<counter>::set(counter*, AtomicInt32*) (annotate_smart_pointer.cpp:?)
+ by 0x........: smart_ptr<counter>::operator=(counter*) (annotate_smart_pointer.cpp:?)
+ by 0x........: main (annotate_smart_pointer.cpp:?)
Address 0x........ is at offset ... from 0x......... Allocation context:
at 0x........: ...operator new... (vg_replace_malloc.c:...)
by 0x........: main (annotate_smart_pointer.cpp:?)
Modified: trunk/drd/tests/annotate_trace_memory.stderr.exp
===================================================================
--- trunk/drd/tests/annotate_trace_memory.stderr.exp 2011-12-10 19:48:04 UTC (rev 12285)
+++ trunk/drd/tests/annotate_trace_memory.stderr.exp 2011-12-11 10:18:27 UTC (rev 12286)
@@ -14,7 +14,7 @@
load 0x........ size 4 (thread x / vc ...)
at 0x........: test01::Run() (tsan_unittest.cpp:?)
- by 0x........: main (tsan_unittest.cpp:?)
+ by 0x........: Test::Run() (tsan_unittest.cpp:?)
GLOB=2
ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
Modified: trunk/drd/tests/annotate_trace_memory_xml.stderr.exp
===================================================================
--- trunk/drd/tests/annotate_trace_memory_xml.stderr.exp 2011-12-10 19:48:04 UTC (rev 12285)
+++ trunk/drd/tests/annotate_trace_memory_xml.stderr.exp 2011-12-11 10:18:27 UTC (rev 12286)
@@ -110,7 +110,7 @@
<frame>
<ip>0x........</ip>
<obj>...</obj>
- <fn>main</fn>
+ <fn>Test::Run()</fn>
<dir>...</dir>
<file>tsan_unittest.cpp</file>
<line>...</line>
|