summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2011-11-22 02:12:04 +0100
committerSteven Rostedt <rostedt@goodmis.org>2011-11-22 02:12:04 +0100
commit600bbf0aa2229390ba1c4ca4c5666c593ff9ef56 (patch)
treee15fbf29a5b1b3f04df9bf7cce6bdf39deec5f87
parentktest: Allow success logs to be stored (diff)
downloadlinux-600bbf0aa2229390ba1c4ca4c5666c593ff9ef56.tar.xz
linux-600bbf0aa2229390ba1c4ca4c5666c593ff9ef56.zip
ktest: Add default for ssh-user, build-target and target-image
When a user runs ktest without an argument, or the argument given is not a config file that exists, ktest will ask the user a few questions to create a simple ktest config file. A few of the questions should have a default value set, that if anything it will make it easier for the user to know what is suppose to be in that value. These new values are: SSH_USER, BUILD_TARGET and TARGET_IMAGE Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rwxr-xr-xtools/testing/ktest/ktest.pl8
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 6ef104e87ab0..05f429d68857 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -22,7 +22,6 @@ my %default;
#default opts
$default{"NUM_TESTS"} = 1;
-$default{"REBOOT_TYPE"} = "grub";
$default{"TEST_TYPE"} = "test";
$default{"BUILD_TYPE"} = "randconfig";
$default{"MAKE_CMD"} = "make";
@@ -51,7 +50,14 @@ $default{"REBOOT"} = "ssh \$SSH_USER\@\$MACHINE reboot";
$default{"STOP_AFTER_SUCCESS"} = 10;
$default{"STOP_AFTER_FAILURE"} = 60;
$default{"STOP_TEST_AFTER"} = 600;
+
+# required, and we will ask users if they don't have them but we keep the default
+# value something that is common.
+$default{"REBOOT_TYPE"} = "grub";
$default{"LOCALVERSION"} = "-test";
+$default{"SSH_USER"} = "root";
+$default{"BUILD_TARGET"} = "arch/x86/boot/bzImage";
+$default{"TARGET_IMAGE"} = "/boot/vmlinuz-test";
my $ktest_config;
my $version;