Filtered out malloc/free statistics.

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

diff --git a/memcheck/tests/badjump.stderr.exp b/memcheck/tests/badjump.stderr.exp
index d6d3f7c2ea358d2628cb949aa8d8782b6474fa43..8ffd9d06d63fbf8639d826c2e327271e71cb5389 100644 (file)
--- a/memcheck/tests/badjump.stderr.exp
+++ b/memcheck/tests/badjump.stderr.exp
@@ -14,7 +14,7 @@ Process terminating with default action of signal 11 (SIGSEGV)
  The main thread stack size used in this run was ....
 
 ERROR SUMMARY: 1 errors from 1 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/badjump.vgtest b/memcheck/tests/badjump.vgtest
index 5e96c62ace3263bfb936dceec4b7190c445b4f29..e45c866fd4f476a44c11967d2731f00edf70b113 100644 (file)
--- a/memcheck/tests/badjump.vgtest
+++ b/memcheck/tests/badjump.vgtest
@@ -1,2 +1,3 @@
 prog: badjump
 cleanup: rm -f vgcore.pid*
+stderr_filter: filter_allocs

diff --git a/memcheck/tests/describe-block.stderr.exp b/memcheck/tests/describe-block.stderr.exp
index 9f277f2624af3027bcded4254b508eb14d560454..a66b106444fb483df12bbcc572dda82f5006a97c 100644 (file)
--- a/memcheck/tests/describe-block.stderr.exp
+++ b/memcheck/tests/describe-block.stderr.exp
@@ -13,7 +13,7 @@ Process terminating with default action of signal 11 (SIGSEGV)
  The main thread stack size used in this run was ....
 
 ERROR SUMMARY: 1 errors from 1 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/describe-block.vgtest b/memcheck/tests/describe-block.vgtest
index 7b48e693c781f6cddc78021731646053f3615eb3..367ff1b615fbe30866db7f8852e84813fe1142a2 100644 (file)
--- a/memcheck/tests/describe-block.vgtest
+++ b/memcheck/tests/describe-block.vgtest
@@ -1 +1,2 @@
 prog: describe-block
+stderr_filter: filter_allocs

diff --git a/memcheck/tests/erringfds.stderr.exp b/memcheck/tests/erringfds.stderr.exp
index 0516e09081aa60dc8532904001468bee50d67e2d..48f642c93bfdd653c1550e910e9adfc7b0acfe40 100644 (file)
--- a/memcheck/tests/erringfds.stderr.exp
+++ b/memcheck/tests/erringfds.stderr.exp
@@ -2,7 +2,7 @@
 Warning: invalid file descriptor -1 in syscall read()
 
 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/erringfds.vgtest b/memcheck/tests/erringfds.vgtest
index 5a8ede4c3811cac5abd11f1f9def7a9ccae2f59c..e6ea0c17f6514c93adca6c95c891882efe375eef 100644 (file)
--- a/memcheck/tests/erringfds.vgtest
+++ b/memcheck/tests/erringfds.vgtest
@@ -1 +1,2 @@
 prog: erringfds
+stderr_filter: filter_allocs

diff --git a/memcheck/tests/linux-syscalls-2007.stderr.exp b/memcheck/tests/linux-syscalls-2007.stderr.exp
index c4aa6f04fe5303f75950d57590f65cf38b4a5857..7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71 100644 (file)
--- a/memcheck/tests/linux-syscalls-2007.stderr.exp
+++ b/memcheck/tests/linux-syscalls-2007.stderr.exp
@@ -1,7 +1,7 @@
 
 
 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/linux-syscalls-2007.vgtest b/memcheck/tests/linux-syscalls-2007.vgtest
index 55e548aec3e77bf4ea5c7df3bce40b439f9fc0fa..1a9af546d714aead8883fce33964e29d3188a296 100644 (file)
--- a/memcheck/tests/linux-syscalls-2007.vgtest
+++ b/memcheck/tests/linux-syscalls-2007.vgtest
@@ -1 +1,2 @@
 prog: linux-syscalls-2007
+stderr_filter: filter_allocs

diff --git a/memcheck/tests/linux-syslog-syscall.stderr.exp b/memcheck/tests/linux-syslog-syscall.stderr.exp
index a2685833567ada759c6e733fcf2e5435860fce9d..5cb0946afb09f168be6673894ce0d9046eb47e0a 100644 (file)
--- a/memcheck/tests/linux-syslog-syscall.stderr.exp
+++ b/memcheck/tests/linux-syslog-syscall.stderr.exp
@@ -2,7 +2,7 @@
 Done.
 
 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/linux-syslog-syscall.vgtest b/memcheck/tests/linux-syslog-syscall.vgtest
