[for-next][PATCH 10/23] ktest.pl: Use diffconfig if available for failed config bisects

From: Steven Rostedt
Date: Sun Apr 08 2018 - 16:21:50 EST


From: "Steven Rostedt (VMware)" <rostedt@xxxxxxxxxxx>

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: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
---
tools/testing/ktest/ktest.pl | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 79c2f99629de..27505fef2dab 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -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";
}

--
2.16.3