[Valgrind-developers] valgrind: r9356 - trunk/memcheck/tests

[<sv...@va...>]

Author: njn
Date: 2009-03-11 06:12:59 +0000 (Wed, 11 Mar 2009)
New Revision: 9356

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



Modified:
   trunk/memcheck/tests/filter_stderr
   trunk/memcheck/tests/filter_xml


Modified: trunk/memcheck/tests/filter_stderr
===================================================================
--- trunk/memcheck/tests/filter_stderr	2009-03-11 02:34:57 UTC (rev 9355)
+++ trunk/memcheck/tests/filter_stderr	2009-03-11 06:12:59 UTC (rev 9356)
@@ -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./" |
 

Modified: trunk/memcheck/tests/filter_xml
===================================================================
--- trunk/memcheck/tests/filter_xml	2009-03-11 02:34:57 UTC (rev 9355)
+++ trunk/memcheck/tests/filter_xml	2009-03-11 06:12:59 UTC (rev 9356)
@@ -11,8 +11,12 @@
 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:
 #
 # From: Tom Hughes