diff options
author | Steven Rostedt <srostedt@redhat.com> | 2011-08-18 16:35:44 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2011-10-17 11:54:10 -0400 |
commit | cd8e368f475251c0e3c42203f21e68fa25afbb3d (patch) | |
tree | 08da341eaf067e80ab80f4091199a98f9e45a400 /tools | |
parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) |
ktest: Add TEST_TYPE install option
In testing one of my boxes, I found that I only wanted to build and
install the kernel. I wanted to manually reboot the box and test it.
Adding a TEST_TYPE option "install" allows this to happen.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/testing/ktest/ktest.pl | 7 | ||||
-rw-r--r-- | tools/testing/ktest/sample.conf | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index 8d02ccb10c59..e087cb411c9b 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl | |||
@@ -2929,6 +2929,13 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) { | |||
2929 | build $build_type or next; | 2929 | build $build_type or next; |
2930 | } | 2930 | } |
2931 | 2931 | ||
2932 | if ($test_type eq "install") { | ||
2933 | get_version; | ||
2934 | install; | ||
2935 | success $i; | ||
2936 | next; | ||
2937 | } | ||
2938 | |||
2932 | if ($test_type ne "build") { | 2939 | if ($test_type ne "build") { |
2933 | my $failed = 0; | 2940 | my $failed = 0; |
2934 | start_monitor_and_boot or $failed = 1; | 2941 | start_monitor_and_boot or $failed = 1; |
diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.conf index b8bcd14b5a4d..eadca3eb6f5a 100644 --- a/tools/testing/ktest/sample.conf +++ b/tools/testing/ktest/sample.conf | |||
@@ -253,9 +253,10 @@ | |||
253 | 253 | ||
254 | # The default test type (default test) | 254 | # The default test type (default test) |
255 | # The test types may be: | 255 | # The test types may be: |
256 | # build - only build the kernel, do nothing else | 256 | # build - only build the kernel, do nothing else |
257 | # boot - build and boot the kernel | 257 | # install - build and install, but do nothing else (does not reboot) |
258 | # test - build, boot and if TEST is set, run the test script | 258 | # boot - build, install, and boot the kernel |
259 | # test - build, boot and if TEST is set, run the test script | ||
259 | # (If TEST is not set, it defaults back to boot) | 260 | # (If TEST is not set, it defaults back to boot) |
260 | # bisect - Perform a bisect on the kernel (see BISECT_TYPE below) | 261 | # bisect - Perform a bisect on the kernel (see BISECT_TYPE below) |
261 | # patchcheck - Do a test on a series of commits in git (see PATCHCHECK below) | 262 | # patchcheck - Do a test on a series of commits in git (see PATCHCHECK below) |