summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2011-10-22 16:58:19 +0400
committerSteven Rostedt <rostedt@goodmis.org>2011-10-22 16:58:19 +0400
commit9f7424cc86adf55c3fccaa1160b6cf5c6cfc4c02 (patch)
treec913bd76e4aa6eacf6fc7c9bd7ed50f31ce15e3f /tools
parentc54367f9d6be8e19c6e98ae7038438f0377ee138 (diff)
downloadlinux-9f7424cc86adf55c3fccaa1160b6cf5c6cfc4c02.tar.xz
ktest: Add another monitor flush before installing kernel
On some tests that do multiple boots (patchcheck, bisect, etc), the build of the next kernel to run may finish before the stable kernel has finished booting. Then the install of the new kernel will fail when it tries to connect as the machine has not finished the boot process. Do one more monitor flush to make sure the machine is up and running before trying to connect to it again. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/testing/ktest/ktest.pl5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index d60c496fb514..652446dd9e79 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1391,6 +1391,11 @@ sub get_version {
}
sub start_monitor_and_boot {
+ # Make sure the stable kernel has finished booting
+ start_monitor;
+ wait_for_monitor 5;
+ end_monitor;
+
get_grub_index;
get_version;
install;