diff options
| -rwxr-xr-x | tools/testing/ktest/ktest.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index 1fd29b2daa92..cef28e6632b9 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl | |||
| @@ -788,7 +788,7 @@ sub wait_for_input | |||
| 788 | 788 | ||
| 789 | sub reboot_to { | 789 | sub reboot_to { |
| 790 | if ($reboot_type eq "grub") { | 790 | if ($reboot_type eq "grub") { |
| 791 | run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch; reboot)'"; | 791 | run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch && reboot)'"; |
| 792 | return; | 792 | return; |
| 793 | } | 793 | } |
| 794 | 794 | ||
| @@ -1480,7 +1480,7 @@ sub process_config_ignore { | |||
| 1480 | or dodie "Failed to read $config"; | 1480 | or dodie "Failed to read $config"; |
| 1481 | 1481 | ||
| 1482 | while (<IN>) { | 1482 | while (<IN>) { |
| 1483 | if (/^(.*?(CONFIG\S*)(=.*| is not set))/) { | 1483 | if (/^((CONFIG\S*)=.*)/) { |
| 1484 | $config_ignore{$2} = $1; | 1484 | $config_ignore{$2} = $1; |
| 1485 | } | 1485 | } |
| 1486 | } | 1486 | } |
| @@ -1638,7 +1638,7 @@ sub run_config_bisect { | |||
| 1638 | if (!$found) { | 1638 | if (!$found) { |
| 1639 | # try the other half | 1639 | # try the other half |
| 1640 | doprint "Top half produced no set configs, trying bottom half\n"; | 1640 | doprint "Top half produced no set configs, trying bottom half\n"; |
| 1641 | @tophalf = @start_list[$half .. $#start_list]; | 1641 | @tophalf = @start_list[$half + 1 .. $#start_list]; |
| 1642 | create_config @tophalf; | 1642 | create_config @tophalf; |
| 1643 | read_current_config \%current_config; | 1643 | read_current_config \%current_config; |
| 1644 | foreach my $config (@tophalf) { | 1644 | foreach my $config (@tophalf) { |
| @@ -1690,7 +1690,7 @@ sub run_config_bisect { | |||
| 1690 | # remove half the configs we are looking at and see if | 1690 | # remove half the configs we are looking at and see if |
| 1691 | # they are good. | 1691 | # they are good. |
| 1692 | $half = int($#start_list / 2); | 1692 | $half = int($#start_list / 2); |
| 1693 | } while ($half > 0); | 1693 | } while ($#start_list > 0); |
| 1694 | 1694 | ||
| 1695 | # we found a single config, try it again unless we are running manually | 1695 | # we found a single config, try it again unless we are running manually |
| 1696 | 1696 | ||
