For memcheck overlap filter_memcpy str[n]cpy and __GI_str[n]cpy are equal.

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

diff --git a/memcheck/tests/filter_memcpy b/memcheck/tests/filter_memcpy
index 47741ba69201f3d97852c54f7c1078d1166f27e7..737304cfadb6f9cc9d96b265afbc4fbfb11b9633 100755 (executable)
--- a/memcheck/tests/filter_memcpy
+++ b/memcheck/tests/filter_memcpy
@@ -1,5 +1,8 @@
 #! /bin/sh
 
 # mc_replace_strmem.c intercepts various memcpy glibc versions.
+# mc_replace_strmem.c str[n]cpy and __GI_str[n]cpy are the same.
 ./filter_stderr "$@" |
-perl -p -e "s/: memcpy\@\@?GLIBC_[.1-9]+ \(mc_replace_strmem.c:...\)/: memcpy \(mc_replace_strmem.c:...\)/"
+perl -p -e "s/: memcpy\@\@?GLIBC_[.1-9]+ \(mc_replace_strmem.c:...\)/: memcpy \(mc_replace_strmem.c:...\)/" |
+sed -e "s/: __GI_strcpy (mc_replace_strmem.c:/: strcpy (mc_replace_strmem.c:/" |
+sed -e "s/: __GI_strncpy (mc_replace_strmem.c:/: strncpy (mc_replace_strmem.c:/"