|
From: <sv...@va...> - 2009-08-13 04:33:32
|
Author: njn
Date: 2009-08-13 05:24:38 +0100 (Thu, 13 Aug 2009)
New Revision: 10799
Log:
Fix a .exp file. Avoid an assertion failure with -v.
Modified:
trunk/coregrind/m_errormgr.c
trunk/memcheck/tests/error_counts.stderr.exp
Modified: trunk/coregrind/m_errormgr.c
===================================================================
--- trunk/coregrind/m_errormgr.c 2009-08-13 00:02:30 UTC (rev 10798)
+++ trunk/coregrind/m_errormgr.c 2009-08-13 04:24:38 UTC (rev 10799)
@@ -771,8 +771,10 @@
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 @@
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",
Modified: trunk/memcheck/tests/error_counts.stderr.exp
===================================================================
--- trunk/memcheck/tests/error_counts.stderr.exp 2009-08-13 00:02:30 UTC (rev 10798)
+++ trunk/memcheck/tests/error_counts.stderr.exp 2009-08-13 04:24:38 UTC (rev 10799)
@@ -16,4 +16,4 @@
reachable: 99 bytes in 1 blocks
suppressed: 0 bytes in 0 blocks
-errors: 3
+errors: 1
|