Added a stderr filter for new_override, that removes the exact numbers for

malloc, because different glibc versions seem to allocate different amounts of
memory.

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

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index ccad89a24ecfa578b3b4c367b6ced216a726b3d0..b29427d61aa4b7a90fda639601bf4ecd023527bb 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -9,7 +9,7 @@
 ##     strict EIP updating
 ##---------------------------------------------------------------------------
 
-noinst_SCRIPTS = filter_leak_check_size filter_stderr
+noinst_SCRIPTS = filter_allocs filter_leak_check_size filter_stderr
 
 EXTRA_DIST = \
        $(noinst_SCRIPTS) \

diff --git a/memcheck/tests/filter_allocs b/memcheck/tests/filter_allocs
new file mode 100755 (executable)
index 0000000..84bdae5
--- /dev/null
+++ b/memcheck/tests/filter_allocs
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+./filter_stderr | \
+sed "s/malloc\/free: in use at exit: [0-9]\+ bytes in [0-9]\+ blocks./malloc\/free: in use at exit: ... bytes in ... blocks./" | \
+sed "s/malloc.free: [0-9]\+ allocs, [0-9]\+ frees, [0-9]\+ bytes allocated./malloc\/free: ... allocs, ... frees, ... bytes allocated./"
+

diff --git a/memcheck/tests/new_override.stderr.exp b/memcheck/tests/new_override.stderr.exp
index 2196abe4e96a0c367b6a70fb3f4d1d469b9803a6..e512db706cdc4df214e469d147473c6dde4f5937 100644 (file)
--- a/memcheck/tests/new_override.stderr.exp
+++ b/memcheck/tests/new_override.stderr.exp
@@ -5,7 +5,7 @@ Conditional jump or move depends on uninitialised value(s)
    by 0x........: (within /.../tests/new_override)
 
 ERROR SUMMARY: 2 errors from 1 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 32 bytes in 1 blocks.
-malloc/free: 1 allocs, 0 frees, 32 bytes allocated.
+malloc/free: in use at exit: ... bytes in ... blocks.
+malloc/free: ... allocs, ... frees, ... bytes allocated.
 For a detailed leak analysis,  rerun with: --leak-check=yes
 For counts of detected errors, rerun with: -v

diff --git a/memcheck/tests/new_override.vgtest b/memcheck/tests/new_override.vgtest
index 4f11a5b1ce5cf74f1b5834c04b1c451c04baab61..50e62403428c4e5c7854da28c71f0944f931abca 100644 (file)
--- a/memcheck/tests/new_override.vgtest
+++ b/memcheck/tests/new_override.vgtest
@@ -1 +1,2 @@
 prog: new_override
+stderr_filter: filter_allocs