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

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

[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@redhat.com>
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@goodmis.org>

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;
 

Re: [PATCH][GIT PULL][v3.3] ktest: Fix make_min_config test when build fails

[Linus Torvalds]

On Mon, Feb 27, 2012 at 11:17 AM, Steven Rostedt <rostedt@goodmis.org> wrote:
>
> 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

I'm getting "Already up-to-date" with that tag. It points to your old
commit be405f95f0a0 ("ktest: Add INGORE_ERRORS to ignore warnings in
boot up") and normally I'd ask whether you perhaps forgot to push, but
considering the fairly unique naming of that tag, you clearly *did*
push.

Congratulations, you seem to have found a whole new and unique way of
screwing up ;)

               Linus "my mom called me 'special' too" Torvalds

Re: [PATCH][GIT PULL][v3.3] ktest: Fix make_min_config test when build fails

[Steven Rostedt]

On Mon, 2012-02-27 at 15:26 -0800, Linus Torvalds wrote:
> On Mon, Feb 27, 2012 at 11:17 AM, Steven Rostedt <rostedt@goodmis.org> wrote:
> >
> > 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
> 
> I'm getting "Already up-to-date" with that tag. It points to your old
> commit be405f95f0a0 ("ktest: Add INGORE_ERRORS to ignore warnings in
> boot up") and normally I'd ask whether you perhaps forgot to push, but
> considering the fairly unique naming of that tag, you clearly *did*
> push.

Crap! I haven't gotten the scripts working yet with the signed tags. It
tagged then merged the latest commit :-p

> 
> Congratulations, you seem to have found a whole new and unique way of
> screwing up ;)

I knew I was good at something!

I'll go fix.

Thanks,

-- Steve

> 
>                Linus "my mom called me 'special' too" Torvalds

Re: [PATCH][GIT PULL][v3.3] ktest: Fix make_min_config test when build fails

[Linus Torvalds]

On Mon, Feb 27, 2012 at 3:32 PM, Steven Rostedt <rostedt@goodmis.org> wrote:
>
> I knew I was good at something!

There's a print for that.

  http://www.despair.com/mis24x30prin.html

Heh.

                   Linus

Re: [PATCH][GIT PULL][v3.3] ktest: Fix make_min_config test when build fails

[Steven Rostedt]

On Mon, 2012-02-27 at 15:36 -0800, Linus Torvalds wrote:
> On Mon, Feb 27, 2012 at 3:32 PM, Steven Rostedt <rostedt@goodmis.org> wrote:
> >
> > I knew I was good at something!
> 
> There's a print for that.
> 
>   http://www.despair.com/mis24x30prin.html
> 

Updated to represent recent events.

http://rostedt.homelinux.com/private/mistakesdemotivator2.jpg

OK, I'm bad.

-- Steve

Re: [PATCH][GIT PULL][v3.3] ktest: Fix make_min_config test when build fails

[Steven Rostedt]

On Mon, 2012-02-27 at 15:26 -0800, Linus Torvalds wrote:
> On Mon, Feb 27, 2012 at 11:17 AM, Steven Rostedt <rostedt@goodmis.org> wrote:
> >
> > 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
> 
> I'm getting "Already up-to-date" with that tag. It points to your old
> commit be405f95f0a0 ("ktest: Add INGORE_ERRORS to ignore warnings in
> boot up") and normally I'd ask whether you perhaps forgot to push, but
> considering the fairly unique naming of that tag, you clearly *did*
> push.

New tag, with the real commit in it.


ktest-fix-make-min-failed-build-for-real

Thanks,

-- Steve

Re: [PATCH][GIT PULL][v3.3] ktest: Fix make_min_config test when build fails

[Linus Torvalds]

On Mon, Feb 27, 2012 at 3:38 PM, Steven Rostedt <rostedt@goodmis.org> wrote:
>
> New tag, with the real commit in it.
>
> ktest-fix-make-min-failed-build-for-real

Pulled for real this time,

                Linus