Skip to content

Commit e8bf9b9

Browse files
committed
ktest.pl: Fix missing "end_monitor" when machine check fails
In the "reboot" command, it does a check of the machine to see if it is still alive with a simple "ssh echo" command. If it fails, it will assume that a normal "ssh reboot" is not possible and force a power cycle. In this case, the "start_monitor" is executed, but the "end_monitor" is not, and this causes the screen will not be given back to the console. That is, after the test, a "reset" command needs to be performed, as "echo" is turned off. Cc: [email protected] Fixes: 6474ace ("ktest.pl: Powercycle the box on reboot if no connection can be made") Signed-off-by: Steven Rostedt <[email protected]>
1 parent 88a51b4 commit e8bf9b9

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

tools/testing/ktest/ktest.pl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1495,7 +1495,8 @@ sub reboot {
14951495

14961496
# Still need to wait for the reboot to finish
14971497
wait_for_monitor($time, $reboot_success_line);
1498-
1498+
}
1499+
if ($powercycle || $time) {
14991500
end_monitor;
15001501
}
15011502
}

0 commit comments

Comments
 (0)