Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285892
b: refs/heads/master
c: 165708b
h: refs/heads/master
v: v3
  • Loading branch information
Steven Rostedt authored and Steven Rostedt committed Dec 23, 2011
1 parent 5446ad2 commit 5992170
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dbd3783b4dd33dd7ce5c378bf5b1da27a1298735
refs/heads/master: 165708b273f87ac52a4564b114a6c046e6b3a02d
19 changes: 14 additions & 5 deletions trunk/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 5992170

Please sign in to comment.