Merge tag 'ktest-v3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest

torvalds · torvalds · commit 5a5210c6adad · 2012-10-28T11:14:52.000-07:00
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
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -1740,8 +1740,10 @@ sub install {`
`1740`	`1740`	`open(IN, "$output_config") or dodie("Can't read config file");`
`1741`	`1741`	`while (<IN>) {`
`1742`	`1742`	`if (/CONFIG_MODULES(=y)?/) {`
`1743`		`- $install_mods = 1 if (defined($1));`
`1744`		`- last;`
	`1743`	`+ if (defined($1)) {`
	`1744`	`+ $install_mods = 1;`
	`1745`	`+ last;`
	`1746`	`+ }`
`1745`	`1747`	`}`
`1746`	`1748`	`}`
`1747`	`1749`	`close(IN);`