---

yaml --- r: 357696 b: refs/heads/master c: 4c0b67a h: refs/heads/master v: v3
git-mirror · Feb 5, 2013 · ee3ff45 · ee3ff45
1 parent 6ac90d6
commit ee3ff45
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6845536236a72382a20483887943a599d7c2b69
+refs/heads/master: 4c0b67a27d96e01a4b4ede2fda57da9f7c50af21
diff --git a/trunk/tools/testing/ktest/ktest.pl b/trunk/tools/testing/ktest/ktest.pl
@@ -1212,13 +1212,21 @@ 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?
 	    doprint "Reboot did not finish. Forcing power cycle\n";
 	    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);