Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+19 -8
+14 -7
tools/testing/ktest/config-bisect.pl
··· 52 52 53 53 # If "good" or "bad" is not stated at the end, it will copy the good and 54 54 # bad configs to the .tmp versions. If a .tmp version already exists, it will 55 - # warn before writing over them. If the last config is labeled "good", then 56 - # it will copy it to the good .tmp version. If the last config is labeled 57 - # "bad", it will copy it to the bad .tmp version. It will continue this until 58 - # it can not merge the two any more without the result being equal to either 59 - # the good or bad .tmp configs. 55 + # warn before writing over them (-r will not warn, and just write over them). 56 + # If the last config is labeled "good", then it will copy it to the good .tmp 57 + # version. If the last config is labeled "bad", it will copy it to the bad 58 + # .tmp version. It will continue this until it can not merge the two any more 59 + # without the result being equal to either the good or bad .tmp configs. 60 60 61 61 my $start = 0; 62 62 my $val = ""; ··· 67 67 my $build; 68 68 69 69 my $output_config; 70 + my $reset_bisect; 70 71 71 72 sub usage { 72 73 print << "EOF" ··· 655 654 $tree = $val; 656 655 } 657 656 657 + elsif ($opt eq "-r") { 658 + $reset_bisect = 1; 659 + } 660 + 658 661 elsif ($opt eq "-h") { 659 662 usage; 660 663 } ··· 726 721 $p = "$p$bad exists\n"; 727 722 } 728 723 729 - if (!read_yn "${p}Overwrite and start new bisect anyway?") { 730 - exit (-1); 724 + if (!defined($reset_bisect)) { 725 + if (!read_yn "${p}Overwrite and start new bisect anyway?") { 726 + exit (-1); 727 + } 731 728 } 732 729 } 733 730 run_command "cp $good_start $good" or die "failed to copy to $good\n";
+5 -1
tools/testing/ktest/ktest.pl
··· 3127 3127 3128 3128 sub run_config_bisect { 3129 3129 my ($good, $bad, $last_result) = @_; 3130 + my $reset = ""; 3130 3131 my $cmd; 3131 3132 my $ret; 3132 3133 3133 - run_command "$builddir/tools/testing/ktest/config-bisect.pl -b $outputdir $good $bad $last_result", 1; 3134 + if (!length($last_result)) { 3135 + $reset = "-r"; 3136 + } 3137 + run_command "$builddir/tools/testing/ktest/config-bisect.pl $reset -b $outputdir $good $bad $last_result", 1; 3134 3138 3135 3139 # config-bisect returns: 3136 3140 # 0 if there is more to bisect