index 58e0afb1d637efa7a3c47d125f3cb4bce410e041..7ffb1279b92adcf1e2005443e69213ab650da0c0 100644 (file)
--- a/memcheck/tests/linux-syslog-syscall.vgtest
+++ b/memcheck/tests/linux-syslog-syscall.vgtest
@@ -1 +1,2 @@
 prog: linux-syslog-syscall
+stderr_filter: filter_allocs

diff --git a/memcheck/tests/lsframe1.stderr.exp b/memcheck/tests/lsframe1.stderr.exp
index e85ce380029934f9e66832cf9e7ca69c0e0793e4..b6e4f219f0b55d1c491fe64681f54d7d589240a4 100644 (file)
--- a/memcheck/tests/lsframe1.stderr.exp
+++ b/memcheck/tests/lsframe1.stderr.exp
@@ -3,7 +3,7 @@ lsframe1: start
 lsframe1: done, result is -8388608
 
 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/lsframe1.vgtest b/memcheck/tests/lsframe1.vgtest
index fbdc190cebdaf51f360781c68b92e25ab4e34889..92f03093a2044207cc9857f541d0dcacb4b59c25 100644 (file)
--- a/memcheck/tests/lsframe1.vgtest
+++ b/memcheck/tests/lsframe1.vgtest
@@ -1,2 +1,3 @@
 prog: lsframe1
 vgopts: --main-stacksize=67200000 --max-stackframe=67200000
+stderr_filter: filter_allocs

diff --git a/memcheck/tests/lsframe2.stderr.exp b/memcheck/tests/lsframe2.stderr.exp
index 2eb8c047b2dd30dddba130ab57733a515b9f07b0..8dd1bf9a792e4f93ac48e4bc4b501fe698df507e 100644 (file)
--- a/memcheck/tests/lsframe2.stderr.exp
+++ b/memcheck/tests/lsframe2.stderr.exp
@@ -3,7 +3,7 @@ lsframe2: start
 lsframe2: done, result is -272629760
 
 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/lsframe2.vgtest b/memcheck/tests/lsframe2.vgtest
index 690a4079e23b33c0538c476b51497ebd31cee173..3c7c021e83ee8660f0b1655551f3609d7ee2c57d 100644 (file)
--- a/memcheck/tests/lsframe2.vgtest
+++ b/memcheck/tests/lsframe2.vgtest
@@ -1,2 +1,3 @@
 prog: lsframe2
 vgopts: --main-stacksize=68500000
+stderr_filter: filter_allocs

diff --git a/memcheck/tests/match-overrun.stderr.exp b/memcheck/tests/match-overrun.stderr.exp
index d20b599054b33ef238fe2b513e1b9b456cd746d2..4ff0e7c7879ff4f8f0728434c2a8def49e759bd2 100644 (file)
--- a/memcheck/tests/match-overrun.stderr.exp
+++ b/memcheck/tests/match-overrun.stderr.exp
@@ -10,7 +10,7 @@ Process terminating with default action of signal 11 (SIGSEGV)
  The main thread stack size used in this run was ....
 
 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/match-overrun.vgtest b/memcheck/tests/match-overrun.vgtest
index a5baa9d44b88b860989ac94324654e828fd7e9e4..85ca9739736efb0af5c486a81a60fca77443e1dc 100644 (file)
--- a/memcheck/tests/match-overrun.vgtest
+++ b/memcheck/tests/match-overrun.vgtest
@@ -1,2 +1,3 @@
 prog: match-overrun
 vgopts: --suppressions=match-overrun.supp
+stderr_filter: filter_allocs

diff --git a/memcheck/tests/noisy_child.stderr.exp b/memcheck/tests/noisy_child.stderr.exp
index b2a3b7ac938aa94982eec90d4d9d5bbf9ff39608..b994d7e07ccf7e70c8fc080c51b907b4d4321935 100644 (file)
--- a/memcheck/tests/noisy_child.stderr.exp
+++ b/memcheck/tests/noisy_child.stderr.exp
@@ -13,7 +13,7 @@ Invalid write of size 1
    by 0x........: main (noisy_child.c:24)
 
 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, 10 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/noisy_child.vgtest b/memcheck/tests/noisy_child.vgtest
index 83a3b217c49644ca3b9ff727b78f484049ed1f68..88d48a96e3a441fb147f0673bc75c64c8bca99a1 100644 (file)
--- a/memcheck/tests/noisy_child.vgtest
+++ b/memcheck/tests/noisy_child.vgtest
@@ -1,2 +1,3 @@
 prog: noisy_child
 vgopts: --child-silent-after-fork=yes
