lkml.org 
[lkml]   [2015]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 025/150] ktest: Fix make_min_config to handle new assign_configs call
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>

    commit 9972fc0b859e7aaeb6d2d33bdb591959d9a436c0 upstream.

    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.

    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    tools/testing/ktest/ktest.pl | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- 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";




    \
     
     \ /
      Last update: 2015-01-14 10:01    [W:4.032 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site