Filter out memcpy symbol versions from test results.

Patch from Mark Wielaard to fix BZ#307290.

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

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index cd7acfba830a13709206e456d6cfe98cb387e298..68cf9c9b2957f3fbd7b527610b5abcbb0250067b 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -44,7 +44,8 @@ dist_noinst_SCRIPTS = \
        filter_leak_cases_possible \
        filter_stderr filter_xml \
        filter_varinfo3 \
-       filter_memcheck
+       filter_memcheck \
+       filter_memcpy
 
 noinst_HEADERS = leak.h
 

diff --git a/memcheck/tests/filter_memcpy b/memcheck/tests/filter_memcpy
new file mode 100755 (executable)
index 0000000..47741ba
--- /dev/null
+++ b/memcheck/tests/filter_memcpy
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+# mc_replace_strmem.c intercepts various memcpy glibc versions.
+./filter_stderr "$@" |
+perl -p -e "s/: memcpy\@\@?GLIBC_[.1-9]+ \(mc_replace_strmem.c:...\)/: memcpy \(mc_replace_strmem.c:...\)/"

diff --git a/memcheck/tests/overlap.vgtest b/memcheck/tests/overlap.vgtest
index 54a0baacfb7b336b2ff39506436dc1b6abdf1c31..eecc476686d84b00409462f30704fd746418fd81 100644 (file)
--- a/memcheck/tests/overlap.vgtest
+++ b/memcheck/tests/overlap.vgtest
@@ -1,2 +1,3 @@
 prog: overlap
 vgopts: -q
+stderr_filter: filter_memcpy