summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2011-11-26 20:56:52 -0500
committerSteven Rostedt <rostedt@goodmis.org>2011-12-22 21:59:30 -0500
commit165708b273f87ac52a4564b114a6c046e6b3a02d (patch)
treec410b3636d45877f656c7879cebad05a927a3942 /tools
parentdbd3783b4dd33dd7ce5c378bf5b1da27a1298735 (diff)
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>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/testing/ktest/ktest.pl19
1 files changed, 14 insertions, 5 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 2b547d6683c..5d82c275e9e 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -136,7 +136,7 @@ my $localversion;
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;
@@ -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");
@@ -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})) {