|
From: <sv...@va...> - 2009-06-06 11:42:06
|
Author: bart
Date: 2009-06-06 12:41:43 +0100 (Sat, 06 Jun 2009)
New Revision: 10264
Log:
Updated vector clock filter.
Modified:
branches/DRDDEV/drd/tests/annotate_trace_memory.stderr.exp
branches/DRDDEV/drd/tests/filter_stderr
Modified: branches/DRDDEV/drd/tests/annotate_trace_memory.stderr.exp
===================================================================
--- branches/DRDDEV/drd/tests/annotate_trace_memory.stderr.exp 2009-06-06 11:27:58 UTC (rev 10263)
+++ branches/DRDDEV/drd/tests/annotate_trace_memory.stderr.exp 2009-06-06 11:41:43 UTC (rev 10264)
@@ -1,17 +1,17 @@
FLAGS [phb=1, fm=0]
test01: positive
-store 0x........ size 4 (vg 2 / drd 2 / vc [ 1: 5, 2: 1 ])
+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:?)
-store 0x........ size 4 (vg 1 / drd 1 / vc [ 1: 7 ])
+store 0x........ size 4 (vg 1 / drd 1 / vc ...)
at 0x........: test01::Parent() (tsan_unittest.cpp:?)
by 0x........: test01::Run() (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:?)
Allocation context: BSS section of tsan_unittest
-load 0x........ size 4 (vg 1 / drd 1 / vc [ 1: 8, 2: 2 ])
+load 0x........ size 4 (vg 1 / drd 1 / vc ...)
at 0x........: test01::Run() (tsan_unittest.cpp:?)
by 0x........: main (tsan_unittest.cpp:?)
GLOB=2
Modified: branches/DRDDEV/drd/tests/filter_stderr
===================================================================
--- branches/DRDDEV/drd/tests/filter_stderr 2009-06-06 11:27:58 UTC (rev 10263)
+++ branches/DRDDEV/drd/tests/filter_stderr 2009-06-06 11:41:43 UTC (rev 10264)
@@ -21,7 +21,7 @@
-e "s:(within /lib[0-9]*/ld-[0-9.]*\.so):(within ld-?.?.so):" \
-e "s/was held during [0-9][0-9]*/was held during .../" \
-e "s: BSS section of .*/: BSS section of :g" \
--e "s: vc \[[ ,0-9]*\]: vc ...:g" \
+-e "s: vc \[[ ,:0-9]*\]: vc ...:g" \
-e "s/ (\([a-zA-Z_]*\.c\):[0-9]*)/ (\1:?)/" \
-e "s/ (\([a-zA-Z_]*\.h\):[0-9]*)/ (\1:?)/" \
-e "s/ (\([a-zA-Z_]*\.cpp\):[0-9]*)/ (\1:?)/" |
|