aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt (VMware) <rostedt@goodmis.org>2018-03-22 16:36:34 -0400
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2018-04-06 14:05:39 -0400
commitb2b07ea282721b6c7bed21e95e2c00dd95cb8520 (patch)
treee3a333671f106ce1daef39d6c64695521f6da0b6
parentb337f9790a0c8f0f01abf9fe3e1f48894b773899 (diff)
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>
-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 {
3114 3114
3115sub config_bisect_end { 3115sub config_bisect_end {
3116 my ($good, $bad) = @_; 3116 my ($good, $bad) = @_;
3117 my $diffexec = "diff -u";
3117 3118
3119 if (-f "$builddir/scripts/diffconfig") {
3120 $diffexec = "$builddir/scripts/diffconfig";
3121 }
3118 doprint "\n\n***************************************\n"; 3122 doprint "\n\n***************************************\n";
3119 doprint "No more config bisecting possible.\n"; 3123 doprint "No more config bisecting possible.\n";
3120 doprint `diff -u $good $bad`; 3124 run_command "$diffexec $good $bad", 1;
3121 doprint "***************************************\n\n"; 3125 doprint "***************************************\n\n";
3122} 3126}
3123 3127