Another regtest fix for machines with debug info installed for libc.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9356 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/tests/filter_stderr b/memcheck/tests/filter_stderr
index 728c448..e1a3385 100755
--- a/memcheck/tests/filter_stderr
+++ b/memcheck/tests/filter_stderr
@@ -29,10 +29,6 @@
# appears in some of the syscall parameter names (eg "act->sa_handler").
perl -p -0 -e 's/(Syscall param[^\n<]*)\n( (at|by)[^\n]*\n)*/$1\n ...\n/gs' |
-# Something similar for XML output. Chops everything within
-# <stack>...</stack>.
-perl -p -0 -e 's/(<what>Syscall param[^\n]*)\n([^\n]*(stack|frame|ip|obj|fn)[^\n]*\n)*/$1\n/gs' |
-
# Leak check filtering.
sed "s/checked [0-9,]* bytes./checked ... bytes./" |
diff --git a/memcheck/tests/filter_xml b/memcheck/tests/filter_xml
index 72caf1d..8fb51aa 100755
--- a/memcheck/tests/filter_xml
+++ b/memcheck/tests/filter_xml
@@ -11,7 +11,11 @@
sed "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"
+perl -0 -p -e "s/<vargv>.*<\/vargv>/<vargv>...<\/vargv>/s" |
+
+# Remove stack traces for Syscall param errors (see filter_stderr for more).
+# Chops everything within <stack>...</stack>.
+perl -p -0 -e 's/(<what>Syscall param[^\n]*)\n([^\n]*(stack|frame|ip|obj|fn|dir|line)[^\n]*\n)*/$1\n/gs'
# Collected wisdom re Perl magic incantation:
#