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 48ecc20712ce7b00f10dbdff38d527db4a4f3af8..4948c18e2510840f433c247fc9caa1c9a3386e97 100644 (file)
--- 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 cb366e964b0df79578b2b7bced8b88bd35ed3790..1c924d33f1b85c528972e2887e0b1914334d2020 100644 (file)
--- 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