diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-10-07 16:31:07 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2014-10-07 16:31:07 -0400 |
commit | 995bc4314071db148222497875be32d1eb73726d (patch) | |
tree | f3a3d69ca90fcd5799991cbd62d9fb93c4463b80 | |
parent | fee9d3e61d04422628a3d22ed5eb8370dcef259b (diff) | |
download | op-kernel-dev-995bc4314071db148222497875be32d1eb73726d.zip op-kernel-dev-995bc4314071db148222497875be32d1eb73726d.tar.gz |
ktest: Fix check for new kernel success on rebooting to good kernel
The reboot function when rebooting back to a good kernel has a check
to make sure that a new kernel was indeed booted. But that check
uses a timeout value, which when calling the monitor will still
return success if the timeout is hit (no bug was found). It should
return an error to let the reboot code know that a new kernel was
not reached. Only the reboot code checks the return value of the
monitor.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rwxr-xr-x | tools/testing/ktest/ktest.pl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index 085452f..c518b0f 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -1450,6 +1450,12 @@ sub wait_for_monitor { } } print "** Monitor flushed **\n"; + + # if stop is defined but wasn't hit, return error + # used by reboot (which wants to see a reboot) + if (defined($stop) && !$booted) { + $bug = 1; + } return $bug; } |