Update Memcheck expected outputs following r10746 (64-bit variants only).

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

diff --git a/memcheck/tests/addressable.stderr.exp b/memcheck/tests/addressable.stderr.exp
index e000d04ef368d82435595dd3cc67678a726f3a71..1158477b1b1496aa70371105d9d667ea25d40e32 100644 (file)
--- a/memcheck/tests/addressable.stderr.exp
+++ b/memcheck/tests/addressable.stderr.exp
@@ -1,10 +1,12 @@
 
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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
    at 0x........: test2 (addressable.c:48)
    by 0x........: main (addressable.c:125)
@@ -25,28 +27,34 @@ Process terminating with default action of signal N (SIGSEGV or SIGBUS)
  main thread stack using the --main-stacksize= flag.
  The main thread stack size used in this run was ....
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
-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
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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
 
 Process terminating with default action of signal N (SIGSEGV or SIGBUS)
  Bad memory (SIGSEGV or SIGBUS) at address 0x........
    at 0x........: test4 (addressable.c:74)
    by 0x........: main (addressable.c:125)
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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
    at 0x........: test5 (addressable.c:85)
    by 0x........: main (addressable.c:125)
@@ -57,15 +65,19 @@ Uninitialised byte(s) found during client check request
    by 0x........: main (addressable.c:125)
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
-ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
-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
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 Use --track-origins=yes to see where uninitialised values come from
+ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
+
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
 
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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/amd64/xor-undef-amd64.stderr.exp b/memcheck/tests/amd64/xor-undef-amd64.stderr.exp
index e6b7a91e0138851db9feb036d15bcc4f476dec48..9f44bb75a8c51ea74957048dfb5b27016e5923e8 100644 (file)
--- a/memcheck/tests/amd64/xor-undef-amd64.stderr.exp
+++ b/memcheck/tests/amd64/xor-undef-amd64.stderr.exp
@@ -14,9 +14,11 @@ Conditional jump or move depends on uninitialised value(s)
 Conditional jump or move depends on uninitialised value(s)
    at 0x........: main (xor-undef-amd64.c:117)
 
-ERROR SUMMARY: 5 errors from 5 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 1 allocs, 1 frees, 48 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
+HEAP SUMMARY:
+    in use at exit: 0 bytes in 0 blocks.
+  total heap usage: 1 allocs, 1 frees, 48 bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 Use --track-origins=yes to see where uninitialised values come from
+ERROR SUMMARY: 5 errors from 5 contexts (suppressed: 0 from 0)

