ktest: Add USE_OUTPUT_MIN_CONFIG to avoid prompt on make_min_config

If the file that OUTPUT_MIN_CONFIG exists then ktest.pl will prompt the
user and ask them if the OUTPUT_MIN_CONFIG should be used as the
starting point for make_min_config instead of MIN_CONFIG.

This is usually the case, and to allow the user to do so, which is
helpful if the user is creating different min configs based on tests,
and they know one is a superset of another test, they can set
USE_OUTPUT_MIN_CONFIG to one, which will prevent kest.pl from prompting
to use the OUTPUT_MIN_CONFIG and it will just use it.

If USE_OUTPUT_MIN_CONIFG is set to zero, then ktest.pl will continue to
use MIN_CONFIG instead.

The default is that USE_OUTPUT_MIN_CONFIG is undefined.

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

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index b6de81927cc3e279403056adb5668a0a174df0a7..292b13ad03f505f25790f6fb43a8b9c8b822c3c6 100755 (executable)
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -109,6 +109,7 @@ my $start_minconfig;
 my $start_minconfig_defined;
 my $output_minconfig;
 my $minconfig_type;
+my $use_output_minconfig;
 my $ignore_config;
 my $ignore_errors;
 my $addconfig;
@@ -209,6 +210,7 @@ my %option_map = (
     "OUTPUT_MIN_CONFIG"                => \$output_minconfig,
     "START_MIN_CONFIG"         => \$start_minconfig,
     "MIN_CONFIG_TYPE"          => \$minconfig_type,
+    "USE_OUTPUT_MIN_CONFIG"    => \$use_output_minconfig,
     "IGNORE_CONFIG"            => \$ignore_config,
     "TEST"                     => \$run_test,
     "ADD_CONFIG"               => \$addconfig,
@@ -3146,8 +3148,15 @@ sub make_min_config {
     # that instead.
     if (-f $output_minconfig && !$start_minconfig_defined) {
        print "$output_minconfig exists\n";
-       if (read_yn " Use it as minconfig?") {
+       if (!defined($use_output_minconfig)) {
+           if (read_yn " Use it as minconfig?") {
+               $start_minconfig = $output_minconfig;
+           }
+       } elsif ($use_output_minconfig > 0) {
+           doprint "Using $output_minconfig as MIN_CONFIG\n";
            $start_minconfig = $output_minconfig;
+       } else {
+           doprint "Set to still use MIN_CONFIG as starting point\n";
        }
     }
 

diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.conf
index 1c1b7dc13430feb851d90cffb9014cf84f73df89..0e8191b6c5e38a82f4a849e68cece085ec3755b7 100644 (file)
--- a/tools/testing/ktest/sample.conf
+++ b/tools/testing/ktest/sample.conf
@@ -1113,6 +1113,12 @@
 #   config that is generated allows network activity (ssh).
 #   (optional)
 #
+#  USE_OUTPUT_MIN_CONFIG set this to 1 if you do not want to be prompted
+#   about using the OUTPUT_MIN_CONFIG as the MIN_CONFIG as the starting
+#   point. Set it to 0 if you want to always just use the given MIN_CONFIG.
+#   If it is not defined, it will prompt you to pick which config
+#   to start with (MIN_CONFIG or OUTPUT_MIN_CONFIG).
+#
 # Example:
 #
 #  TEST_TYPE = make_min_config