[PATCH][GIT PULL][v3.3] ktest: Fix make_min_config test when buildfails

[Steven Rostedt]

Linus,

At ELC I was demoing ktest and stumbled on a small bug in the
make_min_config test that, embarrassingly, made a config that wouldn't
boot. As people are using your latest tree to get the ktest program
(those at the conference), I would like to have this bug fixed as people
will most likely hit this bug too.

Also, this is the first signed-tag pull request that I'm doing. I only
pushed the tag itself. I hope it worked. The tag name is below my
repository.

Thanks!

-- Steve


Please pull the latest for-linus tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git
ktest-fix-make-min-failed-build

Head SHA1: bf1c95abaf24b56c45f458051c693f31fd9b7052


Steven Rostedt (1):
      ktest: Fix make_min_config test when build fails

----
 tools/testing/ktest/ktest.pl |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---------------------------
commit bf1c95abaf24b56c45f458051c693f31fd9b7052
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date:   Mon Feb 27 13:58:49 2012 -0500

    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@xxxxxxxxxxx>

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 62a134d..9507c4b 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;
 


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/