From: Tom Hughes <tom@compton.nu>
Date: Thu, 4 Oct 2012 20:41:12 +0000 (+0000)
Subject: Filter out memcpy symbol versions from test results.
X-Git-Tag: svn/VALGRIND_3_9_0~648
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c560f18eb72bba75763c2762320d2f6052cf1dc3;p=thirdparty%2Fvalgrind.git

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 cd7acfba83..68cf9c9b29 100644
--- 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
index 0000000000..47741ba692
--- /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 54a0baacfb..eecc476686 100644
--- a/memcheck/tests/overlap.vgtest
+++ b/memcheck/tests/overlap.vgtest
@@ -1,2 +1,3 @@
 prog: overlap
 vgopts: -q
+stderr_filter: filter_memcpy