Skip to content

Commit

Permalink
Merge tag 'ktest-fix-make-min-failed-build-for-real' of git://git.ker…
Browse files Browse the repository at this point in the history
…nel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest

While demoing ktest at ELC in 2012, it was embarrassing that the
make_min_config test failed to work because the snowball board I was
testing it against had a config that would not build.  But the
make_min_config only tested the testing part and ignored build failures.
The end result was a config file that would not boot.

This time, for real.

* tag 'ktest-fix-make-min-failed-build-for-real' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest: Fix make_min_config test when build fails
  • Loading branch information
torvalds committed Feb 27, 2012
2 parents 5ffca28 + bf1c95a commit 586c6e7
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions tools/testing/ktest/ktest.pl
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 586c6e7

Please sign in to comment.