ktest: Added sample.conf, new %default option format

Added sample.conf as a nice document to show new users.

Use a %default hash to separate out the options that are default
and allow us to complain about options being set twice.

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

2 files changed, 649 insertions, 142 deletions

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index ff6283a44847..1f28c45f15b8 100644
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -16,28 +16,45 @@ $#ARGV >= 0 || die "usage: autotest.pl config-file\n";
 $| = 1;
 
 my %opt;
+my %default;
 
 #default opts
-$opt{"NUM_BUILDS"}              = 5;
-$opt{"BUILD_TYPE"}              = "randconfig";
-$opt{"MAKE_CMD"}                = "make";
-$opt{"TIMEOUT"}                 = 120;
-$opt{"TMP_DIR"}                 = "/tmp/autotest";
-$opt{"SLEEP_TIME"}              = 60;   # sleep time between tests
-$opt{"BUILD_NOCLEAN"}           = 0;
-$opt{"REBOOT_ON_ERROR"}         = 0;
-$opt{"POWEROFF_ON_ERROR"}       = 0;
-$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;
+$default{"NUM_TESTS"}           = 5;
+$default{"REBOOT_TYPE"}         = "grub";
+$default{"TEST_TYPE"}           = "test";
+$default{"BUILD_TYPE"}          = "randconfig";
+$default{"MAKE_CMD"}            = "make";
+$default{"TIMEOUT"}             = 120;
+$default{"TMP_DIR"}             = "/tmp/autotest";
+$default{"SLEEP_TIME"}          = 60;   # sleep time between tests
+$default{"BUILD_NOCLEAN"}       = 0;
+$default{"REBOOT_ON_ERROR"}     = 0;
+$default{"POWEROFF_ON_ERROR"}   = 0;
+$default{"REBOOT_ON_SUCCESS"}   = 1;
+$default{"POWEROFF_ON_SUCCESS"} = 0;
+$default{"BUILD_OPTIONS"}       = "";
+$default{"BISECT_SLEEP_TIME"}   = 60;   # sleep time between bisects
+$default{"CLEAR_LOG"}           = 0;
+$default{"SUCCESS_LINE"}        = "login:";
+$default{"BOOTED_TIMEOUT"}      = 1;
+$default{"DIE_ON_FAILURE"}      = 1;
 
 my $version;
+my $machine;
+my $tmpdir;
+my $builddir;
+my $outputdir;
+my $test_type;
 my $build_type;
+my $build_options;
+my $reboot_type;
+my $reboot_script;
+my $power_cycle;
+my $reboot_on_error;
+my $poweroff_on_error;
+my $die_on_failure;
+my $power_off;
+my $grub_menu;
 my $grub_number;
 my $target;
 my $make;
@@ -55,6 +72,16 @@ my $dmesg;
 my $monitor_fp;
 my $monitor_pid;
 my $monitor_cnt = 0;
+my $sleep_time;
+my $bisect_sleep_time;
+my $store_failures;
+my $timeout;
+my $booted_timeout;
+my $console;
+my $success_line;
+my $build_target;
+my $target_image;
+my $localversion;
 
 sub read_config {
     my ($config) = @_;
@@ -70,11 +97,22 @@ sub read_config {
             my $lvalue = $1;
             my $rvalue = $2;
 
+            if (defined($opt{$lvalue})) {
+                die "Error: Option $lvalue defined more than once!\n";
+            }
             $opt{$lvalue} = $rvalue;
         }
     }
 
     close(IN);
+
+    # set any defaults
+
+    foreach my $default (keys %default) {
+        if (!defined($opt{$default})) {
+            $opt{$default} = $default{$default};
+        }
+    }
 }
 
 sub logit {
@@ -96,20 +134,20 @@ sub reboot {
     # try to reboot normally
     if (!run_command "ssh $target reboot") {
         # nope? power cycle it.
-        run_command "$opt{POWER_CYCLE}";
+        run_command "$power_cycle";
     }
 }
 
 sub dodie {
     doprint "CRITICAL FAILURE... ", @_, "\n";
 
-    if ($opt{"REBOOT_ON_ERROR"}) {
+    if ($reboot_on_error && $test_type ne "build") {
         doprint "REBOOTING\n";
         reboot;
 
-    } elsif ($opt{"POWEROFF_ON_ERROR"} && defined($opt{"POWER_OFF"})) {
+    } elsif ($poweroff_on_error && defined($power_off)) {
         doprint "POWERING OFF\n";
-        `$opt{"POWER_OFF"}`;
+        `$power_off`;
     }
 
     die @_;
@@ -120,8 +158,8 @@ sub open_console {
 
     my $flags;
 
-    my $pid = open($fp, "$opt{CONSOLE}|") or
-        dodie "Can't open console $opt{CONSOLE}";
+    my $pid = open($fp, "$console|") or
+        dodie "Can't open console $console";
 
     $flags = fcntl($fp, F_GETFL, 0) or
         dodie "Can't get flags for the socket: $!\n";
@@ -147,6 +185,10 @@ sub start_monitor {
     }
     $monitor_fp = \*MONFD;
     $monitor_pid = open_console $monitor_fp;
+
+    return;
+
+    open(MONFD, "Stop perl from warning about single use of MONFD");
 }
 
 sub end_monitor {
@@ -160,43 +202,50 @@ sub wait_for_monitor {
     my ($time) = @_;
     my $line;
 
-    doprint "Wait for monitor to settle down.\n";
+    doprint "** Wait for monitor to settle down **\n";
 
     # read the monitor and wait for the system to calm down
     do {
         $line = wait_for_input($monitor_fp, $time);
+        print "$line" if (defined($line));
     } while (defined($line));
+    print "** Monitor flushed **\n";
 }
 
 sub fail {
 
-        if ($opt{"DIE_ON_FAILURE"}) {
+        if ($die_on_failure) {
                 dodie @_;
         }