|
From: <sv...@va...> - 2009-06-01 10:48:59
|
Author: bart
Date: 2009-06-01 11:48:53 +0100 (Mon, 01 Jun 2009)
New Revision: 10189
Log:
Filter out vector clock information from DRD's regression test output.
Modified:
trunk/drd/tests/annotate_trace_memory.stderr.exp
trunk/drd/tests/filter_stderr
Modified: trunk/drd/tests/annotate_trace_memory.stderr.exp
===================================================================
--- trunk/drd/tests/annotate_trace_memory.stderr.exp 2009-05-31 19:59:29 UTC (rev 10188)
+++ trunk/drd/tests/annotate_trace_memory.stderr.exp 2009-06-01 10:48:53 UTC (rev 10189)
@@ -1,13 +1,13 @@
FLAGS [phb=1, fm=0]
test01: positive
-store 0x........ size 4 (vg 2 / drd 2 / vc [ 5, 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:?)
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 [ 7 ])
+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:?)
@@ -16,7 +16,7 @@
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 [ 9, 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: trunk/drd/tests/filter_stderr
===================================================================
--- trunk/drd/tests/filter_stderr 2009-05-31 19:59:29 UTC (rev 10188)
+++ trunk/drd/tests/filter_stderr 2009-06-01 10:48:53 UTC (rev 10189)
@@ -24,6 +24,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: $dir/: :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:?)/" |
|