[GIT PULL][PATCH] ktest: Fix ktest confusion withCONFIG_MODULES_USE_ELF_RELA

[Steven Rostedt]

Linus,

Please pull the latest ktest-v3.7-rc2 tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git
ktest-v3.7-rc2

Head SHA1: 0979976ee53697f4308578c56abedb9766fea231


Steven Rostedt (1):
      ktest: Fix ktest confusion with CONFIG_MODULES_USE_ELF_RELA

----
 tools/testing/ktest/ktest.pl |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---------------------------
commit 8bc5e4ea3ea0e24142db2dc941233eab2a223ed4
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date:   Fri Oct 26 00:10:32 2012 -0400

    ktest: Fix ktest confusion with CONFIG_MODULES_USE_ELF_RELA
    
    In order to decide if ktest should bother installing modules on the
    target box, it checks if the config file has CONFIG_MODULES=y. But it
    also checks if the '=y' part exists. It only will install modules if the
    config exists and is set with '=y'. But as the regex that was used
    tests:
    
      /^CONFIG_MODULES(=y)?/
    
    this will also match:
    
      CONFIG_MODULES_USE_ELF_RELA
    
    as the '=y' part was optional and it did not test the rest of the line.
    When this happens, ktest will stop checking the rest of the configs but
    it will also think that no modules are needed to be installed. What it
    should do is only jump out of the loop if it actually found a
    CONFIG_MODULES that is set to true.
    
    Otherwise, ktest wont install the necessary modules needed for proper
    booting of the test target.
    
    Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index b51d787..c7ba761 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);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/