Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest

Browse source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest:
  ktest: Ignore unset values of the minconfig in config_bisect
  ktest: Fix result of rebooting the kernel
  ktest: Fix off-by-one in config bisect result
This commit is contained in:
Linus Torvalds 2011-06-04 07:58:48 +09:00
commit 9a44fde343
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/testing/ktest/ktest.pl
View file

@ -788,7 +788,7 @@ sub wait_for_input
sub reboot_to { sub reboot_to {
if ($reboot_type eq "grub") { if ($reboot_type eq "grub") {
run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch; reboot)'"; run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch && reboot)'";
return; return;
} }
@ -1480,7 +1480,7 @@ sub process_config_ignore {
or dodie "Failed to read $config"; or dodie "Failed to read $config";
while (<IN>) { while (<IN>) {
if (/^(.*?(CONFIG\S*)(=.*| is not set))/) { if (/^((CONFIG\S*)=.*)/) {
$config_ignore{$2} = $1; $config_ignore{$2} = $1;
} }
} }
@ -1638,7 +1638,7 @@ sub run_config_bisect {
if (!$found) { if (!$found) {
# try the other half # try the other half
doprint "Top half produced no set configs, trying bottom half\n"; doprint "Top half produced no set configs, trying bottom half\n";
@tophalf = @start_list[$half .. $#start_list]; @tophalf = @start_list[$half + 1 .. $#start_list];
create_config @tophalf; create_config @tophalf;
read_current_config \%current_config; read_current_config \%current_config;
foreach my $config (@tophalf) { foreach my $config (@tophalf) {
@ -1690,7 +1690,7 @@ sub run_config_bisect {
# remove half the configs we are looking at and see if # remove half the configs we are looking at and see if
# they are good. # they are good.
$half = int($#start_list / 2); $half = int($#start_list / 2);
} while ($half > 0); } while ($#start_list > 0);
# we found a single config, try it again unless we are running manually # we found a single config, try it again unless we are running manually