Merge r6382/3 (Fix confusing leak-checker flag hints, and regtest updates)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6429

diff --git a/memcheck/mc_leakcheck.c b/memcheck/mc_leakcheck.c
index f194500720663f6ecae5be5bc8414e775460a83a..2c4aac4bd91453903a838b12e96132026f5dfd4a 100644 (file)
--- a/memcheck/mc_leakcheck.c
+++ b/memcheck/mc_leakcheck.c
@@ -928,14 +928,17 @@ void MC_(do_detect_memory_leaks) (
                                MC_(bytes_reachable), blocks_reachable );
       VG_(message)(Vg_UserMsg, "        suppressed: %,lu bytes in %,lu blocks.",
                                MC_(bytes_suppressed), blocks_suppressed );
-      if (mode == LC_Summary && blocks_leaked > 0)
-        VG_(message)(Vg_UserMsg,
-                     "Use --leak-check=full to see details of leaked memory.");
-      else if (!MC_(clo_show_reachable)) {
+      if (mode == LC_Summary 
+          && (blocks_leaked + blocks_indirect 
+              + blocks_dubious + blocks_reachable) > 0) {
+         VG_(message)(Vg_UserMsg,
+                      "Rerun with --leak-check=full to see details of leaked memory.");
+      }
+      if (blocks_reachable > 0 && !MC_(clo_show_reachable) && mode == LC_Full) {
          VG_(message)(Vg_UserMsg, 
            "Reachable blocks (those to which a pointer was found) are not shown.");
          VG_(message)(Vg_UserMsg, 
-            "To see them, rerun with: --show-reachable=yes");
+            "To see them, rerun with: --leak-check=full --show-reachable=yes");
       }
    }
 

diff --git a/memcheck/tests/leak-0.stderr.exp b/memcheck/tests/leak-0.stderr.exp
index a2233b5c8663f8403bf9d5f97a4d9d8c466d544d..adb0de3b4ef95e5d2b8e0041543b3ff4122d3a1a 100644 (file)
--- a/memcheck/tests/leak-0.stderr.exp
+++ b/memcheck/tests/leak-0.stderr.exp
@@ -8,7 +8,7 @@ LEAK SUMMARY:
    still reachable: 0 bytes in 1 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 0 bytes in 0 blocks.

diff --git a/memcheck/tests/leak-0.stderr.exp2 b/memcheck/tests/leak-0.stderr.exp2
index 6a6d545768edbd94f5090fb0e53ed7a0bd6f7f01..23df1ed37097b3b1794c4eef863317585452d090 100644 (file)
--- a/memcheck/tests/leak-0.stderr.exp2
+++ b/memcheck/tests/leak-0.stderr.exp2
@@ -9,7 +9,7 @@ LEAK SUMMARY:
    still reachable: 24 bytes in 2 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 0 bytes in 0 blocks.

diff --git a/memcheck/tests/leak-cycle.stderr.exp64 b/memcheck/tests/leak-cycle.stderr.exp64
index e868e67eec5a19a7abec4c7a57c10c59c8d10742..d9e63d8835c1feefa075276c66e7bb77bed5956d 100644 (file)
--- a/memcheck/tests/leak-cycle.stderr.exp64
+++ b/memcheck/tests/leak-cycle.stderr.exp64
@@ -35,8 +35,6 @@ LEAK SUMMARY:
      possibly lost: 0 bytes in 0 blocks.
    still reachable: 0 bytes in 0 blocks.
         suppressed: 0 bytes in 0 blocks.
-Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 288 bytes in 18 blocks.

diff --git a/memcheck/tests/leak-regroot.stderr.exp b/memcheck/tests/leak-regroot.stderr.exp
index 339bfcd92c36edb6b7d0c189c2a376e4478ae26b..dd10b70f2dd751ea2fd484f01740e17357b1ee9e 100644 (file)
--- a/memcheck/tests/leak-regroot.stderr.exp
+++ b/memcheck/tests/leak-regroot.stderr.exp
@@ -8,7 +8,7 @@ LEAK SUMMARY:
    still reachable: 10 bytes in 1 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 0 bytes in 0 blocks.

diff --git a/memcheck/tests/leak-regroot.stderr.exp2 b/memcheck/tests/leak-regroot.stderr.exp2
index 883322d0da2e5b42b9d0be89e73b702c96bbc63d..ee9db446a552f95dab16cbc8de756133b4788673 100644 (file)
--- a/memcheck/tests/leak-regroot.stderr.exp2
+++ b/memcheck/tests/leak-regroot.stderr.exp2
@@ -9,7 +9,7 @@ LEAK SUMMARY:
    still reachable: 34 bytes in 2 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 0 bytes in 0 blocks.

diff --git a/memcheck/tests/leak-tree.stderr.exp b/memcheck/tests/leak-tree.stderr.exp
index e169d28d14aacda5391cb17b5b715b9d521eef14..651342035987f6ada27bd332f9a7742c9df29f00 100644 (file)
--- a/memcheck/tests/leak-tree.stderr.exp
+++ b/memcheck/tests/leak-tree.stderr.exp
@@ -14,7 +14,7 @@ LEAK SUMMARY:
    still reachable: 16 bytes in 2 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes
 searching for pointers to 14 not-freed blocks.
 checked ... bytes.
 
