diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-28 22:14:52 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-28 22:14:52 +0400 |
| commit | 5a5210c6adaddbed823162eb76dfdbac72bdb802 (patch) | |
| tree | f345c8b81254fce96d92b8640bc321899a8ac52e | |
| parent | 8e99165a6fe788aec8cd64596b71cf21db3af047 (diff) | |
| parent | 8bc5e4ea3ea0e24142db2dc941233eab2a223ed4 (diff) | |
| download | linux-5a5210c6adaddbed823162eb76dfdbac72bdb802.tar.xz | |
Merge tag 'ktest-v3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest
Pull ktest confusion fix from Steven Rostedt:
"With the v3.7-rc2 kernel, the network cards on my target boxes were
not being brought up.
I found that the modules for the network was not being installed.
This was due to the config CONFIG_MODULES_USE_ELF_RELA that came
before CONFIG_MODULES, and confused ktest in thinking that
CONFIG_MODULES=y was not found.
Ktest needs to test all configs and not just stop if something starts
with CONFIG_MODULES."
* tag 'ktest-v3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
ktest: Fix ktest confusion with CONFIG_MODULES_USE_ELF_RELA
| -rwxr-xr-x | tools/testing/ktest/ktest.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index b51d787176d3..c7ba7614061b 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -1740,8 +1740,10 @@ sub install { open(IN, "$output_config") or dodie("Can't read config file"); while (<IN>) { if (/CONFIG_MODULES(=y)?/) { - $install_mods = 1 if (defined($1)); - last; + if (defined($1)) { + $install_mods = 1; + last; + } } } close(IN); |