+stderr_filter: filter_allocs

diff --git a/memcheck/tests/partial_load_dflt.stderr.exp b/memcheck/tests/partial_load_dflt.stderr.exp
index aa14bac4a6eff66d2c42f399ec60469dfb45cc46..14707c68b2ab0be3a7d9265d72865f3196fa1833 100644 (file)
--- a/memcheck/tests/partial_load_dflt.stderr.exp
+++ b/memcheck/tests/partial_load_dflt.stderr.exp
@@ -24,7 +24,7 @@ Invalid read of size 4
    by 0x........: main (partial_load.c:36)
 
 ERROR SUMMARY: 4 errors from 4 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 4 allocs, 4 frees, 12 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/partial_load_dflt.vgtest b/memcheck/tests/partial_load_dflt.vgtest
index 5a18789ff3e753ecf0c70d09cac63792a3933753..ca32f463efc4e03bdb0b0f63639f31489f0beb3f 100644 (file)
--- a/memcheck/tests/partial_load_dflt.vgtest
+++ b/memcheck/tests/partial_load_dflt.vgtest
@@ -1 +1,2 @@
 prog: partial_load
+stderr_filter: filter_allocs

diff --git a/memcheck/tests/partial_load_ok.stderr.exp b/memcheck/tests/partial_load_ok.stderr.exp
index 0a2e2f5dc6efc368f25278070eeedeba9307539d..8928f787cd4a26fbfea1327ab8a28d0cb3303a5d 100644 (file)
--- a/memcheck/tests/partial_load_ok.stderr.exp
+++ b/memcheck/tests/partial_load_ok.stderr.exp
@@ -18,7 +18,7 @@ Invalid read of size 4
    by 0x........: main (partial_load.c:36)
 
 ERROR SUMMARY: 3 errors from 3 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 4 allocs, 4 frees, 12 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/partial_load_ok.vgtest b/memcheck/tests/partial_load_ok.vgtest
index 1602c0e202b8bf6505b7899e6052e4f62a8f660a..cabae7290e6d3d0e232186403d9729fdd01214d6 100644 (file)
--- a/memcheck/tests/partial_load_ok.vgtest
+++ b/memcheck/tests/partial_load_ok.vgtest
@@ -1,2 +1,3 @@
 prog: partial_load
 vgopts: --partial-loads-ok=yes
+stderr_filter: filter_allocs

diff --git a/memcheck/tests/partiallydefinedeq.stderr.exp b/memcheck/tests/partiallydefinedeq.stderr.exp
index 9e69f75305b9bc829e9aaf1c783a5afb24d13036..073357a287af9ec288bb0aafee3bfcd6aa0294e9 100644 (file)
--- a/memcheck/tests/partiallydefinedeq.stderr.exp
+++ b/memcheck/tests/partiallydefinedeq.stderr.exp
@@ -8,7 +8,7 @@ Conditional jump or move depends on uninitialised value(s)
    by 0x........: main (partiallydefinedeq.c:52)
 
 ERROR SUMMARY: 2 errors from 2 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/partiallydefinedeq.vgtest b/memcheck/tests/partiallydefinedeq.vgtest
index da965fd170484ec238c7053f07e30fda12545bf7..054c256264727d95ba446d1ab5f173bd7df9f690 100644 (file)
--- a/memcheck/tests/partiallydefinedeq.vgtest
+++ b/memcheck/tests/partiallydefinedeq.vgtest
@@ -1 +1,2 @@
 prog: partiallydefinedeq
+stderr_filter: filter_allocs

diff --git a/memcheck/tests/sigkill.stderr.exp b/memcheck/tests/sigkill.stderr.exp
index 7dbb0d48fce7e8a81a3550d82507125ca02cf860..2f1c7546d9f67c12d97f4e373ee69421cea3859d 100644 (file)
--- a/memcheck/tests/sigkill.stderr.exp
+++ b/memcheck/tests/sigkill.stderr.exp
@@ -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.vgtest b/memcheck/tests/sigkill.vgtest
index a68143011ba4cf68b087554b043587ec9d3ea80f..e565f5dde16d5004baa22d01cb4e956c0adca62f 100644 (file)
--- a/memcheck/tests/sigkill.vgtest
+++ b/memcheck/tests/sigkill.vgtest
@@ -1 +1,2 @@
 prog: sigkill
+stderr_filter: filter_allocs