From 35d554c9e282b7dfa13942fc709647a346400ecf Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Wed, 4 Jan 2012 21:51:59 -0500
Subject: [PATCH] --- yaml --- r: 285902 b: refs/heads/master c:
 be405f95f0a090d1dfc26a5bb4d781c00f34479c h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/tools/testing/ktest/ktest.pl    | 4 +++-
 trunk/tools/testing/ktest/sample.conf | 8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 885994add6ac..d84468a893c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96f6a0df19238fceed77ddfc33bb2d6a4e1b9be6
+refs/heads/master: be405f95f0a090d1dfc26a5bb4d781c00f34479c
diff --git a/trunk/tools/testing/ktest/ktest.pl b/trunk/tools/testing/ktest/ktest.pl
index f81c8b3a39a8..62a134dc421a 100755
--- a/trunk/tools/testing/ktest/ktest.pl
+++ b/trunk/tools/testing/ktest/ktest.pl
@@ -104,6 +104,7 @@
 my $start_minconfig_defined;
 my $output_minconfig;
 my $ignore_config;
+my $ignore_errors;
 my $addconfig;
 my $in_bisect = 0;
 my $bisect_bad_commit = "";
@@ -218,6 +219,7 @@
     "BISECT_SLEEP_TIME"		=> \$bisect_sleep_time,
     "PATCHCHECK_SLEEP_TIME"	=> \$patchcheck_sleep_time,
     "IGNORE_WARNINGS"		=> \$ignore_warnings,
+    "IGNORE_ERRORS"		=> \$ignore_errors,
     "BISECT_MANUAL"		=> \$bisect_manual,
     "BISECT_SKIP"		=> \$bisect_skip,
     "CONFIG_BISECT_GOOD"	=> \$config_bisect_good,
@@ -1529,7 +1531,7 @@ sub monitor {
 	}
 
 	if ($full_line =~ /call trace:/i) {
-	    if (!$bug && !$skip_call_trace) {
+	    if (!$ignore_errors && !$bug && !$skip_call_trace) {
 		$bug = 1;
 		$failure_start = time;
 	    }
diff --git a/trunk/tools/testing/ktest/sample.conf b/trunk/tools/testing/ktest/sample.conf
index d7148f7c7c04..e7119024b879 100644
--- a/trunk/tools/testing/ktest/sample.conf
+++ b/trunk/tools/testing/ktest/sample.conf
@@ -741,6 +741,14 @@
 # (default 0)
 #IGNORE_UNUSED = 1
 
+# When testing a kernel that happens to have WARNINGs, and call
+# traces, ktest.pl will detect these and fail a boot or test run
+# due to warnings. By setting this option, ktest will ignore
+# call traces, and will not fail a test if the kernel produces
+# an oops. Use this option with care.
+# (default 0)
+#IGNORE_ERRORS = 1
+
 #### Per test run options ####
 # The following options are only allowed in TEST_START sections.
 # They are ignored in the DEFAULTS sections.