summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2012-02-27 13:58:49 -0500
committerSteven Rostedt <rostedt@goodmis.org>2012-02-27 13:58:49 -0500
commitbf1c95abaf24b56c45f458051c693f31fd9b7052 (patch)
tree147270d6a4d8abfaef1334baf1dbc733dbffce67 /tools
parentbe405f95f0a090d1dfc26a5bb4d781c00f34479c (diff)
downloadlinux-3.10-bf1c95abaf24b56c45f458051c693f31fd9b7052.tar.gz
linux-3.10-bf1c95abaf24b56c45f458051c693f31fd9b7052.tar.bz2
linux-3.10-bf1c95abaf24b56c45f458051c693f31fd9b7052.zip
ktest: Fix make_min_config test when build fails
The make_min_config does not take into account when the build fails, resulting in a invalid MIN_CONFIG .config file. When the build fails, it is ignored and the boot test is executed, using the previous built kernel. The configs that should be tested are not tested and they may be added or removed depending on the result of the last kernel that succeeded to be built. If the build fails, mark the current config as a failure and the configs that were disabled may still be needed. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/testing/ktest/ktest.pl8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 62a134dc421..9507c4b251a 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -3244,9 +3244,11 @@ sub make_min_config {
$in_bisect = 1;
my $failed = 0;
- build "oldconfig";
- start_monitor_and_boot or $failed = 1;
- end_monitor;
+ build "oldconfig" or $failed = 1;
+ if (!$failed) {
+ start_monitor_and_boot or $failed = 1;
+ end_monitor;
+ }
$in_bisect = 0;