Filter out vector clock information from DRD's regression test output.

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

diff --git a/drd/tests/annotate_trace_memory.stderr.exp b/drd/tests/annotate_trace_memory.stderr.exp
index 78cbe2742b6cd71df25b5196f44da132266876ec..d1528fa91fade1a8409c9e6fb0bc5705cf27a886 100644 (file)
--- a/drd/tests/annotate_trace_memory.stderr.exp
+++ b/drd/tests/annotate_trace_memory.stderr.exp
@@ -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 @@ Conflicting store by thread x/x at 0x........ size 4
    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

diff --git a/drd/tests/filter_stderr b/drd/tests/filter_stderr
index 9410038b72880d292dd11aeaa196d231d3114a9b..79c35cce25693ced05ef9092b1d73147d67dc97a 100755 (executable)
--- a/drd/tests/filter_stderr
+++ b/drd/tests/filter_stderr
@@ -24,6 +24,7 @@ sed \
 -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:?)/" |