@@ -43,7 +43,7 @@ LEAK SUMMARY:
    still reachable: 0 bytes in 0 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 112 bytes in 14 blocks.

diff --git a/memcheck/tests/leak-tree.stderr.exp2 b/memcheck/tests/leak-tree.stderr.exp2
index cebd4306e703783519d377962cda99a93af67e2c..cbe995bcb33715b54dfc8fdf4db1b680588f4d1a 100644 (file)
--- a/memcheck/tests/leak-tree.stderr.exp2
+++ b/memcheck/tests/leak-tree.stderr.exp2
@@ -13,7 +13,7 @@ LEAK SUMMARY:
    still reachable: 80 bytes in 10 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes
 searching for pointers to 14 not-freed blocks.
 checked ... bytes.
 
@@ -42,7 +42,7 @@ LEAK SUMMARY:
    still reachable: 56 bytes in 7 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 112 bytes in 14 blocks.

diff --git a/memcheck/tests/leak-tree.stderr.exp64 b/memcheck/tests/leak-tree.stderr.exp64
index 0e76fa79db8652c0acaea1d9d548ebaf3fda5069..669612716ff6f8435adccace0e4bb870d2d58977 100644 (file)
--- a/memcheck/tests/leak-tree.stderr.exp64
+++ b/memcheck/tests/leak-tree.stderr.exp64
@@ -14,7 +14,7 @@ LEAK SUMMARY:
    still reachable: 96 bytes in 6 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes
 searching for pointers to 14 not-freed blocks.
 checked ... bytes.
 
@@ -43,7 +43,7 @@ LEAK SUMMARY:
    still reachable: 112 bytes in 7 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 224 bytes in 14 blocks.

diff --git a/memcheck/tests/pointer-trace.stderr.exp b/memcheck/tests/pointer-trace.stderr.exp
index bdbd960637e40f82fdfde39dce57a0de1d9611e0..158de9c2566ccda3676be72cb34b4410c77e489f 100644 (file)
--- a/memcheck/tests/pointer-trace.stderr.exp
+++ b/memcheck/tests/pointer-trace.stderr.exp
@@ -8,7 +8,7 @@ LEAK SUMMARY:
    still reachable: 1,048,576 bytes in 1 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 1,048,576 bytes in 1 blocks.
@@ -26,5 +26,3 @@ LEAK SUMMARY:
      possibly lost: 0 bytes in 0 blocks.
    still reachable: 0 bytes in 0 blocks.
         suppressed: 0 bytes in 0 blocks.
-Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes

diff --git a/memcheck/tests/pointer-trace.stderr.exp2 b/memcheck/tests/pointer-trace.stderr.exp2
index b8a91469e1aa315f5affa28587dc02d05eba5efd..3f6ec1a027dfbc5b157276b458c5a9bdf9bd89d2 100644 (file)
--- a/memcheck/tests/pointer-trace.stderr.exp2
+++ b/memcheck/tests/pointer-trace.stderr.exp2
@@ -9,7 +9,7 @@ LEAK SUMMARY:
    still reachable: 1,048,600 bytes in 2 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 1,048,576 bytes in 1 blocks.
@@ -29,4 +29,4 @@ LEAK SUMMARY:
    still reachable: 0 bytes in 0 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes

diff --git a/memcheck/tests/pointer-trace.stderr.exp3 b/memcheck/tests/pointer-trace.stderr.exp3
index 3b9851e90b0e4aa63ad3d635ba1d40c40b847bf5..ce9dba3603c5d787584ebf04271e67be4d3c7509 100644 (file)
--- a/memcheck/tests/pointer-trace.stderr.exp3
+++ b/memcheck/tests/pointer-trace.stderr.exp3
@@ -8,7 +8,7 @@ LEAK SUMMARY:
    still reachable: 1,048,576 bytes in 1 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 1,048,576 bytes in 1 blocks.
@@ -27,4 +27,4 @@ LEAK SUMMARY:
    still reachable: 0 bytes in 0 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes

diff --git a/memcheck/tests/pointer-trace.stderr.exp64 b/memcheck/tests/pointer-trace.stderr.exp64
index 21a360e1192b407093d1d531f83d4b208a8ab68d..9eba36ef97eebaba6f804fe4d3934925daf5a74b 100644 (file)
--- a/memcheck/tests/pointer-trace.stderr.exp64
+++ b/memcheck/tests/pointer-trace.stderr.exp64
@@ -8,7 +8,7 @@ LEAK SUMMARY:
    still reachable: 2,097,152 bytes in 1 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 2,097,152 bytes in 1 blocks.
@@ -27,4 +27,4 @@ LEAK SUMMARY:
    still reachable: 0 bytes in 0 blocks.
         suppressed: 0 bytes in 0 blocks.
 Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=yes
+To see them, rerun with: --leak-check=full --show-reachable=yes