aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/ktest/ktest.pl
diff options
context:
space:
mode:
Diffstat (limited to 'tools/testing/ktest/ktest.pl')
-rwxr-xr-xtools/testing/ktest/ktest.pl10
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index ca6ff99ab1a5..74fb2acae18d 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -42,6 +42,7 @@ $default{"BISECT_MANUAL"} = 0;
42$default{"BISECT_SKIP"} = 1; 42$default{"BISECT_SKIP"} = 1;
43$default{"SUCCESS_LINE"} = "login:"; 43$default{"SUCCESS_LINE"} = "login:";
44$default{"DETECT_TRIPLE_FAULT"} = 1; 44$default{"DETECT_TRIPLE_FAULT"} = 1;
45$default{"NO_INSTALL"} = 0;
45$default{"BOOTED_TIMEOUT"} = 1; 46$default{"BOOTED_TIMEOUT"} = 1;
46$default{"DIE_ON_FAILURE"} = 1; 47$default{"DIE_ON_FAILURE"} = 1;
47$default{"SSH_EXEC"} = "ssh \$SSH_USER\@\$MACHINE \$SSH_COMMAND"; 48$default{"SSH_EXEC"} = "ssh \$SSH_USER\@\$MACHINE \$SSH_COMMAND";
@@ -84,6 +85,7 @@ my $grub_number;
84my $target; 85my $target;
85my $make; 86my $make;
86my $post_install; 87my $post_install;
88my $no_install;
87my $noclean; 89my $noclean;
88my $minconfig; 90my $minconfig;
89my $start_minconfig; 91my $start_minconfig;
@@ -1094,6 +1096,8 @@ sub do_post_install {
1094 1096
1095sub install { 1097sub install {
1096 1098
1099 return if ($no_install);
1100
1097 run_scp "$outputdir/$build_target", "$target_image" or 1101 run_scp "$outputdir/$build_target", "$target_image" or
1098 dodie "failed to copy image"; 1102 dodie "failed to copy image";
1099 1103
@@ -2810,6 +2814,7 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
2810 $reboot_type = set_test_option("REBOOT_TYPE", $i); 2814 $reboot_type = set_test_option("REBOOT_TYPE", $i);
2811 $grub_menu = set_test_option("GRUB_MENU", $i); 2815 $grub_menu = set_test_option("GRUB_MENU", $i);
2812 $post_install = set_test_option("POST_INSTALL", $i); 2816 $post_install = set_test_option("POST_INSTALL", $i);
2817 $no_install = set_test_option("NO_INSTALL", $i);
2813 $reboot_script = set_test_option("REBOOT_SCRIPT", $i); 2818 $reboot_script = set_test_option("REBOOT_SCRIPT", $i);
2814 $reboot_on_error = set_test_option("REBOOT_ON_ERROR", $i); 2819 $reboot_on_error = set_test_option("REBOOT_ON_ERROR", $i);
2815 $poweroff_on_error = set_test_option("POWEROFF_ON_ERROR", $i); 2820 $poweroff_on_error = set_test_option("POWEROFF_ON_ERROR", $i);
@@ -2890,8 +2895,11 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
2890 $run_type = "ERROR"; 2895 $run_type = "ERROR";
2891 } 2896 }
2892 2897
2898 my $installme = "";
2899 $installme = " no_install" if ($no_install);
2900
2893 doprint "\n\n"; 2901 doprint "\n\n";
2894 doprint "RUNNING TEST $i of $opt{NUM_TESTS} with option $test_type $run_type\n\n"; 2902 doprint "RUNNING TEST $i of $opt{NUM_TESTS} with option $test_type $run_type$installme\n\n";
2895 2903
2896 unlink $dmesg; 2904 unlink $dmesg;
2897 unlink $buildlog; 2905 unlink $buildlog;