Commit b2b07ea2 authored by Steven Rostedt (VMware)'s avatar Steven Rostedt (VMware)
Browse files

ktest.pl: Use diffconfig if available for failed config bisects 



Check to see if diffconfig is available and use that to diff the configs
instead of using 'diff -u', as diffconfig produces much better output of
kernel config files. It checks the source directory for the executable.

Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent b337f979

tools/testing/ktest/ktest.pl

+5 −1
Original line number Diff line number Diff line
@@ -3114,10 +3114,14 @@ sub run_config_bisect_test { 


sub config_bisect_end {

    my ($good, $bad) = @_;

    my $diffexec = "diff -u";



    if (-f "$builddir/scripts/diffconfig") {

	$diffexec = "$builddir/scripts/diffconfig";

    }

    doprint "\n\n***************************************\n";

    doprint "No more config bisecting possible.\n";

    doprint `diff -u $good $bad`;

    run_command "$diffexec $good $bad", 1;

    doprint "***************************************\n\n";

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE