diff options
| -rwxr-xr-x | tools/testing/ktest/ktest.pl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index 177319822401..6ae890a0d486 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl | |||
| @@ -2105,7 +2105,7 @@ sub get_version { | |||
| 2105 | $have_version = 1; | 2105 | $have_version = 1; |
| 2106 | } | 2106 | } |
| 2107 | 2107 | ||
| 2108 | sub start_monitor_and_boot { | 2108 | sub start_monitor_and_install { |
| 2109 | # Make sure the stable kernel has finished booting | 2109 | # Make sure the stable kernel has finished booting |
| 2110 | 2110 | ||
| 2111 | # Install bisects, don't need console | 2111 | # Install bisects, don't need console |
| @@ -2656,7 +2656,7 @@ sub run_bisect_test { | |||
| 2656 | dodie "Failed on build" if $failed; | 2656 | dodie "Failed on build" if $failed; |
| 2657 | 2657 | ||
| 2658 | # Now boot the box | 2658 | # Now boot the box |
| 2659 | start_monitor_and_boot or $failed = 1; | 2659 | start_monitor_and_install or $failed = 1; |
| 2660 | 2660 | ||
| 2661 | if ($type ne "boot") { | 2661 | if ($type ne "boot") { |
| 2662 | if ($failed && $bisect_skip) { | 2662 | if ($failed && $bisect_skip) { |
| @@ -3400,7 +3400,7 @@ sub patchcheck { | |||
| 3400 | 3400 | ||
| 3401 | my $failed = 0; | 3401 | my $failed = 0; |
| 3402 | 3402 | ||
| 3403 | start_monitor_and_boot or $failed = 1; | 3403 | start_monitor_and_install or $failed = 1; |
| 3404 | 3404 | ||
| 3405 | if (!$failed && $type ne "boot"){ | 3405 | if (!$failed && $type ne "boot"){ |
| 3406 | do_run_test or $failed = 1; | 3406 | do_run_test or $failed = 1; |
| @@ -3864,7 +3864,7 @@ sub make_min_config { | |||
| 3864 | my $failed = 0; | 3864 | my $failed = 0; |
| 3865 | build "oldconfig" or $failed = 1; | 3865 | build "oldconfig" or $failed = 1; |
| 3866 | if (!$failed) { | 3866 | if (!$failed) { |
| 3867 | start_monitor_and_boot or $failed = 1; | 3867 | start_monitor_and_install or $failed = 1; |
| 3868 | 3868 | ||
| 3869 | if ($type eq "test" && !$failed) { | 3869 | if ($type eq "test" && !$failed) { |
| 3870 | do_run_test or $failed = 1; | 3870 | do_run_test or $failed = 1; |
| @@ -4273,7 +4273,7 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) { | |||
| 4273 | 4273 | ||
| 4274 | if ($test_type ne "build") { | 4274 | if ($test_type ne "build") { |
| 4275 | my $failed = 0; | 4275 | my $failed = 0; |
| 4276 | start_monitor_and_boot or $failed = 1; | 4276 | start_monitor_and_install or $failed = 1; |
| 4277 | 4277 | ||
| 4278 | if (!$failed && $test_type ne "boot" && defined($run_test)) { | 4278 | if (!$failed && $test_type ne "boot" && defined($run_test)) { |
| 4279 | do_run_test or $failed = 1; | 4279 | do_run_test or $failed = 1; |