diff --git a/memcheck/tests/badjump.stderr.exp b/memcheck/tests/badjump.stderr.exp
index eddcd384054f3cfee5eec7b920a0a2fe21bd55bc..3754b96a0f4196d8e52a5ab15cdd5265dab58dbe 100644 (file)
--- a/memcheck/tests/badjump.stderr.exp
+++ b/memcheck/tests/badjump.stderr.exp
@@ -14,8 +14,10 @@ Process terminating with default action of signal 11 (SIGSEGV)
  main thread stack using the --main-stacksize= flag.
  The main thread stack size used in this run was ....
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
-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/brk2.stderr.exp b/memcheck/tests/brk2.stderr.exp
index 7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71..4ad1722f08021db2a4d29e8ac6c9be0a64416a84 100644 (file)
--- a/memcheck/tests/brk2.stderr.exp
+++ b/memcheck/tests/brk2.stderr.exp
@@ -1,7 +1,9 @@
 
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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.stderr.exp b/memcheck/tests/describe-block.stderr.exp
index 619931e2b8399e3991720f9fa83d5a81a8d02ea0..7a13d517012fe7d4d001e66b164aaf394c1ea514 100644 (file)
--- a/memcheck/tests/describe-block.stderr.exp
+++ b/memcheck/tests/describe-block.stderr.exp
@@ -4,8 +4,10 @@ Invalid write of size 1
  Address 0x........ is 0 bytes inside a magic foople zone of size 4,096 client-defined
    at 0x........: main (describe-block.c:6)
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
-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.stderr.exp b/memcheck/tests/erringfds.stderr.exp
index 48f642c93bfdd653c1550e910e9adfc7b0acfe40..55997cbfe4665385d3f2548ee8475e69638c418c 100644 (file)
--- a/memcheck/tests/erringfds.stderr.exp
+++ b/memcheck/tests/erringfds.stderr.exp
@@ -1,8 +1,10 @@
 
 Warning: invalid file descriptor -1 in syscall read()
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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.exp b/memcheck/tests/leak-pool-0.stderr.exp
index 7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71..4ad1722f08021db2a4d29e8ac6c9be0a64416a84 100644 (file)
--- a/memcheck/tests/leak-pool-0.stderr.exp
+++ b/memcheck/tests/leak-pool-0.stderr.exp
@@ -1,7 +1,9 @@
 
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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.exp b/memcheck/tests/leak-pool-1.stderr.exp
index 7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71..4ad1722f08021db2a4d29e8ac6c9be0a64416a84 100644 (file)
--- a/memcheck/tests/leak-pool-1.stderr.exp
+++ b/memcheck/tests/leak-pool-1.stderr.exp
@@ -1,7 +1,9 @@
 
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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.exp b/memcheck/tests/leak-pool-2.stderr.exp
index 7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71..4ad1722f08021db2a4d29e8ac6c9be0a64416a84 100644 (file)
--- a/memcheck/tests/leak-pool-2.stderr.exp
+++ b/memcheck/tests/leak-pool-2.stderr.exp
@@ -1,7 +1,9 @@
 
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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.exp b/memcheck/tests/leak-pool-3.stderr.exp
index 7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71..4ad1722f08021db2a4d29e8ac6c9be0a64416a84 100644 (file)
--- a/memcheck/tests/leak-pool-3.stderr.exp
+++ b/memcheck/tests/leak-pool-3.stderr.exp
@@ -1,7 +1,9 @@
 
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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.exp b/memcheck/tests/leak-pool-4.stderr.exp
index 7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71..4ad1722f08021db2a4d29e8ac6c9be0a64416a84 100644 (file)
--- a/memcheck/tests/leak-pool-4.stderr.exp
+++ b/memcheck/tests/leak-pool-4.stderr.exp
@@ -1,7 +1,9 @@
 
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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.exp b/memcheck/tests/leak-pool-5.stderr.exp
index 7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71..4ad1722f08021db2a4d29e8ac6c9be0a64416a84 100644 (file)
--- a/memcheck/tests/leak-pool-5.stderr.exp
+++ b/memcheck/tests/leak-pool-5.stderr.exp
@@ -1,7 +1,9 @@
 
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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.stderr.exp b/memcheck/tests/linux-syscalls-2007.stderr.exp
index 7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71..4ad1722f08021db2a4d29e8ac6c9be0a64416a84 100644 (file)
--- a/memcheck/tests/linux-syscalls-2007.stderr.exp
+++ b/memcheck/tests/linux-syscalls-2007.stderr.exp
@@ -1,7 +1,9 @@
 
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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.stderr.exp b/memcheck/tests/linux-syslog-syscall.stderr.exp
index 5cb0946afb09f168be6673894ce0d9046eb47e0a..d8f39e721387725c9eae6245bdc3905c4015a91d 100644 (file)
--- a/memcheck/tests/linux-syslog-syscall.stderr.exp
+++ b/memcheck/tests/linux-syslog-syscall.stderr.exp
@@ -1,8 +1,10 @@
 
 Done.
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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/brk.stderr.exp b/memcheck/tests/linux/brk.stderr.exp
index 7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71..4ad1722f08021db2a4d29e8ac6c9be0a64416a84 100644 (file)
--- a/memcheck/tests/linux/brk.stderr.exp
+++ b/memcheck/tests/linux/brk.stderr.exp
@@ -1,7 +1,9 @@
 
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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/capget.stderr.exp b/memcheck/tests/linux/capget.stderr.exp
index 74c030f6ac0c5f1617b631ad2fc92307df431105..10b9d5eb7c4b8dbe689f82f43ed20151c67fb39e 100644 (file)
--- a/memcheck/tests/linux/capget.stderr.exp
+++ b/memcheck/tests/linux/capget.stderr.exp
@@ -4,8 +4,10 @@ effective   0
 permitted   0
 inheritable 0
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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/lsframe1.stderr.exp b/memcheck/tests/linux/lsframe1.stderr.exp
index b6e4f219f0b55d1c491fe64681f54d7d589240a4..364da28e9767b9c9c9804205b2946c2737cd9090 100644 (file)
--- a/memcheck/tests/linux/lsframe1.stderr.exp
+++ b/memcheck/tests/linux/lsframe1.stderr.exp
@@ -2,8 +2,10 @@
 lsframe1: start
 lsframe1: done, result is -8388608
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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/lsframe2.stderr.exp b/memcheck/tests/linux/lsframe2.stderr.exp
index 8dd1bf9a792e4f93ac48e4bc4b501fe698df507e..1b983d342d21a95c0dad84382a7fa33a123ba728 100644 (file)
--- a/memcheck/tests/linux/lsframe2.stderr.exp
+++ b/memcheck/tests/linux/lsframe2.stderr.exp
@@ -2,8 +2,10 @@
 lsframe2: start
 lsframe2: done, result is -272629760
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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/timerfd-syscall.stderr.exp b/memcheck/tests/linux/timerfd-syscall.stderr.exp
index c4aa6f04fe5303f75950d57590f65cf38b4a5857..e38c6d867a9f84b4f44b61c8b9d0d23f2e71cfbd 100644 (file)
--- a/memcheck/tests/linux/timerfd-syscall.stderr.exp
+++ b/memcheck/tests/linux/timerfd-syscall.stderr.exp
@@ -1,7 +1,9 @@
 
 
+HEAP SUMMARY:
+    in use at exit: 0 bytes in 0 blocks.
+  total heap usage: 0 allocs, 0 frees, 0 bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed 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: 0 allocs, 0 frees, 0 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/mallinfo.stderr.exp b/memcheck/tests/mallinfo.stderr.exp
index 0b1329ab92e3dbb2f84c17d6fd68ce45c4e61d4d..11f3fb2968ac2d0278ba66e633e312048fb667b8 100644 (file)
--- a/memcheck/tests/mallinfo.stderr.exp
+++ b/memcheck/tests/mallinfo.stderr.exp
@@ -1,8 +1,10 @@
 
 Success.
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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.stderr.exp b/memcheck/tests/new_override.stderr.exp
index 7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71..4ad1722f08021db2a4d29e8ac6c9be0a64416a84 100644 (file)
--- a/memcheck/tests/new_override.stderr.exp
+++ b/memcheck/tests/new_override.stderr.exp
@@ -1,7 +1,9 @@
 
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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.stderr.exp b/memcheck/tests/noisy_child.stderr.exp
index b994d7e07ccf7e70c8fc080c51b907b4d4321935..9e41691818b8c89ee13a483362406a80b2726da0 100644 (file)
--- a/memcheck/tests/noisy_child.stderr.exp
+++ b/memcheck/tests/noisy_child.stderr.exp
@@ -12,8 +12,10 @@ Invalid write of size 1
    at 0x........: free (vg_replace_malloc.c:...)
    by 0x........: main (noisy_child.c:24)
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
-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.stderr.exp64 b/memcheck/tests/partial_load_dflt.stderr.exp64
index 9e7552bd7f8233e2af13e71c2d90402ef437aec1..08097e7a014d312154b5fc86cee9f4f7e55c5aa9 100644 (file)
--- a/memcheck/tests/partial_load_dflt.stderr.exp64
+++ b/memcheck/tests/partial_load_dflt.stderr.exp64
@@ -23,8 +23,10 @@ Invalid read of size 8
    at 0x........: free (vg_replace_malloc.c:...)
    by 0x........: main (partial_load.c:36)
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 4 errors from 4 contexts (suppressed: 0 from 0)
-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.stderr.exp64 b/memcheck/tests/partial_load_ok.stderr.exp64
index b410475a6257a1b561e187cbade3fddf4f6696ba..e713c77963998332267d88d60e2affa8d82764b1 100644 (file)
--- a/memcheck/tests/partial_load_ok.stderr.exp64
+++ b/memcheck/tests/partial_load_ok.stderr.exp64
@@ -17,8 +17,10 @@ Invalid read of size 8
    at 0x........: free (vg_replace_malloc.c:...)
    by 0x........: main (partial_load.c:36)
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 3 errors from 3 contexts (suppressed: 0 from 0)
-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.exp b/memcheck/tests/partiallydefinedeq.stderr.exp
index d11c7781f342bd9bd5da8a1043338cd6ddd913cf..04fa40b6ad3dc6c819a15443447e6b96940847dd 100644 (file)
--- a/memcheck/tests/partiallydefinedeq.stderr.exp
+++ b/memcheck/tests/partiallydefinedeq.stderr.exp
@@ -7,9 +7,11 @@ Conditional jump or move depends on uninitialised value(s)
    at 0x........: foo (partiallydefinedeq.c:15)
    by 0x........: main (partiallydefinedeq.c:52)
 
-ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
-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
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 Use --track-origins=yes to see where uninitialised values come from
+ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)

diff --git a/memcheck/tests/sigkill.stderr.exp b/memcheck/tests/sigkill.stderr.exp
index 5d209b03ba4656199c0362bcb53c44b5dcca0fe4..70d55d6dfb72917e08148f717b9257bcfdcbb737 100644 (file)
--- a/memcheck/tests/sigkill.stderr.exp
+++ b/memcheck/tests/sigkill.stderr.exp
@@ -189,8 +189,10 @@ getting signal 65: Warning: bad signal number 65 in sigaction()
 Invalid argument
 
 
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks.
+  total heap usage: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+
+For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-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