Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest: Add INGORE_ERRORS to ignore warnings in boot up
  ktest: Still do reboot even for REBOOT_TYPE = script
  ktest: Fix compare script to test if options are not documented
  ktest: Detect typos in option names
  ktest: Have all values be set by defaults
  ktest: Change initialization of defaults hash to perl format
  ktest: Add options SWITCH_TO_GOOD and SWITCH_TO_TEST
  ktest: Allow overriding bisect test results
  ktest: Evaluate options before processing them
  ktest: Evaluate $KERNEL_VERSION in both install and post install
  ktest: Only ask options needed for install
  ktest: When creating a new config, ask for BUILD_OPTIONS
  ktest: Do not ask for some options if the only test is build
  ktest: Ask for type of test when creating a new config
  ktest: Allow bisect test to restart where it left off
  ktest: When creating new config, allow the use of ${THIS_DIR}
  ktest: Add default for ssh-user, build-target and target-image
  ktest: Allow success logs to be stored
  ktest: Save test output

3 files changed, 581 insertions, 192 deletions

diff --git a/tools/testing/ktest/compare-ktest-sample.pl b/tools/testing/ktest/compare-ktest-sample.pl
index 9a571e71683c..a373a5bfff68 100755
--- a/tools/testing/ktest/compare-ktest-sample.pl
+++ b/tools/testing/ktest/compare-ktest-sample.pl
@@ -2,7 +2,9 @@
 
 open (IN,"ktest.pl");
 while (<IN>) {
+    # hashes are now used
     if (/\$opt\{"?([A-Z].*?)(\[.*\])?"?\}/ ||
+        /^\s*"?([A-Z].*?)"?\s*=>\s*/ ||
         /set_test_option\("(.*?)"/) {
         $opt{$1} = 1;
     }
@@ -11,7 +13,7 @@ close IN;
 
 open (IN, "sample.conf");
 while (<IN>) {
-    if (/^\s*#?\s*(\S+)\s*=/) {
+    if (/^\s*#?\s*([A-Z]\S*)\s*=/) {
         $samp{$1} = 1;
     }
 }
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 8b4c2535b266..62a134dc421a 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -18,40 +18,50 @@ $| = 1;
 my %opt;
 my %repeat_tests;
 my %repeats;
-my %default;
 
 #default opts
-$default{"NUM_TESTS"}           = 1;
-$default{"REBOOT_TYPE"}         = "grub";
-$default{"TEST_TYPE"}           = "test";
-$default{"BUILD_TYPE"}          = "randconfig";
-$default{"MAKE_CMD"}            = "make";
-$default{"TIMEOUT"}             = 120;
-$default{"TMP_DIR"}             = "/tmp/ktest/\${MACHINE}";
-$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{"PATCHCHECK_SLEEP_TIME"} = 60; # sleep time between patch checks
-$default{"CLEAR_LOG"}           = 0;
-$default{"BISECT_MANUAL"}       = 0;
-$default{"BISECT_SKIP"}         = 1;
-$default{"SUCCESS_LINE"}        = "login:";
-$default{"DETECT_TRIPLE_FAULT"} = 1;
-$default{"NO_INSTALL"}          = 0;
-$default{"BOOTED_TIMEOUT"}      = 1;
-$default{"DIE_ON_FAILURE"}      = 1;
-$default{"SSH_EXEC"}            = "ssh \$SSH_USER\@\$MACHINE \$SSH_COMMAND";
-$default{"SCP_TO_TARGET"}       = "scp \$SRC_FILE \$SSH_USER\@\$MACHINE:\$DST_FILE";
-$default{"REBOOT"}              = "ssh \$SSH_USER\@\$MACHINE reboot";
-$default{"STOP_AFTER_SUCCESS"}  = 10;
-$default{"STOP_AFTER_FAILURE"}  = 60;
-$default{"STOP_TEST_AFTER"}     = 600;
-$default{"LOCALVERSION"}        = "-test";
+my %default = (
+    "NUM_TESTS"                 => 1,
+    "TEST_TYPE"                 => "build",
+    "BUILD_TYPE"                => "randconfig",
+    "MAKE_CMD"                  => "make",
+    "TIMEOUT"                   => 120,
+    "TMP_DIR"                   => "/tmp/ktest/\${MACHINE}",
+    "SLEEP_TIME"                => 60,  # sleep time between tests
+    "BUILD_NOCLEAN"             => 0,
+    "REBOOT_ON_ERROR"           => 0,
+    "POWEROFF_ON_ERROR"         => 0,
+    "REBOOT_ON_SUCCESS"         => 1,
+    "POWEROFF_ON_SUCCESS"       => 0,
+    "BUILD_OPTIONS"             => "",
+    "BISECT_SLEEP_TIME"         => 60,   # sleep time between bisects
+    "PATCHCHECK_SLEEP_TIME"     => 60, # sleep time between patch checks
+    "CLEAR_LOG"                 => 0,
+    "BISECT_MANUAL"             => 0,
+    "BISECT_SKIP"               => 1,
+    "SUCCESS_LINE"              => "login:",
+    "DETECT_TRIPLE_FAULT"       => 1,
+    "NO_INSTALL"                => 0,
+    "BOOTED_TIMEOUT"            => 1,
+    "DIE_ON_FAILURE"            => 1,
+    "SSH_EXEC"                  => "ssh \$SSH_USER\@\$MACHINE \$SSH_COMMAND",
+    "SCP_TO_TARGET"             => "scp \$SRC_FILE \$SSH_USER\@\$MACHINE:\$DST_FILE",
+    "REBOOT"                    => "ssh \$SSH_USER\@\$MACHINE reboot",
+    "STOP_AFTER_SUCCESS"        => 10,
+    "STOP_AFTER_FAILURE"        => 60,
+    "STOP_TEST_AFTER"           => 600,
+
+# required, and we will ask users if they don't have them but we keep the default
+# value something that is common.
+    "REBOOT_TYPE"               => "grub",
+    "LOCALVERSION"              => "-test",
+    "SSH_USER"                  => "root",
+    "BUILD_TARGET"              => "arch/x86/boot/bzImage",
+    "TARGET_IMAGE"              => "/boot/vmlinuz-test",
+
+    "LOG_FILE"                  => undef,
+    "IGNORE_UNUSED"             => 0,
+);
 
 my $ktest_config;
 my $version;
@@ -73,6 +83,8 @@ my $reboot_script;
 my $power_cycle;
 my $reboot;
 my $reboot_on_error;
+my $switch_to_good;
+my $switch_to_test;
 my $poweroff_on_error;
 my $die_on_failure;
 my $powercycle_after_reboot;
@@ -92,17 +104,24 @@ my $start_minconfig;
 my $start_minconfig_defined;
 my $output_minconfig;
 my $ignore_config;
+my $ignore_errors;
 my $addconfig;
 my $in_bisect = 0;
-my $bisect_bad = "";
+my $bisect_bad_commit = "";
 my $reverse_bisect;
 my $bisect_manual;
 my $bisect_skip;
 my $config_bisect_good;
+my $bisect_ret_good;
+my $bisect_ret_bad;
+my $bisect_ret_skip;
+my $bisect_ret_abort;
+my $bisect_ret_default;
 my $in_patchcheck = 0;
 my $run_test;
 my $redirect;
 my $buildlog;
+my $testlog;
 my $dmesg;
 my $monitor_fp;
 my $monitor_pid;
@@ -112,6 +131,7 @@ my $bisect_sleep_time;
 my $patchcheck_sleep_time;
 my $ignore_warnings;
 my $store_failures;
+my $store_successes;
 my $test_name;
 my $timeout;
 my $booted_timeout;
@@ -124,10 +144,34 @@ my $stop_after_failure;
 my $stop_test_after;
 my $build_target;
 my $target_image;
+my $checkout;
 my $localversion;
 my $iteration = 0;
 my $successes = 0;
 
+my $bisect_good;
+my $bisect_bad;
+my $bisect_type;
+my $bisect_start;
+my $bisect_replay;
+my $bisect_files;
+my $bisect_reverse;
+my $bisect_check;
+
+my $config_bisect;
+my $config_bisect_type;
+
+my $patchcheck_type;
+my $patchcheck_start;
+my $patchcheck_end;
+
+# set when a test is something other that just building or install