path: root/tools/testing
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-28 11:14:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-28 11:14:52 -0700
commit5a5210c6adaddbed823162eb76dfdbac72bdb802 (patch)
treef345c8b81254fce96d92b8640bc321899a8ac52e /tools/testing
parent8e99165a6fe788aec8cd64596b71cf21db3af047 (diff)
parent8bc5e4ea3ea0e24142db2dc941233eab2a223ed4 (diff)
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
Diffstat (limited to 'tools/testing')
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index b51d787176d..c7ba7614061 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;
+ }