From: Steven Rostedt (Red Hat) <rostedt@goodmis.org>
Date: Tue, 5 Feb 2013 14:56:00 +0000 (-0500)
Subject: ktest: Ignore warnings during reboot
X-Git-Tag: firefly_0821_release~3680^2~1043^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4c0b67a27d96e01a4b4ede2fda57da9f7c50af21;p=firefly-linux-kernel-4.4.55.git

ktest: Ignore warnings during reboot

The reboot just wants to get to the next kernel. But if a warning (Call
Trace) appears, the monitor will report an error, and the reboot will
think something went wrong and power cycle the box, even though we
successfully made it to the next kernel.

Ignore warnings during the reboot until we get to the next kernel. It
will still timeout if we never get to the next kernel and then a power
cycle will happen. That's what we want it to do.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 839989d08dc2..f3bb5da3193b 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1212,6 +1212,12 @@ sub reboot {
     }
 
     if (defined($time)) {
+
+	# We only want to get to the new kernel, don't fail
+	# if we stumble over a call trace.
+	my $save_ignore_errors = $ignore_errors;
+	$ignore_errors = 1;
+
 	# Look for the good kernel to boot
 	if (wait_for_monitor($time, "Linux version")) {
 	    # reboot got stuck?
@@ -1219,6 +1225,8 @@ sub reboot {
 	    run_command "$power_cycle";
 	}
 
+	$ignore_errors = $save_ignore_errors;
+
 	# Still need to wait for the reboot to finish
 	wait_for_monitor($time, $reboot_success_line);