Commit 8bc5e4ea authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt

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: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 6f0c0580
...@@ -1740,8 +1740,10 @@ sub install { ...@@ -1740,8 +1740,10 @@ sub install {
open(IN, "$output_config") or dodie("Can't read config file"); open(IN, "$output_config") or dodie("Can't read config file");
while (<IN>) { while (<IN>) {
if (/CONFIG_MODULES(=y)?/) { if (/CONFIG_MODULES(=y)?/) {
$install_mods = 1 if (defined($1)); if (defined($1)) {
last; $install_mods = 1;
last;
}
} }
} }
close(IN); close(IN);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment