openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ktest: Only ask options needed for install 

If all the tests are only for build or install, do not ask
for options not needed to do the install, if the options do
not exist.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt 2011-11-26 20:56:52 -05:00 committed by Steven Rostedt
parent dbd3783b4d
commit 165708b273
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/testing/ktest/ktest.pl
View File

@ -136,7 +136,7 @@ my $localversion;
my $iteration = 0; my $iteration = 0;
my $successes = 0; my $successes = 0;
# set when a test is something other that just building # set when a test is something other that just building or install
# which would require more options. # which would require more options.
my $buildonly = 1; my $buildonly = 1;
@ -343,11 +343,15 @@ sub get_ktest_configs {
# options required for other than just building a kernel # options required for other than just building a kernel
if (!$buildonly) { if (!$buildonly) {
get_ktest_config("POWER_CYCLE");
get_ktest_config("CONSOLE");
}
# options required for install and more
if ($buildonly != 1) {
get_ktest_config("SSH_USER"); get_ktest_config("SSH_USER");
get_ktest_config("BUILD_TARGET"); get_ktest_config("BUILD_TARGET");
get_ktest_config("TARGET_IMAGE"); get_ktest_config("TARGET_IMAGE");
get_ktest_config("POWER_CYCLE");
get_ktest_config("CONSOLE");
} }
get_ktest_config("LOCALVERSION"); get_ktest_config("LOCALVERSION");
@ -412,10 +416,15 @@ sub process_variables {
sub set_value { sub set_value {
my ($lvalue, $rvalue, $override, $overrides, $name) = @_; my ($lvalue, $rvalue, $override, $overrides, $name) = @_;
if ($lvalue =~ /^TEST_TYPE(\[.*\])?$/ && $rvalue ne "build") { if ($buildonly && $lvalue =~ /^TEST_TYPE(\[.*\])?$/ && $rvalue ne "build") {
# Note if a test is something other than build, then we # Note if a test is something other than build, then we
# will need other manditory options. # will need other manditory options.
$buildonly = 0; if ($rvalue ne "install") {
$buildonly = 0;
} else {
# install still limits some manditory options.
$buildonly = 2;
}
} }
if (defined($opt{$lvalue})) { if (defined($opt{$lvalue})) {