summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSteven Rostedt (VMware) <rostedt@goodmis.org>2018-03-22 23:36:34 +0300
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2018-04-06 21:05:39 +0300
commitb2b07ea282721b6c7bed21e95e2c00dd95cb8520 (patch)
treee3a333671f106ce1daef39d6c64695521f6da0b6 /tools
parentb337f9790a0c8f0f01abf9fe3e1f48894b773899 (diff)
downloadlinux-b2b07ea282721b6c7bed21e95e2c00dd95cb8520.tar.xz
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: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/testing/ktest/ktest.pl6
1 files changed, 5 insertions, 1 deletions
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";
}