ktest: Added continuing on success, clear log and timeout

Add option to continue after a test fails.

Add option to reset the log at start of running ktest.

Update default timeout to 2 minutes.

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

1 files changed, 78 insertions, 38 deletions

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 0dc403e7170c..0a0b1b16fccd 100644
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -19,7 +19,7 @@ my %opt;
 $opt{"NUM_BUILDS"}              = 5;
 $opt{"DEFAULT_BUILD_TYPE"}      = "randconfig";
 $opt{"MAKE_CMD"}                = "make";
-$opt{"TIMEOUT"}                 = 50;
+$opt{"TIMEOUT"}                 = 120;
 $opt{"TMP_DIR"}                 = "/tmp/autotest";
 $opt{"SLEEP_TIME"}              = 60;   # sleep time between tests
 $opt{"BUILD_NOCLEAN"}           = 0;
@@ -29,6 +29,10 @@ $opt{"REBOOT_ON_SUCCESS"}	= 1;
 $opt{"POWEROFF_ON_SUCCESS"}     = 0;
 $opt{"BUILD_OPTIONS"}           = "";
 $opt{"BISECT_SLEEP_TIME"}       = 10;   # sleep time between bisects
+$opt{"CLEAR_LOG"}               = 0;
+$opt{"SUCCESS_LINE"}            = "login:";
+$opt{"BOOTED_TIMEOUT"}          = 1;
+$opt{"DIE_ON_FAILURE"}          = 1;
 
 my $version;
 my $grub_number;
@@ -36,6 +40,7 @@ my $target;
 my $make;
 my $noclean;
 my $minconfig;
+my $addconfig;
 my $in_bisect = 0;
 my $bisect_bad = "";
 my $reverse_bisect;
@@ -92,6 +97,16 @@ sub dodie {
     die @_;
 }
 
+sub fail {
+
+        if ($opt{"DIE_ON_FAILURE"}) {
+                dodie @_;
+        }
+
+        doprint "Failed: ", @_, "\n";
+        return 1;
+}
+
 sub run_command {
     my ($command) = @_;
     my $dolog = 0;
@@ -101,7 +116,7 @@ sub run_command {
     doprint("$command ... ");
 
     $pid = open(CMD, "$command 2>&1 |") or
-        dodie "unable to exec $command";
+        (fail "unable to exec $command" and return 0);
 
     if (defined($opt{"LOG_FILE"})) {
         open(LOG, ">>$opt{LOG_FILE}") or
@@ -228,6 +243,7 @@ sub monitor {
     my $pid;
     my $skip_call_trace = 0;
     my $fp = \*IN;
+    my $loops;
 
     $pid = open_console($fp);
 
@@ -244,7 +260,11 @@ sub monitor {
 
     for (;;) {
 
-        $line = wait_for_input($fp);
+        if ($booted) {
+            $line = wait_for_input($fp, $opt{"BOOTED_TIMEOUT"});
+        } else {
+            $line = wait_for_input($fp);
+        }
 
         last if (!defined($line));
 
@@ -253,7 +273,7 @@ sub monitor {
         # we are not guaranteed to get a full line
         $full_line .= $line;
 
-        if ($full_line =~ /login:/) {
+        if ($full_line =~ /$opt{"SUCCESS_LINE"}/) {
             $booted = 1;
         }
 
@@ -281,16 +301,16 @@ sub monitor {
     close_console($fp, $pid);
 
     if (!$booted) {
-        return 1 if ($in_bisect);
-        dodie "failed - never got a boot prompt.\n";
+        return 0 if ($in_bisect);
+        fail "failed - never got a boot prompt.\n" and return 0;
     }
 
     if ($bug) {
-        return 1 if ($in_bisect);
-        dodie "failed - got a bug report\n";
+        return 0 if ($in_bisect);
+        fail "failed - got a bug report\n" and return 0;
     }
 
-    return 0;
+    return 1;
 }
 
 sub install {
@@ -363,12 +383,14 @@ sub check_buildlog {
             foreach my $file (@files) {
                 my $fullpath = "$opt{BUILD_DIR}/$file";
                 if ($file eq $err || $fullpath eq $err) {
-                    dodie "$file built with warnings";
+                    fail "$file built with warnings" and return 0;
                 }
             }
         }
     }
     close(IN);
+
+    return 1;
 }
 
 sub build {
@@ -426,12 +448,12 @@ sub build {
     if (!run_command "$make $opt{BUILD_OPTIONS}") {
         undef $redirect;
         # bisect may need this to pass
-        return 1 if ($in_bisect);
-        dodie "failed build";
+        return 0 if ($in_bisect);
+        fail "failed build" and return 0;
     }
     undef $redirect;
 
-    return 0;
+    return 1;
 }
 
 sub reboot {
@@ -545,41 +567,40 @@ sub do_run_test {
     close_console($fp, $pid);
 
     if ($bug || $child_exit) {
-        return 1 if $in_bisect;
-        dodie "test failed";
+        return 0 if $in_bisect;
+        fail "test failed" and return 0;
     }
-    return 0;
+    return 1;
 }
 
 sub run_bisect {
     my ($type) = @_;
 
-    my $failed;
+    my $failed = 0;
     my $result;
     my $output;
     my $ret;
 
-
     if (defined($minconfig)) {