tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Steven Rostedt and committed by
Steven Rostedt 43de3316 ccc513b6

+16 -1
+10 -1
tools/testing/ktest/ktest.pl
··· 109 109 my $start_minconfig_defined; 110 110 my $output_minconfig; 111 111 my $minconfig_type; 112 + my $use_output_minconfig; 112 113 my $ignore_config; 113 114 my $ignore_errors; 114 115 my $addconfig; ··· 210 209 "OUTPUT_MIN_CONFIG" => \$output_minconfig, 211 210 "START_MIN_CONFIG" => \$start_minconfig, 212 211 "MIN_CONFIG_TYPE" => \$minconfig_type, 212 + "USE_OUTPUT_MIN_CONFIG" => \$use_output_minconfig, 213 213 "IGNORE_CONFIG" => \$ignore_config, 214 214 "TEST" => \$run_test, 215 215 "ADD_CONFIG" => \$addconfig, ··· 3148 3146 # that instead. 3149 3147 if (-f $output_minconfig && !$start_minconfig_defined) { 3150 3148 print "$output_minconfig exists\n"; 3151 - if (read_yn " Use it as minconfig?") { 3149 + if (!defined($use_output_minconfig)) { 3150 + if (read_yn " Use it as minconfig?") { 3151 + $start_minconfig = $output_minconfig; 3152 + } 3153 + } elsif ($use_output_minconfig > 0) { 3154 + doprint "Using $output_minconfig as MIN_CONFIG\n"; 3152 3155 $start_minconfig = $output_minconfig; 3156 + } else { 3157 + doprint "Set to still use MIN_CONFIG as starting point\n"; 3153 3158 } 3154 3159 } 3155 3160
+6
tools/testing/ktest/sample.conf
··· 1113 1113 # config that is generated allows network activity (ssh). 1114 1114 # (optional) 1115 1115 # 1116 + # USE_OUTPUT_MIN_CONFIG set this to 1 if you do not want to be prompted 1117 + # about using the OUTPUT_MIN_CONFIG as the MIN_CONFIG as the starting 1118 + # point. Set it to 0 if you want to always just use the given MIN_CONFIG. 1119 + # If it is not defined, it will prompt you to pick which config 1120 + # to start with (MIN_CONFIG or OUTPUT_MIN_CONFIG). 1121 + # 1116 1122 # Example: 1117 1123 # 1118 1124 # TEST_TYPE = make_min_config