Filter out absolute paths.

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

diff --git a/drd/tests/annotate_trace_memory.stderr.exp b/drd/tests/annotate_trace_memory.stderr.exp
index b91513245f18e2101fdc27b74b549849f7ce7260..78cbe2742b6cd71df25b5196f44da132266876ec 100644 (file)
--- a/drd/tests/annotate_trace_memory.stderr.exp
+++ b/drd/tests/annotate_trace_memory.stderr.exp
@@ -15,7 +15,7 @@ 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 /home/bart/software/valgrind/drd/tests/tsan_unittest
+Allocation context: BSS section of tsan_unittest
 load  0x........ size 4 (vg 1 / drd 1 / vc [ 9, 2 ])
    at 0x........: test01::Run() (tsan_unittest.cpp:?)
    by 0x........: main (tsan_unittest.cpp:?)

diff --git a/drd/tests/filter_stderr b/drd/tests/filter_stderr
index b3e7058a8c1e66bf2929380386b89074a449b920..9410038b72880d292dd11aeaa196d231d3114a9b 100755 (executable)
--- a/drd/tests/filter_stderr
+++ b/drd/tests/filter_stderr
@@ -1,6 +1,9 @@
 #! /bin/sh
 
 dir=`dirname $0`
+if [ "$dir" = "." ]; then
+  dir="$PWD"
+fi
 
 $dir/../../tests/filter_stderr_basic |
 
@@ -20,6 +23,7 @@ sed \
 -e "s/[A-Za-z_]* (in [^ ]*libpthread-[0-9.]*\.so)/(within libpthread-?.?.so)/" \
 -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/ (\([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:?)/" |