lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'ktest-for-v3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest

Browse Source 
Pull two bug fixes in ktest from Steven Rostedt.

* tag 'ktest-for-v3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest: Fix reboot on success stopping all reboots
  ktest.pl: Fix combined usage of BISECT_REVERSE and BISECT_SKIP
This commit is contained in:
Linus Torvalds
2012-05-01 19:43:34 -07:00
parent 208d501708 759a3cc625
commit b821861b90
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/testing/ktest/ktest.pl
View File

@@ -183,6 +183,9 @@ my %force_config;
# do not force reboots on config problems # do not force reboots on config problems
my $no_reboot = 1; my $no_reboot = 1;
# reboot on success
my $reboot_success = 0;
my %option_map = ( my %option_map = (
"MACHINE" => \$machine, "MACHINE" => \$machine,
"SSH_USER" => \$ssh_user, "SSH_USER" => \$ssh_user,
@@ -2192,7 +2195,7 @@ sub run_bisect {
} }
# Are we looking for where it worked, not failed? # Are we looking for where it worked, not failed?
if ($reverse_bisect) { if ($reverse_bisect && $ret >= 0) {
$ret = !$ret; $ret = !$ret;
} }
@@ -3469,6 +3472,7 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
# Do not reboot on failing test options # Do not reboot on failing test options
$no_reboot = 1; $no_reboot = 1;
$reboot_success = 0;
$iteration = $i; $iteration = $i;
@@ -3554,9 +3558,11 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
die "failed to checkout $checkout"; die "failed to checkout $checkout";
} }
$no_reboot = 0;
# A test may opt to not reboot the box # A test may opt to not reboot the box
if ($reboot_on_success) { if ($reboot_on_success) {
$no_reboot = 0; $reboot_success = 1;
} }
if ($test_type eq "bisect") { if ($test_type eq "bisect") {
@@ -3600,7 +3606,7 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
if ($opt{"POWEROFF_ON_SUCCESS"}) { if ($opt{"POWEROFF_ON_SUCCESS"}) {
halt; halt;
} elsif ($opt{"REBOOT_ON_SUCCESS"} && !do_not_reboot) { } elsif ($opt{"REBOOT_ON_SUCCESS"} && !do_not_reboot && $reboot_success) {
reboot_to_good; reboot_to_good;
} elsif (defined($switch_to_good)) { } elsif (defined($switch_to_good)) {
# still need to get to the good kernel # still need to get to the good kernel