diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-27 15:43:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-27 15:43:05 -0800 |
| commit | 586c6e7013c8cbb8c91aaa6568ec349b1dc2c691 (patch) | |
| tree | fe2f2bc2e058730b8fa872d224942729c7c83738 | |
| parent | 5ffca28a4ac7abb8a254fafe6bd03b2f83667df7 (diff) | |
| parent | bf1c95abaf24b56c45f458051c693f31fd9b7052 (diff) | |
Merge tag 'ktest-fix-make-min-failed-build-for-real' of git://git.kernel.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
| -rwxr-xr-x | tools/testing/ktest/ktest.pl | 8 |
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; |