summaryrefslogtreecommitdiffstats
path: root/tools/testing
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-10-22 10:11:47 -0400
committerSteven Rostedt <rostedt@goodmis.org>2014-11-21 19:38:56 -0500
commit9972fc0b859e7aaeb6d2d33bdb591959d9a436c0 (patch)
treeb92258be1c4e5037eb693907b4048ad5c5b971bd /tools/testing
parent52d21580b3623e0b5f0b8de5d67b5431507720e5 (diff)
downloadop-kernel-dev-9972fc0b859e7aaeb6d2d33bdb591959d9a436c0.zip
op-kernel-dev-9972fc0b859e7aaeb6d2d33bdb591959d9a436c0.tar.gz
ktest: Fix make_min_config to handle new assign_configs call
Commit 6071c22e1755 "ktest: Rewrite the config-bisect to actually work" fixed the config-bisect to work nicely but in doing so it broke make_min_config by changing the way assign_configs works. The assign_configs function now adds the config to the hash even if it is disabled, but changes the hash value to be that of the line "# CONFIG_FOO is not set". Unfortunately, the make_min_config test only checks to see if the config is removed. It now needs to check if the config is in the hash and not set to be disabled. Cc: stable@vger.kernel.org # 3.17+ Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'tools/testing')
-rwxr-xr-xtools/testing/ktest/ktest.pl4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 60fe020..89c2257 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -3571,7 +3571,9 @@ sub test_this_config {
undef %configs;
assign_configs \%configs, $output_config;
- return $config if (!defined($configs{$config}));
+ if (!defined($configs{$config}) || $configs{$config} =~ /^#/) {
+ return $config;
+ }
doprint "disabling config $config did not change .config\n";
OpenPOWER on IntegriCloud