From: Nicholas Nethercote <njn@valgrind.org>
Date: Tue, 19 May 2009 01:00:59 +0000 (+0000)
Subject: Merge part of r9140 (filter_xml tweak) from the DARWIN branch.
X-Git-Tag: svn/VALGRIND_3_5_0~686
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b7f22a5d750fd20b1fdeb3a44f65e255de4d1b2;p=thirdparty%2Fvalgrind.git

Merge part of r9140 (filter_xml tweak) from the DARWIN branch.



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

diff --git a/memcheck/tests/filter_xml b/memcheck/tests/filter_xml
index 4025ee137b..67d11c2e28 100755
--- a/memcheck/tests/filter_xml
+++ b/memcheck/tests/filter_xml
@@ -8,7 +8,7 @@ sed "s/<obj>.*<\/obj>/<obj>...<\/obj>/" |
 sed "s/<line>.*<\/line>/<line>...<\/line>/" |
 sed "s/<dir>.*<\/dir>/<dir>...<\/dir>/" |
 sed "s/<count>.*<\/count>/<count>...<\/count>/" |
-sed "s/\(m_replacemalloc\/\)\?vg_replace_malloc.c/vg_replace_malloc.c/" |
+perl    -p -e "s/(m_replacemalloc\/)?vg_replace_malloc.c/vg_replace_malloc.c/" |
 perl -0 -p -e "s/<suppcounts>.*<\/suppcounts>/<suppcounts>...<\/suppcounts>/s" |
 perl    -p -e "s/<time>.*<\/time>/<time>...<\/time>/s" |
 perl -0 -p -e "s/<vargv>.*<\/vargv>/<vargv>...<\/vargv>/s" |