Filtered malloc/free statistics out from more output variant files.

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

diff --git a/memcheck/tests/addressable.stderr.exp2 b/memcheck/tests/addressable.stderr.exp2
index 2092100f162c939ede120da0467636874c7594ad..02531b0f94fa8990d458ab1a66ca201ff6c9c41c 100644 (file)
--- a/memcheck/tests/addressable.stderr.exp2
+++ b/memcheck/tests/addressable.stderr.exp2
@@ -1,8 +1,8 @@
 
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 1 allocs, 1 frees, 24 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
 Unaddressable byte(s) found during client check request
@@ -21,14 +21,14 @@ Process terminating with default action of signal 11 (SIGSEGV)
    by 0x........: main (addressable.c:125)
 
 ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 24 bytes in 1 blocks.
-malloc/free: 1 allocs, 0 frees, 24 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
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 1 allocs, 1 frees, 24 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
 
@@ -38,8 +38,8 @@ Process terminating with default action of signal 11 (SIGSEGV)
    by 0x........: main (addressable.c:125)
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 24 bytes in 1 blocks.
-malloc/free: 1 allocs, 0 frees, 24 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
 Uninitialised byte(s) found during client check request
@@ -57,13 +57,13 @@ Uninitialised byte(s) found during client check request
    by 0x........: main (addressable.c:125)
 
 ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 1 allocs, 1 frees, 24 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
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 1 allocs, 1 frees, 24 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/badjump.stderr.exp2 b/memcheck/tests/badjump.stderr.exp2
index 76046f4867b6c37f9f660dea2a21b10c05637a16..a845195cc14689f8dba9d0c02601861a2d45b98a 100644 (file)
--- a/memcheck/tests/badjump.stderr.exp2
+++ b/memcheck/tests/badjump.stderr.exp2
@@ -10,7 +10,7 @@ Process terminating with default action of signal 11 (SIGSEGV)
    by 0x........: __libc_start_main (in /...libc...)
 
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 24 bytes in 1 blocks.
-malloc/free: 1 allocs, 0 frees, 24 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/leak-pool-0.stderr.exp64 b/memcheck/tests/leak-pool-0.stderr.exp64
index 3015aa8346dd4c9453678c18d3e714ec0742f8a2..7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71 100644 (file)
--- a/memcheck/tests/leak-pool-0.stderr.exp64
+++ b/memcheck/tests/leak-pool-0.stderr.exp64
@@ -1,7 +1,7 @@
 
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 4,120 bytes in 2 blocks.
-malloc/free: 102 allocs, 0 frees, 5,720 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/leak-pool-1.stderr.exp64 b/memcheck/tests/leak-pool-1.stderr.exp64
index 3015aa8346dd4c9453678c18d3e714ec0742f8a2..7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71 100644 (file)
--- a/memcheck/tests/leak-pool-1.stderr.exp64
+++ b/memcheck/tests/leak-pool-1.stderr.exp64
@@ -1,7 +1,7 @@
 
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 4,120 bytes in 2 blocks.
-malloc/free: 102 allocs, 0 frees, 5,720 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/leak-pool-2.stderr.exp64 b/memcheck/tests/leak-pool-2.stderr.exp64
index 3015aa8346dd4c9453678c18d3e714ec0742f8a2..7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71 100644 (file)
--- a/memcheck/tests/leak-pool-2.stderr.exp64
+++ b/memcheck/tests/leak-pool-2.stderr.exp64
@@ -1,7 +1,7 @@
 
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 4,120 bytes in 2 blocks.
-malloc/free: 102 allocs, 0 frees, 5,720 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/leak-pool-3.stderr.exp64 b/memcheck/tests/leak-pool-3.stderr.exp64
index 3015aa8346dd4c9453678c18d3e714ec0742f8a2..7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71 100644 (file)
--- a/memcheck/tests/leak-pool-3.stderr.exp64
+++ b/memcheck/tests/leak-pool-3.stderr.exp64
@@ -1,7 +1,7 @@
 
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 4,120 bytes in 2 blocks.
-malloc/free: 102 allocs, 0 frees, 5,720 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/leak-pool-4.stderr.exp64 b/memcheck/tests/leak-pool-4.stderr.exp64
index 3015aa8346dd4c9453678c18d3e714ec0742f8a2..7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71 100644 (file)
--- a/memcheck/tests/leak-pool-4.stderr.exp64
+++ b/memcheck/tests/leak-pool-4.stderr.exp64
@@ -1,7 +1,7 @@
 
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 4,120 bytes in 2 blocks.
-malloc/free: 102 allocs, 0 frees, 5,720 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/leak-pool-5.stderr.exp64 b/memcheck/tests/leak-pool-5.stderr.exp64
index 3015aa8346dd4c9453678c18d3e714ec0742f8a2..7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71 100644 (file)
--- a/memcheck/tests/leak-pool-5.stderr.exp64
+++ b/memcheck/tests/leak-pool-5.stderr.exp64
@@ -1,7 +1,7 @@
 
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 4,120 bytes in 2 blocks.
-malloc/free: 102 allocs, 0 frees, 5,720 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/partiallydefinedeq.stderr.exp2 b/memcheck/tests/partiallydefinedeq.stderr.exp2
index 78ab70bb3065c216ce5787ddcddf9b63be71238a..6c2025b3b416d1d119f6d76e102674f284c2844e 100644 (file)
--- a/memcheck/tests/partiallydefinedeq.stderr.exp2
+++ b/memcheck/tests/partiallydefinedeq.stderr.exp2
@@ -13,7 +13,7 @@ Conditional jump or move depends on uninitialised value(s)
    by 0x........: main (partiallydefinedeq.c:52)
 
 ERROR SUMMARY: 3 errors from 3 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 8 bytes in 2 blocks.
-malloc/free: 2 allocs, 0 frees, 8 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/sigkill.stderr.exp2 b/memcheck/tests/sigkill.stderr.exp2
index 3cc35594ac1fc1f7506046711f196eb93dfc1dd9..dbdea49c33dd401615003331c48a48c40c445124 100644 (file)
--- a/memcheck/tests/sigkill.stderr.exp2
+++ b/memcheck/tests/sigkill.stderr.exp2
@@ -196,7 +196,7 @@ Invalid argument
 
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 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/sigkill.stderr.exp3 b/memcheck/tests/sigkill.stderr.exp3
index dfe65480d8de9019c6b41bedb74656fb8fc9f4f3..65a48a4346c709c0672662ca34140cb41a54f50c 100644 (file)
--- a/memcheck/tests/sigkill.stderr.exp3
+++ b/memcheck/tests/sigkill.stderr.exp3
@@ -196,7 +196,7 @@ Invalid argument
 
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 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