diff options
Diffstat (limited to 'tools/testing/ktest/ktest.pl')
-rwxr-xr-x | tools/testing/ktest/ktest.pl | 11 |
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; | |||
109 | my $start_minconfig_defined; | 109 | my $start_minconfig_defined; |
110 | my $output_minconfig; | 110 | my $output_minconfig; |
111 | my $minconfig_type; | 111 | my $minconfig_type; |
112 | my $use_output_minconfig; | ||
112 | my $ignore_config; | 113 | my $ignore_config; |
113 | my $ignore_errors; | 114 | my $ignore_errors; |
114 | my $addconfig; | 115 | my $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 | ||