Another regtest fix for machines with debug info installed for libc.

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

diff --git a/memcheck/tests/filter_stderr b/memcheck/tests/filter_stderr
index 728c4484e98cec67c8e3e31d9e6ecb6a4175f2f2..e1a3385de32cac5ceea582c05a334a5823024e43 100755 (executable)
--- a/memcheck/tests/filter_stderr
+++ b/memcheck/tests/filter_stderr
@@ -29,10 +29,6 @@ sed "s/The main thread stack size used in this run was [0-9]*/The main thread st
 # 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 72caf1db0912b3c4fb3f3900c8c9d8a473dba587..8fb51aa9528f935bded3c84cf7538194c485e1cb 100755 (executable)
--- a/memcheck/tests/filter_xml
+++ b/memcheck/tests/filter_xml
@@ -11,7 +11,11 @@ sed "s/<count>.*<\/count>/<count>...<\/count>/" |
 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:
 #