ktest: Bisecting, install modules, add logging

Added bisecting, modules, logging of the output.
Banners that show success.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 227 insertions, 94 deletions

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 79da57f3023b..a34f6f4193df 100644
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -25,11 +25,13 @@ $opt{"POWEROFF_ON_SUCCESS"}	= 0;
 $opt{"BUILD_OPTIONS"}           = "";
 
 my $version;
-my $install_mods;
 my $grub_number;
 my $target;
 my $make;
 my $noclean;
+my $minconfig;
+my $in_bisect = 0;
+my $bisect_bad = "";
 
 sub read_config {
     my ($config) = @_;
@@ -52,9 +54,7 @@ sub read_config {
     close(IN);
 }
 
-sub doprint {
-    print @_;
-
+sub logit {
     if (defined($opt{"LOG_FILE"})) {
         open(OUT, ">> $opt{LOG_FILE}") or die "Can't write to $opt{LOG_FILE}";
         print OUT @_;
@@ -62,6 +62,11 @@ sub doprint {
     }
 }
 
+sub doprint {
+    print @_;
+    logit @_;
+}
+
 sub dodie {
     doprint "CRITICAL FAILURE... ", @_;
 
@@ -96,7 +101,30 @@ sub run_command {
         doprint "SUCCESS\n";
     }
 
-    return $failed;
+    return !$failed;
+}
+
+sub get_grub_index {
+
+    return if ($grub_number >= 0);
+
+    doprint "Find grub menu ... ";
+    $grub_number = -1;
+    open(IN, "ssh $target cat /boot/grub/menu.lst |")
+        or die "unable to get menu.lst";
+    while (<IN>) {
+        if (/^\s*title\s+$opt{GRUB_MENU}\s*$/) {
+            $grub_number++;
+            last;
+        } elsif (/^\s*title\s/) {
+            $grub_number++;
+        }
+    }
+    close(IN);
+
+    die "Could not find '$opt{GRUB_MENU}' in /boot/grub/menu on $opt{MACHINE}"
+        if ($grub_number < 0);
+    doprint "$grub_number\n";
 }
 
 my $timeout = $opt{"TIMEOUT"};
@@ -213,46 +241,63 @@ sub monitor {
     close(IN);
 
     if (!$booted) {
+        return 1 if (!$in_bisect);
         dodie "failed - never got a boot prompt.\n";
     }
 
     if ($bug) {
+        return 1 if (!$in_bisect);
         dodie "failed - got a bug report\n";
     }
+
+    return 0;
 }
 
 sub install {
 
-    if (run_command "scp $opt{OUTPUT_DIR}/$opt{BUILD_TARGET} $target:$opt{TARGET_IMAGE}") {
+    run_command "scp $opt{OUTPUT_DIR}/$opt{BUILD_TARGET} $target:$opt{TARGET_IMAGE}" or
         dodie "failed to copy image";
-    }
 
-    if ($install_mods) {
-        my $modlib = "/lib/modules/$version";
-        my $modtar = "autotest-mods.tar.bz2";
+    my $install_mods = 0;
 
-        if (run_command "ssh $target rm -rf $modlib") {
-            dodie "failed to remove old mods: $modlib";
+    # should we process modules?
+    $install_mods = 0;
+    open(IN, "$opt{OUTPUT_DIR}/.config") or dodie("Can't read config file");
+    while (<IN>) {
+        if (/CONFIG_MODULES(=y)?/) {
+            $install_mods = 1 if (defined($1));
+            last;
         }
+    }
+    close(IN);
 
-        # would be nice if scp -r did not follow symbolic links
-        if (run_command "cd $opt{TMP_DIR} && tar -cjf $modtar lib/modules/$version") {
-            dodie "making tarball";
-        }
+    if (!$install_mods) {
+        doprint "No modules needed\n";
+        return;
+    }
 
-        if (run_command "scp $opt{TMP_DIR}/$modtar $target:/tmp") {
-            dodie "failed to copy modules";
-        }
+    run_command "$make INSTALL_MOD_PATH=$opt{TMP_DIR} modules_install" or
+        dodie "Failed to install modules";
 
-        unlink "$opt{TMP_DIR}/$modtar";
+    my $modlib = "/lib/modules/$version";
+    my $modtar = "autotest-mods.tar.bz2";
 
-        if (run_command "ssh $target '(cd / && tar xf /tmp/$modtar)'") {
-            dodie "failed to tar modules";
-        }
+    run_command "ssh $target rm -rf $modlib" or
+        dodie "failed to remove old mods: $modlib";
 
-        run_command "ssh $target rm -f /tmp/$modtar";
-    }
+    # would be nice if scp -r did not follow symbolic links
+    run_command "cd $opt{TMP_DIR} && tar -cjf $modtar lib/modules/$version" or
+        dodie "making tarball";
+
+    run_command "scp $opt{TMP_DIR}/$modtar $target:/tmp" or
+        dodie "failed to copy modules";
+
+    unlink "$opt{TMP_DIR}/$modtar";
+
+    run_command "ssh $target '(cd / && tar xf /tmp/$modtar)'" or
+        dodie "failed to tar modules";
 
+    run_command "ssh $target rm -f /tmp/$modtar";
 }
 
 sub build {
@@ -261,9 +306,9 @@ sub build {
     my $append = "";
 
     if ($type =~ /^useconfig:(.*)/) {
-        if (run_command "cp $1 $opt{OUTPUT_DIR}/.config") {
+        run_command "cp $1 $opt{OUTPUT_DIR}/.config" or
             dodie "could not copy $1 to .config";
-        }
+
         $type = "oldconfig";
     }
 
@@ -274,23 +319,20 @@ sub build {
         # allow for empty configs
         run_command "touch $opt{OUTPUT_DIR}/.config";
 
-        if (run_command "mv $opt{OUTPUT_DIR}/.config $opt{OUTPUT_DIR}/config_temp") {
+        run_command "mv $opt{OUTPUT_DIR}/.config $opt{OUTPUT_DIR}/config_temp" or