aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/ktest/ktest.pl
diff options
context:
space:
mode:
Diffstat (limited to 'tools/testing/ktest/ktest.pl')
-rwxr-xr-xtools/testing/ktest/ktest.pl11
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index b6de81927cc3..292b13ad03f5 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -109,6 +109,7 @@ my $start_minconfig;
109my $start_minconfig_defined; 109my $start_minconfig_defined;
110my $output_minconfig; 110my $output_minconfig;
111my $minconfig_type; 111my $minconfig_type;
112my $use_output_minconfig;
112my $ignore_config; 113my $ignore_config;
113my $ignore_errors; 114my $ignore_errors;
114my $addconfig; 115my $addconfig;
@@ -209,6 +210,7 @@ my %option_map = (
209 "OUTPUT_MIN_CONFIG" => \$output_minconfig, 210 "OUTPUT_MIN_CONFIG" => \$output_minconfig,
210 "START_MIN_CONFIG" => \$start_minconfig, 211 "START_MIN_CONFIG" => \$start_minconfig,
211 "MIN_CONFIG_TYPE" => \$minconfig_type, 212 "MIN_CONFIG_TYPE" => \$minconfig_type,
213 "USE_OUTPUT_MIN_CONFIG" => \$use_output_minconfig,
212 "IGNORE_CONFIG" => \$ignore_config, 214 "IGNORE_CONFIG" => \$ignore_config,
213 "TEST" => \$run_test, 215 "TEST" => \$run_test,
214 "ADD_CONFIG" => \$addconfig, 216 "ADD_CONFIG" => \$addconfig,
@@ -3146,8 +3148,15 @@ sub make_min_config {
3146 # that instead. 3148 # that instead.
3147 if (-f $output_minconfig && !$start_minconfig_defined) { 3149 if (-f $output_minconfig && !$start_minconfig_defined) {
3148 print "$output_minconfig exists\n"; 3150 print "$output_minconfig exists\n";
3149 if (read_yn " Use it as minconfig?") { 3151 if (!defined($use_output_minconfig)) {
3152 if (read_yn " Use it as minconfig?") {
3153 $start_minconfig = $output_minconfig;
3154 }
3155 } elsif ($use_output_minconfig > 0) {
3156 doprint "Using $output_minconfig as MIN_CONFIG\n";
3150 $start_minconfig = $output_minconfig; 3157 $start_minconfig = $output_minconfig;
3158 } else {
3159 doprint "Set to still use MIN_CONFIG as starting point\n";
3151 } 3160 }
3152 } 3161 }
3153 3162