Improved filtering so that 'overlap' test less likely to fail.

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

diff --git a/memcheck/tests/filter_stderr b/memcheck/tests/filter_stderr
index df2e946a006bf4d3b519ba230c644e562e52af0f..1c0a29564c0bdd65d55b50aaf4dc7a0b757d2c65 100755 (executable)
--- a/memcheck/tests/filter_stderr
+++ b/memcheck/tests/filter_stderr
@@ -7,8 +7,8 @@ $dir/../../tests/filter_stderr_basic                    |
 # Anonymise addresses
 $dir/../../tests/filter_addresses                       |
 
-# Anonymise line numbers in vg_replace_malloc.c
-sed "s/vg_replace_malloc.c:[0-9]\+/vg_replace_malloc.c:.../"  |
+# Anonymise line numbers in mc_replace_strmem.c
+sed "s/mc_replace_strmem.c:[0-9]\+/mc_replace_strmem.c:.../"  |
 
 $dir/../../tests/filter_test_paths                      |
 

diff --git a/memcheck/tests/overlap.stderr.exp b/memcheck/tests/overlap.stderr.exp
index cb6f817a68c53ee44b8a7ac9667b6fa8d0904599..d0c8c8a730c9e4a2c7b6a781d14175c1407522c4 100644 (file)
--- a/memcheck/tests/overlap.stderr.exp
+++ b/memcheck/tests/overlap.stderr.exp
@@ -1,42 +1,42 @@
 
 Source and destination overlap in memcpy(0x........, 0x........, 21)
-   at 0x........: memcpy (mc_replace_strmem.c:71)
+   at 0x........: memcpy (mc_replace_strmem.c:...)
    by 0x........: main (overlap.c:40)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: (within /.../tests/overlap)
 
 Source and destination overlap in memcpy(0x........, 0x........, 21)
-   at 0x........: memcpy (mc_replace_strmem.c:71)
+   at 0x........: memcpy (mc_replace_strmem.c:...)
    by 0x........: main (overlap.c:42)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: (within /.../tests/overlap)
 
 Source and destination overlap in strncpy(0x........, 0x........, 21)
-   at 0x........: strncpy (mc_replace_strmem.c:71)
+   at 0x........: strncpy (mc_replace_strmem.c:...)
    by 0x........: main (overlap.c:45)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: (within /.../tests/overlap)
 
 Source and destination overlap in strncpy(0x........, 0x........, 21)
-   at 0x........: strncpy (mc_replace_strmem.c:71)
+   at 0x........: strncpy (mc_replace_strmem.c:...)
    by 0x........: main (overlap.c:47)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: (within /.../tests/overlap)
 
 Source and destination overlap in strcpy(0x........, 0x........)
-   at 0x........: strcpy (mc_replace_strmem.c:63)
+   at 0x........: strcpy (mc_replace_strmem.c:...)
    by 0x........: main (overlap.c:54)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: (within /.../tests/overlap)
 
 Source and destination overlap in strncat(0x........, 0x........, 21)
-   at 0x........: strncat (mc_replace_strmem.c:71)
+   at 0x........: strncat (mc_replace_strmem.c:...)
    by 0x........: main (overlap.c:112)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: (within /.../tests/overlap)
 
 Source and destination overlap in strncat(0x........, 0x........, 21)
-   at 0x........: strncat (mc_replace_strmem.c:71)
+   at 0x........: strncat (mc_replace_strmem.c:...)
    by 0x........: main (overlap.c:113)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: (within /.../tests/overlap)

diff --git a/tests/filter_stderr_basic b/tests/filter_stderr_basic
index 2ffd84bdaba80797f6cd70fd1f7ba2605c172e71..bdc11f90b62a07426a68ad591db772669b68b3be 100755 (executable)
--- a/tests/filter_stderr_basic
+++ b/tests/filter_stderr_basic
@@ -14,6 +14,9 @@ sed "/^.*, .* for x86-linux\./ , /./ d"                                |
 sed "/Estimated CPU clock rate is [0-9]\+ MHz/d"                       |
 sed "/For more details, rerun with: -v/d"                              |
 
+# Anonymise line numbers in vg_replace_malloc.c
+sed "s/vg_replace_malloc.c:[0-9]\+/vg_replace_malloc.c:.../"           |
+
 # Reduce some libc incompatibility
 sed "s/ __getsockname / getsockname /"                                 |
 sed "s/ __sigaction / sigaction /"                                     |