[netfilter-cvslog] r3495 - trunk/nfsim/core

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2004-12-23 03:08:43 +0100 (Thu, 23 Dec 2004)
New Revision: 3495

Modified:
   trunk/nfsim/core/failtest.c
Log:
Lower "ignoring failures" limit, but subtract "fail-once" failures.


Modified: trunk/nfsim/core/failtest.c
===================================================================
--- trunk/nfsim/core/failtest.c	2004-12-23 00:57:55 UTC (rev 3494)
+++ trunk/nfsim/core/failtest.c	2004-12-23 02:08:43 UTC (rev 3495)
@@ -28,7 +28,7 @@
 
 static bool failtest = false;
 bool suppress_failtest;
-static unsigned int fails = 0;
+static unsigned int fails = 0, fails_once = 0;
 unsigned int failpoints = 0;
 
 struct fail_decision
@@ -209,7 +209,11 @@
 		if (streq(location, i->location))
 			return false;
 
-	return should_i_fail(location);
+	if (should_i_fail(location)) {
+		fails_once++;
+		return true;
+	}
+	return false;
 }
 
 /* Should I fail at this point? */
@@ -230,8 +234,10 @@
 		return false;
 
 	/* If a testcase ignores a spuriously-inserted failure, it's
-	 * not specific enough, and we risk doing 2^n tests!  Limit it to 3. */
-	if (fails > 3) {
+	 * not specific enough, and we risk doing 2^n tests!  Limit it
+	 * to 2.  should_i_fail_once() is used on "expected" failures,
+	 * like del_timer, so don't count those. */
+	if (fails - fails_once > 2) {
 		static bool warned = false;
 		if (!warned++)
 			warn_failure();