aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtools/testing/ktest/ktest.pl8
1 files changed, 8 insertions, 0 deletions
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 {
1212 } 1212 }
1213 1213
1214 if (defined($time)) { 1214 if (defined($time)) {
1215
1216 # We only want to get to the new kernel, don't fail
1217 # if we stumble over a call trace.
1218 my $save_ignore_errors = $ignore_errors;
1219 $ignore_errors = 1;
1220
1215 # Look for the good kernel to boot 1221 # Look for the good kernel to boot
1216 if (wait_for_monitor($time, "Linux version")) { 1222 if (wait_for_monitor($time, "Linux version")) {
1217 # reboot got stuck? 1223 # reboot got stuck?
@@ -1219,6 +1225,8 @@ sub reboot {
1219 run_command "$power_cycle"; 1225 run_command "$power_cycle";
1220 } 1226 }
1221 1227
1228 $ignore_errors = $save_ignore_errors;
1229
1222 # Still need to wait for the reboot to finish 1230 # Still need to wait for the reboot to finish
1223 wait_for_monitor($time, $reboot_success_line); 1231 wait_for_monitor($time, $reboot_success_line);
1224 1232