Skip to content

Commit

Permalink
ktest: Only ask options needed for install
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Steven Rostedt authored and Steven Rostedt committed Dec 23, 2011
1 parent dbd3783 commit 165708b
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions tools/testing/ktest/ktest.pl
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
my $iteration = 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.
my $buildonly = 1;

Expand Down Expand Up @@ -343,11 +343,15 @@ sub get_ktest_configs {

# options required for other than just building a kernel
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("BUILD_TARGET");
get_ktest_config("TARGET_IMAGE");
get_ktest_config("POWER_CYCLE");
get_ktest_config("CONSOLE");
}

get_ktest_config("LOCALVERSION");
Expand Down Expand Up @@ -412,10 +416,15 @@ sub process_variables {
sub set_value {
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
# 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})) {
Expand Down

0 comments on commit 165708b

Please sign in to comment.