From: Steven Rostedt <srostedt@redhat.com>
Date: Sat, 22 Oct 2011 12:58:19 +0000 (-0400)
Subject: ktest: Add another monitor flush before installing kernel
X-Git-Tag: v3.2-rc2~31^2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9f7424cc86adf55c3fccaa1160b6cf5c6cfc4c02;p=linux-2.6-block.git

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>
---

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;