[PATCH 06/10] ktest: make start_monitor_and_boot true to its name

[Andrew Jones]

Pull out the install parts of the monitor/boot function

Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx>
---
 tools/testing/ktest/ktest.pl |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index a42f8bf..4265652 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1164,11 +1164,13 @@ sub get_version {
     doprint "$version\n";
 }
 
-sub start_monitor_and_boot {
+sub grub_install {
     get_grub_index;
     get_version;
     install;
+}
 
+sub start_monitor_and_boot {
     start_monitor;
     return monitor;
 }
@@ -1494,6 +1496,7 @@ sub do_test {
     my ($type) = @_;
     my $failed = 0;
 
+    grub_install;
     start_monitor_and_boot or $failed = 1;
 
     if ($failed && $in_bisect && $type ne "boot") {
@@ -2615,6 +2618,7 @@ sub make_min_config {
 
 	my $failed = 0;
 	build "oldconfig";
+	grub_install;
 	start_monitor_and_boot or $failed = 1;
 	end_monitor;
 
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/