From: Nicholas Nethercote <njn@valgrind.org>
Date: Thu, 13 Aug 2009 04:24:38 +0000 (+0000)
Subject: Fix a .exp file.  Avoid an assertion failure with -v.
X-Git-Tag: svn/VALGRIND_3_5_0~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbe64c17465af840a5684550592a93a88f5e60cc;p=thirdparty%2Fvalgrind.git

Fix a .exp file.  Avoid an assertion failure with -v.



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

diff --git a/coregrind/m_errormgr.c b/coregrind/m_errormgr.c
index 48ecc20712..4948c18e25 100644
--- a/coregrind/m_errormgr.c
+++ b/coregrind/m_errormgr.c
@@ -771,8 +771,10 @@ Bool VG_(unique_error) ( ThreadId tid, ErrorKind ekind, Addr a, Char* s,
       return False;
 
    } else {
-      n_errs_suppressed++;
-      n_supp_contexts++;
+      if (count_error) {
+         n_errs_suppressed++;
+         n_supp_contexts++;
+      }
       su->count++;
       return True;
    }
@@ -859,7 +861,8 @@ void VG_(show_all_errors) ( void )
             p_min = p;
          }
       }
-      if (p_min == NULL) VG_(tool_panic)("show_all_errors()");
+      // XXX: this isn't right.  See bug 203651.
+      if (p_min == NULL) continue; //VG_(tool_panic)("show_all_errors()");
 
       VG_(umsg)("\n");
       VG_(umsg)("%d errors in context %d of %d:\n",
diff --git a/memcheck/tests/error_counts.stderr.exp b/memcheck/tests/error_counts.stderr.exp
index cb366e964b..1c924d33f1 100644
--- a/memcheck/tests/error_counts.stderr.exp
+++ b/memcheck/tests/error_counts.stderr.exp
@@ -16,4 +16,4 @@ dubious:     88 bytes in  1 blocks
 reachable:   99 bytes in  1 blocks
 suppressed:   0 bytes in  0 blocks
 
-errors: 3
+errors: 1