aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/ktest/config-bisect.pl
diff options
context:
space:
mode:
authorSteven Rostedt (VMware) <rostedt@goodmis.org>2018-04-04 15:42:08 -0400
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2018-04-06 14:08:03 -0400
commit133087f0623e927dfdf439a1b6a4e819a7a5f3ea (patch)
tree0c328ac8dbba3638fe0e15443aa4a238484d44d2 /tools/testing/ktest/config-bisect.pl
parentktest.pl: Use diffconfig if available for failed config bisects (diff)
downloadlinux-dev-133087f0623e927dfdf439a1b6a4e819a7a5f3ea.tar.xz
linux-dev-133087f0623e927dfdf439a1b6a4e819a7a5f3ea.zip
ktest.pl: Have ktest.pl pass -r to config-bisect.pl to reset bisect
If config-bisect.pl sees that a config_bisect has already been started, it will ask on the command line if it should bisect or not. This will mess up running config_bisect from ktest.pl. Have ktest.pl pass in '-r' to config-bisect.pl and have config-bisect.pl recognize that to reset without asking. Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'tools/testing/ktest/config-bisect.pl')
-rwxr-xr-xtools/testing/ktest/config-bisect.pl21
1 files changed, 14 insertions, 7 deletions
diff --git a/tools/testing/ktest/config-bisect.pl b/tools/testing/ktest/config-bisect.pl
index 37cd796efa2b..b28feea7c363 100755
--- a/tools/testing/ktest/config-bisect.pl
+++ b/tools/testing/ktest/config-bisect.pl
@@ -52,11 +52,11 @@
# If "good" or "bad" is not stated at the end, it will copy the good and
# bad configs to the .tmp versions. If a .tmp version already exists, it will
-# warn before writing over them. If the last config is labeled "good", then
-# it will copy it to the good .tmp version. If the last config is labeled
-# "bad", it will copy it to the bad .tmp version. It will continue this until
-# it can not merge the two any more without the result being equal to either
-# the good or bad .tmp configs.
+# warn before writing over them (-r will not warn, and just write over them).
+# If the last config is labeled "good", then it will copy it to the good .tmp
+# version. If the last config is labeled "bad", it will copy it to the bad
+# .tmp version. It will continue this until it can not merge the two any more
+# without the result being equal to either the good or bad .tmp configs.
my $start = 0;
my $val = "";
@@ -67,6 +67,7 @@ my $tree = $pwd;
my $build;
my $output_config;
+my $reset_bisect;
sub usage {
print << "EOF"
@@ -654,6 +655,10 @@ while ($#ARGV >= 0) {
$tree = $val;
}
+ elsif ($opt eq "-r") {
+ $reset_bisect = 1;
+ }
+
elsif ($opt eq "-h") {
usage;
}
@@ -721,8 +726,10 @@ if ($start) {
$p = "$p$bad exists\n";
}
- if (!read_yn "${p}Overwrite and start new bisect anyway?") {
- exit (-1);
+ if (!defined($reset_bisect)) {
+ if (!read_yn "${p}Overwrite and start new bisect anyway?") {
+ exit (-1);
+ }
}
}
run_command "cp $good_start $good" or die "failed to copy to $good\n";