1 #!/usr/bin/perl -w 1 #!/usr/bin/perl -w
2 # SPDX-License-Identifier: GPL-2.0-only 2 # SPDX-License-Identifier: GPL-2.0-only
3 # 3 #
4 # Copyright 2010 - Steven Rostedt <srostedt@red 4 # Copyright 2010 - Steven Rostedt <srostedt@redhat.com>, Red Hat Inc.
5 # 5 #
6 6
7 use strict; 7 use strict;
8 use IPC::Open2; 8 use IPC::Open2;
9 use Fcntl qw(F_GETFL F_SETFL O_NONBLOCK); 9 use Fcntl qw(F_GETFL F_SETFL O_NONBLOCK);
10 use File::Path qw(mkpath); 10 use File::Path qw(mkpath);
11 use File::Copy qw(cp); 11 use File::Copy qw(cp);
12 use FileHandle; 12 use FileHandle;
13 use FindBin; 13 use FindBin;
14 use IO::Handle; 14 use IO::Handle;
15 15
16 my $VERSION = "0.2"; 16 my $VERSION = "0.2";
17 17
18 $| = 1; 18 $| = 1;
19 19
20 my %opt; 20 my %opt;
21 my %repeat_tests; 21 my %repeat_tests;
22 my %repeats; 22 my %repeats;
23 my %evals; 23 my %evals;
24 24
25 #default opts 25 #default opts
26 my %default = ( 26 my %default = (
27 "MAILER" => "sendmail", 27 "MAILER" => "sendmail", # default mailer
28 "EMAIL_ON_ERROR" => 1, 28 "EMAIL_ON_ERROR" => 1,
29 "EMAIL_WHEN_FINISHED" => 1, 29 "EMAIL_WHEN_FINISHED" => 1,
30 "EMAIL_WHEN_CANCELED" => 0, 30 "EMAIL_WHEN_CANCELED" => 0,
31 "EMAIL_WHEN_STARTED" => 0, 31 "EMAIL_WHEN_STARTED" => 0,
32 "NUM_TESTS" => 1, 32 "NUM_TESTS" => 1,
33 "TEST_TYPE" => "build", 33 "TEST_TYPE" => "build",
34 "BUILD_TYPE" => "oldconfig" 34 "BUILD_TYPE" => "oldconfig",
35 "MAKE_CMD" => "make", 35 "MAKE_CMD" => "make",
36 "CLOSE_CONSOLE_SIGNAL" => "INT", 36 "CLOSE_CONSOLE_SIGNAL" => "INT",
37 "TIMEOUT" => 120, 37 "TIMEOUT" => 120,
38 "TMP_DIR" => "/tmp/ktest 38 "TMP_DIR" => "/tmp/ktest/\${MACHINE}",
39 "SLEEP_TIME" => 60, 39 "SLEEP_TIME" => 60, # sleep time between tests
40 "BUILD_NOCLEAN" => 0, 40 "BUILD_NOCLEAN" => 0,
41 "REBOOT_ON_ERROR" => 0, 41 "REBOOT_ON_ERROR" => 0,
42 "POWEROFF_ON_ERROR" => 0, 42 "POWEROFF_ON_ERROR" => 0,
43 "REBOOT_ON_SUCCESS" => 1, 43 "REBOOT_ON_SUCCESS" => 1,
44 "POWEROFF_ON_SUCCESS" => 0, 44 "POWEROFF_ON_SUCCESS" => 0,
45 "BUILD_OPTIONS" => "", 45 "BUILD_OPTIONS" => "",
46 "BISECT_SLEEP_TIME" => 60, 46 "BISECT_SLEEP_TIME" => 60, # sleep time between bisects
47 "PATCHCHECK_SLEEP_TIME" => 60, 47 "PATCHCHECK_SLEEP_TIME" => 60, # sleep time between patch checks
48 "CLEAR_LOG" => 0, 48 "CLEAR_LOG" => 0,
49 "BISECT_MANUAL" => 0, 49 "BISECT_MANUAL" => 0,
50 "BISECT_SKIP" => 1, 50 "BISECT_SKIP" => 1,
51 "BISECT_TRIES" => 1, 51 "BISECT_TRIES" => 1,
52 "MIN_CONFIG_TYPE" => "boot", 52 "MIN_CONFIG_TYPE" => "boot",
53 "SUCCESS_LINE" => "login:", 53 "SUCCESS_LINE" => "login:",
54 "DETECT_TRIPLE_FAULT" => 1, 54 "DETECT_TRIPLE_FAULT" => 1,
55 "NO_INSTALL" => 0, 55 "NO_INSTALL" => 0,
56 "BOOTED_TIMEOUT" => 1, 56 "BOOTED_TIMEOUT" => 1,
57 "DIE_ON_FAILURE" => 1, 57 "DIE_ON_FAILURE" => 1,
58 "SSH_EXEC" => "ssh \$SSH_ 58 "SSH_EXEC" => "ssh \$SSH_USER\@\$MACHINE \$SSH_COMMAND",
59 "SCP_TO_TARGET" => "scp \$SRC_ 59 "SCP_TO_TARGET" => "scp \$SRC_FILE \$SSH_USER\@\$MACHINE:\$DST_FILE",
60 "SCP_TO_TARGET_INSTALL" => "\${SCP_TO_ 60 "SCP_TO_TARGET_INSTALL" => "\${SCP_TO_TARGET}",
61 "REBOOT" => "ssh \$SSH_ 61 "REBOOT" => "ssh \$SSH_USER\@\$MACHINE reboot",
62 "REBOOT_RETURN_CODE" => 255, 62 "REBOOT_RETURN_CODE" => 255,
63 "STOP_AFTER_SUCCESS" => 10, 63 "STOP_AFTER_SUCCESS" => 10,
64 "STOP_AFTER_FAILURE" => 60, 64 "STOP_AFTER_FAILURE" => 60,
65 "STOP_TEST_AFTER" => 600, 65 "STOP_TEST_AFTER" => 600,
66 "MAX_MONITOR_WAIT" => 1800, 66 "MAX_MONITOR_WAIT" => 1800,
67 "GRUB_REBOOT" => "grub2-rebo 67 "GRUB_REBOOT" => "grub2-reboot",
68 "GRUB_BLS_GET" => "grubby --i 68 "GRUB_BLS_GET" => "grubby --info=ALL",
69 "SYSLINUX" => "extlinux", 69 "SYSLINUX" => "extlinux",
70 "SYSLINUX_PATH" => "/boot/extl 70 "SYSLINUX_PATH" => "/boot/extlinux",
71 "CONNECT_TIMEOUT" => 25, 71 "CONNECT_TIMEOUT" => 25,
72 72
73 # required, and we will ask users if they don' 73 # required, and we will ask users if they don't have them but we keep the default
74 # value something that is common. 74 # value something that is common.
75 "REBOOT_TYPE" => "grub", 75 "REBOOT_TYPE" => "grub",
76 "LOCALVERSION" => "-test", 76 "LOCALVERSION" => "-test",
77 "SSH_USER" => "root", 77 "SSH_USER" => "root",
78 "BUILD_TARGET" => "arch/x86/b 78 "BUILD_TARGET" => "arch/x86/boot/bzImage",
79 "TARGET_IMAGE" => "/boot/vmli 79 "TARGET_IMAGE" => "/boot/vmlinuz-test",
80 80
81 "LOG_FILE" => undef, 81 "LOG_FILE" => undef,
82 "IGNORE_UNUSED" => 0, 82 "IGNORE_UNUSED" => 0,
83 ); 83 );
84 84
85 my $test_log_start = 0; 85 my $test_log_start = 0;
86 86
87 my $ktest_config = "ktest.conf"; 87 my $ktest_config = "ktest.conf";
88 my $version; 88 my $version;
89 my $have_version = 0; 89 my $have_version = 0;
90 my $machine; 90 my $machine;
91 my $last_machine; 91 my $last_machine;
92 my $ssh_user; 92 my $ssh_user;
93 my $tmpdir; 93 my $tmpdir;
94 my $builddir; 94 my $builddir;
95 my $outputdir; 95 my $outputdir;
96 my $output_config; 96 my $output_config;
97 my $test_type; 97 my $test_type;
98 my $build_type; 98 my $build_type;
99 my $build_options; 99 my $build_options;
100 my $final_post_ktest; 100 my $final_post_ktest;
101 my $pre_ktest; 101 my $pre_ktest;
102 my $post_ktest; 102 my $post_ktest;
103 my $pre_test; 103 my $pre_test;
104 my $pre_test_die; 104 my $pre_test_die;
105 my $post_test; 105 my $post_test;
106 my $pre_build; 106 my $pre_build;
107 my $post_build; 107 my $post_build;
108 my $pre_build_die; 108 my $pre_build_die;
109 my $post_build_die; 109 my $post_build_die;
110 my $reboot_type; 110 my $reboot_type;
111 my $reboot_script; 111 my $reboot_script;
112 my $power_cycle; 112 my $power_cycle;
113 my $reboot; 113 my $reboot;
114 my $reboot_return_code; 114 my $reboot_return_code;
115 my $reboot_on_error; 115 my $reboot_on_error;
116 my $switch_to_good; 116 my $switch_to_good;
117 my $switch_to_test; 117 my $switch_to_test;
118 my $poweroff_on_error; 118 my $poweroff_on_error;
119 my $reboot_on_success; 119 my $reboot_on_success;
120 my $die_on_failure; 120 my $die_on_failure;
121 my $powercycle_after_reboot; 121 my $powercycle_after_reboot;
122 my $poweroff_after_halt; 122 my $poweroff_after_halt;
123 my $max_monitor_wait; 123 my $max_monitor_wait;
124 my $ssh_exec; 124 my $ssh_exec;
125 my $scp_to_target; 125 my $scp_to_target;
126 my $scp_to_target_install; 126 my $scp_to_target_install;
127 my $power_off; 127 my $power_off;
128 my $grub_menu; 128 my $grub_menu;
129 my $last_grub_menu; 129 my $last_grub_menu;
130 my $grub_file; 130 my $grub_file;
131 my $grub_number; 131 my $grub_number;
132 my $grub_reboot; 132 my $grub_reboot;
133 my $grub_bls_get; 133 my $grub_bls_get;
134 my $syslinux; 134 my $syslinux;
135 my $syslinux_path; 135 my $syslinux_path;
136 my $syslinux_label; 136 my $syslinux_label;
137 my $target; 137 my $target;
138 my $make; 138 my $make;
139 my $pre_install; 139 my $pre_install;
140 my $post_install; 140 my $post_install;
141 my $no_install; 141 my $no_install;
142 my $noclean; 142 my $noclean;
143 my $minconfig; 143 my $minconfig;
144 my $start_minconfig; 144 my $start_minconfig;
145 my $start_minconfig_defined; 145 my $start_minconfig_defined;
146 my $output_minconfig; 146 my $output_minconfig;
147 my $minconfig_type; 147 my $minconfig_type;
148 my $use_output_minconfig; 148 my $use_output_minconfig;
149 my $warnings_file; 149 my $warnings_file;
150 my $ignore_config; 150 my $ignore_config;
151 my $ignore_errors; 151 my $ignore_errors;
152 my $addconfig; 152 my $addconfig;
153 my $in_bisect = 0; 153 my $in_bisect = 0;
154 my $bisect_bad_commit = ""; 154 my $bisect_bad_commit = "";
155 my $reverse_bisect; 155 my $reverse_bisect;
156 my $bisect_manual; 156 my $bisect_manual;
157 my $bisect_skip; 157 my $bisect_skip;
158 my $bisect_tries; 158 my $bisect_tries;
159 my $config_bisect_good; 159 my $config_bisect_good;
160 my $bisect_ret_good; 160 my $bisect_ret_good;
161 my $bisect_ret_bad; 161 my $bisect_ret_bad;
162 my $bisect_ret_skip; 162 my $bisect_ret_skip;
163 my $bisect_ret_abort; 163 my $bisect_ret_abort;
164 my $bisect_ret_default; 164 my $bisect_ret_default;
165 my $in_patchcheck = 0; 165 my $in_patchcheck = 0;
166 my $run_test; 166 my $run_test;
167 my $buildlog; 167 my $buildlog;
168 my $testlog; 168 my $testlog;
169 my $dmesg; 169 my $dmesg;
170 my $monitor_fp; 170 my $monitor_fp;
171 my $monitor_pid; 171 my $monitor_pid;
172 my $monitor_cnt = 0; 172 my $monitor_cnt = 0;
173 my $sleep_time; 173 my $sleep_time;
174 my $bisect_sleep_time; 174 my $bisect_sleep_time;
175 my $patchcheck_sleep_time; 175 my $patchcheck_sleep_time;
176 my $ignore_warnings; 176 my $ignore_warnings;
177 my $store_failures; 177 my $store_failures;
178 my $store_successes; 178 my $store_successes;
179 my $test_name; 179 my $test_name;
180 my $timeout; 180 my $timeout;
181 my $run_timeout; 181 my $run_timeout;
182 my $connect_timeout; 182 my $connect_timeout;
183 my $config_bisect_exec; 183 my $config_bisect_exec;
184 my $booted_timeout; 184 my $booted_timeout;
185 my $detect_triplefault; 185 my $detect_triplefault;
186 my $console; 186 my $console;
187 my $close_console_signal; 187 my $close_console_signal;
188 my $reboot_success_line; 188 my $reboot_success_line;
189 my $success_line; 189 my $success_line;
190 my $stop_after_success; 190 my $stop_after_success;
191 my $stop_after_failure; 191 my $stop_after_failure;
192 my $stop_test_after; 192 my $stop_test_after;
193 my $build_target; 193 my $build_target;
194 my $target_image; 194 my $target_image;
195 my $checkout; 195 my $checkout;
196 my $localversion; 196 my $localversion;
197 my $iteration = 0; 197 my $iteration = 0;
198 my $successes = 0; 198 my $successes = 0;
199 my $stty_orig; 199 my $stty_orig;
200 my $run_command_status = 0; 200 my $run_command_status = 0;
201 201
202 my $bisect_good; 202 my $bisect_good;
203 my $bisect_bad; 203 my $bisect_bad;
204 my $bisect_type; 204 my $bisect_type;
205 my $bisect_start; 205 my $bisect_start;
206 my $bisect_replay; 206 my $bisect_replay;
207 my $bisect_files; 207 my $bisect_files;
208 my $bisect_reverse; 208 my $bisect_reverse;
209 my $bisect_check; 209 my $bisect_check;
210 210
211 my $config_bisect; 211 my $config_bisect;
212 my $config_bisect_type; 212 my $config_bisect_type;
213 my $config_bisect_check; 213 my $config_bisect_check;
214 214
215 my $patchcheck_type; 215 my $patchcheck_type;
216 my $patchcheck_start; 216 my $patchcheck_start;
217 my $patchcheck_cherry; 217 my $patchcheck_cherry;
218 my $patchcheck_end; 218 my $patchcheck_end;
219 219
220 my $build_time; 220 my $build_time;
221 my $install_time; 221 my $install_time;
222 my $reboot_time; 222 my $reboot_time;
223 my $test_time; 223 my $test_time;
224 224
225 my $warning_found = 0; <<
226 <<
227 my $pwd; 225 my $pwd;
228 my $dirname = $FindBin::Bin; 226 my $dirname = $FindBin::Bin;
229 227
230 my $mailto; 228 my $mailto;
231 my $mailer; 229 my $mailer;
232 my $mail_path; 230 my $mail_path;
233 my $mail_max_size; 231 my $mail_max_size;
234 my $mail_command; 232 my $mail_command;
235 my $email_on_error; 233 my $email_on_error;
236 my $email_when_finished; 234 my $email_when_finished;
237 my $email_when_started; 235 my $email_when_started;
238 my $email_when_canceled; 236 my $email_when_canceled;
239 237
240 my $script_start_time = localtime(); 238 my $script_start_time = localtime();
241 239
242 # set when a test is something other that just 240 # set when a test is something other that just building or install
243 # which would require more options. 241 # which would require more options.
244 my $buildonly = 1; 242 my $buildonly = 1;
245 243
246 # tell build not to worry about warnings, even 244 # tell build not to worry about warnings, even when WARNINGS_FILE is set
247 my $warnings_ok = 0; 245 my $warnings_ok = 0;
248 246
249 # set when creating a new config 247 # set when creating a new config
250 my $newconfig = 0; 248 my $newconfig = 0;
251 249
252 my %entered_configs; 250 my %entered_configs;
253 my %config_help; 251 my %config_help;
254 my %variable; 252 my %variable;
255 253
256 # force_config is the list of configs that we 254 # force_config is the list of configs that we force enabled (or disabled)
257 # in a .config file. The MIN_CONFIG and ADD_CO 255 # in a .config file. The MIN_CONFIG and ADD_CONFIG configs.
258 my %force_config; 256 my %force_config;
259 257
260 # do not force reboots on config problems 258 # do not force reboots on config problems
261 my $no_reboot = 1; 259 my $no_reboot = 1;
262 260
263 # reboot on success 261 # reboot on success
264 my $reboot_success = 0; 262 my $reboot_success = 0;
265 263
266 my %option_map = ( 264 my %option_map = (
267 "MAILTO" => \$mailto, 265 "MAILTO" => \$mailto,
268 "MAILER" => \$mailer, 266 "MAILER" => \$mailer,
269 "MAIL_PATH" => \$mail_path 267 "MAIL_PATH" => \$mail_path,
270 "MAIL_MAX_SIZE" => \$mail_max_ 268 "MAIL_MAX_SIZE" => \$mail_max_size,
271 "MAIL_COMMAND" => \$mail_comm 269 "MAIL_COMMAND" => \$mail_command,
272 "EMAIL_ON_ERROR" => \$email_on_ 270 "EMAIL_ON_ERROR" => \$email_on_error,
273 "EMAIL_WHEN_FINISHED" => \$email_whe 271 "EMAIL_WHEN_FINISHED" => \$email_when_finished,
274 "EMAIL_WHEN_STARTED" => \$email_whe 272 "EMAIL_WHEN_STARTED" => \$email_when_started,
275 "EMAIL_WHEN_CANCELED" => \$email_whe 273 "EMAIL_WHEN_CANCELED" => \$email_when_canceled,
276 "MACHINE" => \$machine, 274 "MACHINE" => \$machine,
277 "SSH_USER" => \$ssh_user, 275 "SSH_USER" => \$ssh_user,
278 "TMP_DIR" => \$tmpdir, 276 "TMP_DIR" => \$tmpdir,
279 "OUTPUT_DIR" => \$outputdir 277 "OUTPUT_DIR" => \$outputdir,
280 "BUILD_DIR" => \$builddir, 278 "BUILD_DIR" => \$builddir,
281 "TEST_TYPE" => \$test_type 279 "TEST_TYPE" => \$test_type,
282 "PRE_KTEST" => \$pre_ktest 280 "PRE_KTEST" => \$pre_ktest,
283 "POST_KTEST" => \$post_ktes 281 "POST_KTEST" => \$post_ktest,
284 "PRE_TEST" => \$pre_test, 282 "PRE_TEST" => \$pre_test,
285 "PRE_TEST_DIE" => \$pre_test_ 283 "PRE_TEST_DIE" => \$pre_test_die,
286 "POST_TEST" => \$post_test 284 "POST_TEST" => \$post_test,
287 "BUILD_TYPE" => \$build_typ 285 "BUILD_TYPE" => \$build_type,
288 "BUILD_OPTIONS" => \$build_opt 286 "BUILD_OPTIONS" => \$build_options,
289 "PRE_BUILD" => \$pre_build 287 "PRE_BUILD" => \$pre_build,
290 "POST_BUILD" => \$post_buil 288 "POST_BUILD" => \$post_build,
291 "PRE_BUILD_DIE" => \$pre_build 289 "PRE_BUILD_DIE" => \$pre_build_die,
292 "POST_BUILD_DIE" => \$post_buil 290 "POST_BUILD_DIE" => \$post_build_die,
293 "POWER_CYCLE" => \$power_cyc 291 "POWER_CYCLE" => \$power_cycle,
294 "REBOOT" => \$reboot, 292 "REBOOT" => \$reboot,
295 "REBOOT_RETURN_CODE" => \$reboot_re 293 "REBOOT_RETURN_CODE" => \$reboot_return_code,
296 "BUILD_NOCLEAN" => \$noclean, 294 "BUILD_NOCLEAN" => \$noclean,
297 "MIN_CONFIG" => \$minconfig 295 "MIN_CONFIG" => \$minconfig,
298 "OUTPUT_MIN_CONFIG" => \$output_mi 296 "OUTPUT_MIN_CONFIG" => \$output_minconfig,
299 "START_MIN_CONFIG" => \$start_min 297 "START_MIN_CONFIG" => \$start_minconfig,
300 "MIN_CONFIG_TYPE" => \$minconfig 298 "MIN_CONFIG_TYPE" => \$minconfig_type,
301 "USE_OUTPUT_MIN_CONFIG" => \$use_outpu 299 "USE_OUTPUT_MIN_CONFIG" => \$use_output_minconfig,
302 "WARNINGS_FILE" => \$warnings_ 300 "WARNINGS_FILE" => \$warnings_file,
303 "IGNORE_CONFIG" => \$ignore_co 301 "IGNORE_CONFIG" => \$ignore_config,
304 "TEST" => \$run_test, 302 "TEST" => \$run_test,
305 "ADD_CONFIG" => \$addconfig 303 "ADD_CONFIG" => \$addconfig,
306 "REBOOT_TYPE" => \$reboot_ty 304 "REBOOT_TYPE" => \$reboot_type,
307 "GRUB_MENU" => \$grub_menu 305 "GRUB_MENU" => \$grub_menu,
308 "GRUB_FILE" => \$grub_file 306 "GRUB_FILE" => \$grub_file,
309 "GRUB_REBOOT" => \$grub_rebo 307 "GRUB_REBOOT" => \$grub_reboot,
310 "GRUB_BLS_GET" => \$grub_bls_ 308 "GRUB_BLS_GET" => \$grub_bls_get,
311 "SYSLINUX" => \$syslinux, 309 "SYSLINUX" => \$syslinux,
312 "SYSLINUX_PATH" => \$syslinux_ 310 "SYSLINUX_PATH" => \$syslinux_path,
313 "SYSLINUX_LABEL" => \$syslinux_ 311 "SYSLINUX_LABEL" => \$syslinux_label,
314 "PRE_INSTALL" => \$pre_insta 312 "PRE_INSTALL" => \$pre_install,
315 "POST_INSTALL" => \$post_inst 313 "POST_INSTALL" => \$post_install,
316 "NO_INSTALL" => \$no_instal 314 "NO_INSTALL" => \$no_install,
317 "REBOOT_SCRIPT" => \$reboot_sc 315 "REBOOT_SCRIPT" => \$reboot_script,
318 "REBOOT_ON_ERROR" => \$reboot_on 316 "REBOOT_ON_ERROR" => \$reboot_on_error,
319 "SWITCH_TO_GOOD" => \$switch_to 317 "SWITCH_TO_GOOD" => \$switch_to_good,
320 "SWITCH_TO_TEST" => \$switch_to 318 "SWITCH_TO_TEST" => \$switch_to_test,
321 "POWEROFF_ON_ERROR" => \$poweroff_ 319 "POWEROFF_ON_ERROR" => \$poweroff_on_error,
322 "REBOOT_ON_SUCCESS" => \$reboot_on 320 "REBOOT_ON_SUCCESS" => \$reboot_on_success,
323 "DIE_ON_FAILURE" => \$die_on_fa 321 "DIE_ON_FAILURE" => \$die_on_failure,
324 "POWER_OFF" => \$power_off 322 "POWER_OFF" => \$power_off,
325 "POWERCYCLE_AFTER_REBOOT" => \$powercycl 323 "POWERCYCLE_AFTER_REBOOT" => \$powercycle_after_reboot,
326 "POWEROFF_AFTER_HALT" => \$poweroff_ 324 "POWEROFF_AFTER_HALT" => \$poweroff_after_halt,
327 "MAX_MONITOR_WAIT" => \$max_monit 325 "MAX_MONITOR_WAIT" => \$max_monitor_wait,
328 "SLEEP_TIME" => \$sleep_tim 326 "SLEEP_TIME" => \$sleep_time,
329 "BISECT_SLEEP_TIME" => \$bisect_sl 327 "BISECT_SLEEP_TIME" => \$bisect_sleep_time,
330 "PATCHCHECK_SLEEP_TIME" => \$patchchec 328 "PATCHCHECK_SLEEP_TIME" => \$patchcheck_sleep_time,
331 "IGNORE_WARNINGS" => \$ignore_wa 329 "IGNORE_WARNINGS" => \$ignore_warnings,
332 "IGNORE_ERRORS" => \$ignore_er 330 "IGNORE_ERRORS" => \$ignore_errors,
333 "BISECT_MANUAL" => \$bisect_ma 331 "BISECT_MANUAL" => \$bisect_manual,
334 "BISECT_SKIP" => \$bisect_sk 332 "BISECT_SKIP" => \$bisect_skip,
335 "BISECT_TRIES" => \$bisect_tr 333 "BISECT_TRIES" => \$bisect_tries,
336 "CONFIG_BISECT_GOOD" => \$config_bi 334 "CONFIG_BISECT_GOOD" => \$config_bisect_good,
337 "BISECT_RET_GOOD" => \$bisect_re 335 "BISECT_RET_GOOD" => \$bisect_ret_good,
338 "BISECT_RET_BAD" => \$bisect_re 336 "BISECT_RET_BAD" => \$bisect_ret_bad,
339 "BISECT_RET_SKIP" => \$bisect_re 337 "BISECT_RET_SKIP" => \$bisect_ret_skip,
340 "BISECT_RET_ABORT" => \$bisect_re 338 "BISECT_RET_ABORT" => \$bisect_ret_abort,
341 "BISECT_RET_DEFAULT" => \$bisect_re 339 "BISECT_RET_DEFAULT" => \$bisect_ret_default,
342 "STORE_FAILURES" => \$store_fai 340 "STORE_FAILURES" => \$store_failures,
343 "STORE_SUCCESSES" => \$store_suc 341 "STORE_SUCCESSES" => \$store_successes,
344 "TEST_NAME" => \$test_name 342 "TEST_NAME" => \$test_name,
345 "TIMEOUT" => \$timeout, 343 "TIMEOUT" => \$timeout,
346 "RUN_TIMEOUT" => \$run_timeo 344 "RUN_TIMEOUT" => \$run_timeout,
347 "CONNECT_TIMEOUT" => \$connect_t 345 "CONNECT_TIMEOUT" => \$connect_timeout,
348 "CONFIG_BISECT_EXEC" => \$config_bi 346 "CONFIG_BISECT_EXEC" => \$config_bisect_exec,
349 "BOOTED_TIMEOUT" => \$booted_ti 347 "BOOTED_TIMEOUT" => \$booted_timeout,
350 "CONSOLE" => \$console, 348 "CONSOLE" => \$console,
351 "CLOSE_CONSOLE_SIGNAL" => \$close_con 349 "CLOSE_CONSOLE_SIGNAL" => \$close_console_signal,
352 "DETECT_TRIPLE_FAULT" => \$detect_tr 350 "DETECT_TRIPLE_FAULT" => \$detect_triplefault,
353 "SUCCESS_LINE" => \$success_l 351 "SUCCESS_LINE" => \$success_line,
354 "REBOOT_SUCCESS_LINE" => \$reboot_su 352 "REBOOT_SUCCESS_LINE" => \$reboot_success_line,
355 "STOP_AFTER_SUCCESS" => \$stop_afte 353 "STOP_AFTER_SUCCESS" => \$stop_after_success,
356 "STOP_AFTER_FAILURE" => \$stop_afte 354 "STOP_AFTER_FAILURE" => \$stop_after_failure,
357 "STOP_TEST_AFTER" => \$stop_test 355 "STOP_TEST_AFTER" => \$stop_test_after,
358 "BUILD_TARGET" => \$build_tar 356 "BUILD_TARGET" => \$build_target,
359 "SSH_EXEC" => \$ssh_exec, 357 "SSH_EXEC" => \$ssh_exec,
360 "SCP_TO_TARGET" => \$scp_to_ta 358 "SCP_TO_TARGET" => \$scp_to_target,
361 "SCP_TO_TARGET_INSTALL" => \$scp_to_ta 359 "SCP_TO_TARGET_INSTALL" => \$scp_to_target_install,
362 "CHECKOUT" => \$checkout, 360 "CHECKOUT" => \$checkout,
363 "TARGET_IMAGE" => \$target_im 361 "TARGET_IMAGE" => \$target_image,
364 "LOCALVERSION" => \$localvers 362 "LOCALVERSION" => \$localversion,
365 363
366 "BISECT_GOOD" => \$bisect_go 364 "BISECT_GOOD" => \$bisect_good,
367 "BISECT_BAD" => \$bisect_ba 365 "BISECT_BAD" => \$bisect_bad,
368 "BISECT_TYPE" => \$bisect_ty 366 "BISECT_TYPE" => \$bisect_type,
369 "BISECT_START" => \$bisect_st 367 "BISECT_START" => \$bisect_start,
370 "BISECT_REPLAY" => \$bisect_re 368 "BISECT_REPLAY" => \$bisect_replay,
371 "BISECT_FILES" => \$bisect_fi 369 "BISECT_FILES" => \$bisect_files,
372 "BISECT_REVERSE" => \$bisect_re 370 "BISECT_REVERSE" => \$bisect_reverse,
373 "BISECT_CHECK" => \$bisect_ch 371 "BISECT_CHECK" => \$bisect_check,
374 372
375 "CONFIG_BISECT" => \$config_bi 373 "CONFIG_BISECT" => \$config_bisect,
376 "CONFIG_BISECT_TYPE" => \$config_bi 374 "CONFIG_BISECT_TYPE" => \$config_bisect_type,
377 "CONFIG_BISECT_CHECK" => \$config_bi 375 "CONFIG_BISECT_CHECK" => \$config_bisect_check,
378 376
379 "PATCHCHECK_TYPE" => \$patchchec 377 "PATCHCHECK_TYPE" => \$patchcheck_type,
380 "PATCHCHECK_START" => \$patchchec 378 "PATCHCHECK_START" => \$patchcheck_start,
381 "PATCHCHECK_CHERRY" => \$patchchec 379 "PATCHCHECK_CHERRY" => \$patchcheck_cherry,
382 "PATCHCHECK_END" => \$patchchec 380 "PATCHCHECK_END" => \$patchcheck_end,
383 ); 381 );
384 382
385 # Options may be used by other options, record 383 # Options may be used by other options, record them.
386 my %used_options; 384 my %used_options;
387 385
388 # default variables that can be used 386 # default variables that can be used
389 chomp ($variable{"PWD"} = `pwd`); 387 chomp ($variable{"PWD"} = `pwd`);
390 $pwd = $variable{"PWD"}; 388 $pwd = $variable{"PWD"};
391 389
392 $config_help{"MACHINE"} = << "EOF" 390 $config_help{"MACHINE"} = << "EOF"
393 The machine hostname that you will test. 391 The machine hostname that you will test.
394 For build only tests, it is still needed to d 392 For build only tests, it is still needed to differentiate log files.
395 EOF 393 EOF
396 ; 394 ;
397 $config_help{"SSH_USER"} = << "EOF" 395 $config_help{"SSH_USER"} = << "EOF"
398 The box is expected to have ssh on normal boo 396 The box is expected to have ssh on normal bootup, provide the user
399 (most likely root, since you need privileged 397 (most likely root, since you need privileged operations)
400 EOF 398 EOF
401 ; 399 ;
402 $config_help{"BUILD_DIR"} = << "EOF" 400 $config_help{"BUILD_DIR"} = << "EOF"
403 The directory that contains the Linux source 401 The directory that contains the Linux source code (full path).
404 You can use \${PWD} that will be the path whe 402 You can use \${PWD} that will be the path where ktest.pl is run, or use
405 \${THIS_DIR} which is assigned \${PWD} but ma 403 \${THIS_DIR} which is assigned \${PWD} but may be changed later.
406 EOF 404 EOF
407 ; 405 ;
408 $config_help{"OUTPUT_DIR"} = << "EOF" 406 $config_help{"OUTPUT_DIR"} = << "EOF"
409 The directory that the objects will be built 407 The directory that the objects will be built (full path).
410 (can not be same as BUILD_DIR) 408 (can not be same as BUILD_DIR)
411 You can use \${PWD} that will be the path whe 409 You can use \${PWD} that will be the path where ktest.pl is run, or use
412 \${THIS_DIR} which is assigned \${PWD} but ma 410 \${THIS_DIR} which is assigned \${PWD} but may be changed later.
413 EOF 411 EOF
414 ; 412 ;
415 $config_help{"BUILD_TARGET"} = << "EOF" 413 $config_help{"BUILD_TARGET"} = << "EOF"
416 The location of the compiled file to copy to 414 The location of the compiled file to copy to the target.
417 (relative to OUTPUT_DIR) 415 (relative to OUTPUT_DIR)
418 EOF 416 EOF
419 ; 417 ;
420 $config_help{"BUILD_OPTIONS"} = << "EOF" 418 $config_help{"BUILD_OPTIONS"} = << "EOF"
421 Options to add to \"make\" when building. 419 Options to add to \"make\" when building.
422 i.e. -j20 420 i.e. -j20
423 EOF 421 EOF
424 ; 422 ;
425 $config_help{"TARGET_IMAGE"} = << "EOF" 423 $config_help{"TARGET_IMAGE"} = << "EOF"
426 The place to put your image on the test machi 424 The place to put your image on the test machine.
427 EOF 425 EOF
428 ; 426 ;
429 $config_help{"POWER_CYCLE"} = << "EOF" 427 $config_help{"POWER_CYCLE"} = << "EOF"
430 A script or command to reboot the box. 428 A script or command to reboot the box.
431 429
432 Here is a digital loggers power switch exampl 430 Here is a digital loggers power switch example
433 POWER_CYCLE = wget --no-proxy -O /dev/null -q 431 POWER_CYCLE = wget --no-proxy -O /dev/null -q --auth-no-challenge 'http://admin:admin\@power/outlet?5=CCL'
434 432
435 Here is an example to reboot a virtual box on 433 Here is an example to reboot a virtual box on the current host
436 with the name "Guest". 434 with the name "Guest".
437 POWER_CYCLE = virsh destroy Guest; sleep 5; v 435 POWER_CYCLE = virsh destroy Guest; sleep 5; virsh start Guest
438 EOF 436 EOF
439 ; 437 ;
440 $config_help{"CONSOLE"} = << "EOF" 438 $config_help{"CONSOLE"} = << "EOF"
441 The script or command that reads the console 439 The script or command that reads the console
442 440
443 If you use ttywatch server, something like t 441 If you use ttywatch server, something like the following would work.
444 CONSOLE = nc -d localhost 3001 442 CONSOLE = nc -d localhost 3001
445 443
446 For a virtual machine with guest name "Guest" 444 For a virtual machine with guest name "Guest".
447 CONSOLE = virsh console Guest 445 CONSOLE = virsh console Guest
448 EOF 446 EOF
449 ; 447 ;
450 $config_help{"LOCALVERSION"} = << "EOF" 448 $config_help{"LOCALVERSION"} = << "EOF"
451 Required version ending to differentiate the 449 Required version ending to differentiate the test
452 from other linux builds on the system. 450 from other linux builds on the system.
453 EOF 451 EOF
454 ; 452 ;
455 $config_help{"REBOOT_TYPE"} = << "EOF" 453 $config_help{"REBOOT_TYPE"} = << "EOF"
456 Way to reboot the box to the test kernel. 454 Way to reboot the box to the test kernel.
457 Only valid options so far are "grub", "grub2" 455 Only valid options so far are "grub", "grub2", "grub2bls", "syslinux", and "script".
458 456
459 If you specify grub, it will assume grub vers 457 If you specify grub, it will assume grub version 1
460 and will search in /boot/grub/menu.lst for th 458 and will search in /boot/grub/menu.lst for the title \$GRUB_MENU
461 and select that target to reboot to the kerne 459 and select that target to reboot to the kernel. If this is not
462 your setup, then specify "script" and have a 460 your setup, then specify "script" and have a command or script
463 specified in REBOOT_SCRIPT to boot to the tar 461 specified in REBOOT_SCRIPT to boot to the target.
464 462
465 The entry in /boot/grub/menu.lst must be ente 463 The entry in /boot/grub/menu.lst must be entered in manually.
466 The test will not modify that file. 464 The test will not modify that file.
467 465
468 If you specify grub2, then you also need to s 466 If you specify grub2, then you also need to specify both \$GRUB_MENU
469 and \$GRUB_FILE. 467 and \$GRUB_FILE.
470 468
471 If you specify grub2bls, then you also need t 469 If you specify grub2bls, then you also need to specify \$GRUB_MENU.
472 470
473 If you specify syslinux, then you may use SYS 471 If you specify syslinux, then you may use SYSLINUX to define the syslinux
474 command (defaults to extlinux), and SYSLINUX_ 472 command (defaults to extlinux), and SYSLINUX_PATH to specify the path to
475 the syslinux install (defaults to /boot/extli 473 the syslinux install (defaults to /boot/extlinux). But you have to specify
476 SYSLINUX_LABEL to define the label to boot to 474 SYSLINUX_LABEL to define the label to boot to for the test kernel.
477 EOF 475 EOF
478 ; 476 ;
479 $config_help{"GRUB_MENU"} = << "EOF" 477 $config_help{"GRUB_MENU"} = << "EOF"
480 The grub title name for the test kernel to bo 478 The grub title name for the test kernel to boot
481 (Only mandatory if REBOOT_TYPE = grub or grub 479 (Only mandatory if REBOOT_TYPE = grub or grub2)
482 480
483 Note, ktest.pl will not update the grub menu. 481 Note, ktest.pl will not update the grub menu.lst, you need to
484 manually add an option for the test. ktest.pl 482 manually add an option for the test. ktest.pl will search
485 the grub menu.lst for this option to find wha 483 the grub menu.lst for this option to find what kernel to
486 reboot into. 484 reboot into.
487 485
488 For example, if in the /boot/grub/menu.lst th 486 For example, if in the /boot/grub/menu.lst the test kernel title has:
489 title Test Kernel 487 title Test Kernel
490 kernel vmlinuz-test 488 kernel vmlinuz-test
491 GRUB_MENU = Test Kernel 489 GRUB_MENU = Test Kernel
492 490
493 For grub2, a search of \$GRUB_FILE is perform 491 For grub2, a search of \$GRUB_FILE is performed for the lines
494 that begin with "menuentry". It will not dete 492 that begin with "menuentry". It will not detect submenus. The
495 menu must be a non-nested menu. Add the quote 493 menu must be a non-nested menu. Add the quotes used in the menu
496 to guarantee your selection, as the first men 494 to guarantee your selection, as the first menuentry with the content
497 of \$GRUB_MENU that is found will be used. 495 of \$GRUB_MENU that is found will be used.
498 496
499 For grub2bls, \$GRUB_MENU is searched on the 497 For grub2bls, \$GRUB_MENU is searched on the result of \$GRUB_BLS_GET
500 command for the lines that begin with "title" 498 command for the lines that begin with "title".
501 EOF 499 EOF
502 ; 500 ;
503 $config_help{"GRUB_FILE"} = << "EOF" 501 $config_help{"GRUB_FILE"} = << "EOF"
504 If grub2 is used, the full path for the grub. 502 If grub2 is used, the full path for the grub.cfg file is placed
505 here. Use something like /boot/grub2/grub.cfg 503 here. Use something like /boot/grub2/grub.cfg to search.
506 EOF 504 EOF
507 ; 505 ;
508 $config_help{"SYSLINUX_LABEL"} = << "EOF" 506 $config_help{"SYSLINUX_LABEL"} = << "EOF"
509 If syslinux is used, the label that boots the 507 If syslinux is used, the label that boots the target kernel must
510 be specified with SYSLINUX_LABEL. 508 be specified with SYSLINUX_LABEL.
511 EOF 509 EOF
512 ; 510 ;
513 $config_help{"REBOOT_SCRIPT"} = << "EOF" 511 $config_help{"REBOOT_SCRIPT"} = << "EOF"
514 A script to reboot the target into the test k 512 A script to reboot the target into the test kernel
515 (Only mandatory if REBOOT_TYPE = script) 513 (Only mandatory if REBOOT_TYPE = script)
516 EOF 514 EOF
517 ; 515 ;
518 516
519 # used with process_expression() 517 # used with process_expression()
520 my $d = 0; 518 my $d = 0;
521 519
522 # defined before get_test_name() 520 # defined before get_test_name()
523 my $in_die = 0; 521 my $in_die = 0;
524 522
525 # defined before process_warning_line() 523 # defined before process_warning_line()
526 my $check_build_re = ".*:.*(warning|error|Erro 524 my $check_build_re = ".*:.*(warning|error|Error):.*";
527 my $utf8_quote = "\\x{e2}\\x{80}(\\x{98}|\\x{9 525 my $utf8_quote = "\\x{e2}\\x{80}(\\x{98}|\\x{99})";
528 526
529 # defined before child_finished() 527 # defined before child_finished()
530 my $child_done; 528 my $child_done;
531 529
532 # config_ignore holds the configs that were se 530 # config_ignore holds the configs that were set (or unset) for
533 # a good config and we will ignore these confi 531 # a good config and we will ignore these configs for the rest
534 # of a config bisect. These configs stay as th 532 # of a config bisect. These configs stay as they were.
535 my %config_ignore; 533 my %config_ignore;
536 534
537 # config_set holds what all configs were set a 535 # config_set holds what all configs were set as.
538 my %config_set; 536 my %config_set;
539 537
540 # config_off holds the set of configs that the 538 # config_off holds the set of configs that the bad config had disabled.
541 # We need to record them and set them in the . 539 # We need to record them and set them in the .config when running
542 # olddefconfig, because olddefconfig keeps the 540 # olddefconfig, because olddefconfig keeps the defaults.
543 my %config_off; 541 my %config_off;
544 542
545 # config_off_tmp holds a set of configs to tur 543 # config_off_tmp holds a set of configs to turn off for now
546 my @config_off_tmp; 544 my @config_off_tmp;
547 545
548 # config_list is the set of configs that are b 546 # config_list is the set of configs that are being tested
549 my %config_list; 547 my %config_list;
550 my %null_config; 548 my %null_config;
551 549
552 my %dependency; 550 my %dependency;
553 551
554 # found above run_config_bisect() 552 # found above run_config_bisect()
555 my $pass = 1; 553 my $pass = 1;
556 554
557 # found above add_dep() 555 # found above add_dep()
558 556
559 my %depends; 557 my %depends;
560 my %depcount; 558 my %depcount;
561 my $iflevel = 0; 559 my $iflevel = 0;
562 my @ifdeps; 560 my @ifdeps;
563 561
564 # prevent recursion 562 # prevent recursion
565 my %read_kconfigs; 563 my %read_kconfigs;
566 564
567 # found above test_this_config() 565 # found above test_this_config()
568 my %min_configs; 566 my %min_configs;
569 my %keep_configs; 567 my %keep_configs;
570 my %save_configs; 568 my %save_configs;
571 my %processed_configs; 569 my %processed_configs;
572 my %nochange_config; 570 my %nochange_config;
573 571
574 # 572 #
575 # These are first defined here, main function 573 # These are first defined here, main function later on
576 # 574 #
577 sub run_command; 575 sub run_command;
578 sub start_monitor; 576 sub start_monitor;
579 sub end_monitor; 577 sub end_monitor;
580 sub wait_for_monitor; 578 sub wait_for_monitor;
581 579
582 sub _logit { 580 sub _logit {
583 if (defined($opt{"LOG_FILE"})) { 581 if (defined($opt{"LOG_FILE"})) {
584 print LOG @_; 582 print LOG @_;
585 } 583 }
586 } 584 }
587 585
588 sub logit { 586 sub logit {
589 if (defined($opt{"LOG_FILE"})) { 587 if (defined($opt{"LOG_FILE"})) {
590 _logit @_; 588 _logit @_;
591 } else { 589 } else {
592 print @_; 590 print @_;
593 } 591 }
594 } 592 }
595 593
596 sub doprint { 594 sub doprint {
597 print @_; 595 print @_;
598 _logit @_; 596 _logit @_;
599 } 597 }
600 598
601 sub read_prompt { 599 sub read_prompt {
602 my ($cancel, $prompt) = @_; 600 my ($cancel, $prompt) = @_;
603 601
604 my $ans; 602 my $ans;
605 603
606 for (;;) { 604 for (;;) {
607 if ($cancel) { 605 if ($cancel) {
608 print "$prompt [y/n/C] "; 606 print "$prompt [y/n/C] ";
609 } else { 607 } else {
610 print "$prompt [Y/n] "; 608 print "$prompt [Y/n] ";
611 } 609 }
612 $ans = <STDIN>; 610 $ans = <STDIN>;
613 chomp $ans; 611 chomp $ans;
614 if ($ans =~ /^\s*$/) { 612 if ($ans =~ /^\s*$/) {
615 if ($cancel) { 613 if ($cancel) {
616 $ans = "c"; 614 $ans = "c";
617 } else { 615 } else {
618 $ans = "y"; 616 $ans = "y";
619 } 617 }
620 } 618 }
621 last if ($ans =~ /^y$/i || $ans =~ /^n 619 last if ($ans =~ /^y$/i || $ans =~ /^n$/i);
622 if ($cancel) { 620 if ($cancel) {
623 last if ($ans =~ /^c$/i); 621 last if ($ans =~ /^c$/i);
624 print "Please answer either 'y', ' 622 print "Please answer either 'y', 'n' or 'c'.\n";
625 } else { 623 } else {
626 print "Please answer either 'y' or 624 print "Please answer either 'y' or 'n'.\n";
627 } 625 }
628 } 626 }
629 if ($ans =~ /^c/i) { 627 if ($ans =~ /^c/i) {
630 exit; 628 exit;
631 } 629 }
632 if ($ans !~ /^y$/i) { 630 if ($ans !~ /^y$/i) {
633 return 0; 631 return 0;
634 } 632 }
635 return 1; 633 return 1;
636 } 634 }
637 635
638 sub read_yn { 636 sub read_yn {
639 my ($prompt) = @_; 637 my ($prompt) = @_;
640 638
641 return read_prompt 0, $prompt; 639 return read_prompt 0, $prompt;
642 } 640 }
643 641
644 sub read_ync { 642 sub read_ync {
645 my ($prompt) = @_; 643 my ($prompt) = @_;
646 644
647 return read_prompt 1, $prompt; 645 return read_prompt 1, $prompt;
648 } 646 }
649 647
650 sub get_mandatory_config { 648 sub get_mandatory_config {
651 my ($config) = @_; 649 my ($config) = @_;
652 my $ans; 650 my $ans;
653 651
654 return if (defined($opt{$config})); 652 return if (defined($opt{$config}));
655 653
656 if (defined($config_help{$config})) { 654 if (defined($config_help{$config})) {
657 print "\n"; 655 print "\n";
658 print $config_help{$config}; 656 print $config_help{$config};
659 } 657 }
660 658
661 for (;;) { 659 for (;;) {
662 print "$config = "; 660 print "$config = ";
663 if (defined($default{$config}) && leng 661 if (defined($default{$config}) && length($default{$config})) {
664 print "\[$default{$config}\] "; 662 print "\[$default{$config}\] ";
665 } 663 }
666 $ans = <STDIN>; 664 $ans = <STDIN>;
667 $ans =~ s/^\s*(.*\S)\s*$/$1/; 665 $ans =~ s/^\s*(.*\S)\s*$/$1/;
668 if ($ans =~ /^\s*$/) { 666 if ($ans =~ /^\s*$/) {
669 if ($default{$config}) { 667 if ($default{$config}) {
670 $ans = $default{$config}; 668 $ans = $default{$config};
671 } else { 669 } else {
672 print "Your answer can not be 670 print "Your answer can not be blank\n";
673 next; 671 next;
674 } 672 }
675 } 673 }
676 $entered_configs{$config} = ${ans}; 674 $entered_configs{$config} = ${ans};
677 last; 675 last;
678 } 676 }
679 } 677 }
680 678
681 sub show_time { 679 sub show_time {
682 my ($time) = @_; 680 my ($time) = @_;
683 681
684 my $hours = 0; 682 my $hours = 0;
685 my $minutes = 0; 683 my $minutes = 0;
686 684
687 if ($time > 3600) { 685 if ($time > 3600) {
688 $hours = int($time / 3600); 686 $hours = int($time / 3600);
689 $time -= $hours * 3600; 687 $time -= $hours * 3600;
690 } 688 }
691 if ($time > 60) { 689 if ($time > 60) {
692 $minutes = int($time / 60); 690 $minutes = int($time / 60);
693 $time -= $minutes * 60; 691 $time -= $minutes * 60;
694 } 692 }
695 693
696 if ($hours > 0) { 694 if ($hours > 0) {
697 doprint "$hours hour"; 695 doprint "$hours hour";
698 doprint "s" if ($hours > 1); 696 doprint "s" if ($hours > 1);
699 doprint " "; 697 doprint " ";
700 } 698 }
701 699
702 if ($minutes > 0) { 700 if ($minutes > 0) {
703 doprint "$minutes minute"; 701 doprint "$minutes minute";
704 doprint "s" if ($minutes > 1); 702 doprint "s" if ($minutes > 1);
705 doprint " "; 703 doprint " ";
706 } 704 }
707 705
708 doprint "$time second"; 706 doprint "$time second";
709 doprint "s" if ($time != 1); 707 doprint "s" if ($time != 1);
710 } 708 }
711 709
712 sub print_times { 710 sub print_times {
713 doprint "\n"; 711 doprint "\n";
714 if ($build_time) { 712 if ($build_time) {
715 doprint "Build time: "; 713 doprint "Build time: ";
716 show_time($build_time); 714 show_time($build_time);
717 doprint "\n"; 715 doprint "\n";
718 } 716 }
719 if ($install_time) { 717 if ($install_time) {
720 doprint "Install time: "; 718 doprint "Install time: ";
721 show_time($install_time); 719 show_time($install_time);
722 doprint "\n"; 720 doprint "\n";
723 } 721 }
724 if ($reboot_time) { 722 if ($reboot_time) {
725 doprint "Reboot time: "; 723 doprint "Reboot time: ";
726 show_time($reboot_time); 724 show_time($reboot_time);
727 doprint "\n"; 725 doprint "\n";
728 } 726 }
729 if ($test_time) { 727 if ($test_time) {
730 doprint "Test time: "; 728 doprint "Test time: ";
731 show_time($test_time); 729 show_time($test_time);
732 doprint "\n"; 730 doprint "\n";
733 } 731 }
734 if ($warning_found) { <<
735 doprint "\n*** WARNING"; <<
736 doprint "S" if ($warning_found > 1); <<
737 doprint " found in build: $warning_fou <<
738 } <<
739 <<
740 # reset for iterations like bisect 732 # reset for iterations like bisect
741 $build_time = 0; 733 $build_time = 0;
742 $install_time = 0; 734 $install_time = 0;
743 $reboot_time = 0; 735 $reboot_time = 0;
744 $test_time = 0; 736 $test_time = 0;
745 $warning_found = 0; <<
746 } 737 }
747 738
748 sub get_mandatory_configs { 739 sub get_mandatory_configs {
749 get_mandatory_config("MACHINE"); 740 get_mandatory_config("MACHINE");
750 get_mandatory_config("BUILD_DIR"); 741 get_mandatory_config("BUILD_DIR");
751 get_mandatory_config("OUTPUT_DIR"); 742 get_mandatory_config("OUTPUT_DIR");
752 743
753 if ($newconfig) { 744 if ($newconfig) {
754 get_mandatory_config("BUILD_OPTIONS"); 745 get_mandatory_config("BUILD_OPTIONS");
755 } 746 }
756 747
757 # options required for other than just bui 748 # options required for other than just building a kernel
758 if (!$buildonly) { 749 if (!$buildonly) {
759 get_mandatory_config("POWER_CYCLE"); 750 get_mandatory_config("POWER_CYCLE");
760 get_mandatory_config("CONSOLE"); 751 get_mandatory_config("CONSOLE");
761 } 752 }
762 753
763 # options required for install and more 754 # options required for install and more
764 if ($buildonly != 1) { 755 if ($buildonly != 1) {
765 get_mandatory_config("SSH_USER"); 756 get_mandatory_config("SSH_USER");
766 get_mandatory_config("BUILD_TARGET"); 757 get_mandatory_config("BUILD_TARGET");
767 get_mandatory_config("TARGET_IMAGE"); 758 get_mandatory_config("TARGET_IMAGE");
768 } 759 }
769 760
770 get_mandatory_config("LOCALVERSION"); 761 get_mandatory_config("LOCALVERSION");
771 762
772 return if ($buildonly); 763 return if ($buildonly);
773 764
774 my $rtype = $opt{"REBOOT_TYPE"}; 765 my $rtype = $opt{"REBOOT_TYPE"};
775 766
776 if (!defined($rtype)) { 767 if (!defined($rtype)) {
777 if (!defined($opt{"GRUB_MENU"})) { 768 if (!defined($opt{"GRUB_MENU"})) {
778 get_mandatory_config("REBOOT_TYPE" 769 get_mandatory_config("REBOOT_TYPE");
779 $rtype = $entered_configs{"REBOOT_ 770 $rtype = $entered_configs{"REBOOT_TYPE"};
780 } else { 771 } else {
781 $rtype = "grub"; 772 $rtype = "grub";
782 } 773 }
783 } 774 }
784 775
785 if (($rtype eq "grub") or ($rtype eq "grub 776 if (($rtype eq "grub") or ($rtype eq "grub2bls")) {
786 get_mandatory_config("GRUB_MENU"); 777 get_mandatory_config("GRUB_MENU");
787 } 778 }
788 779
789 if ($rtype eq "grub2") { 780 if ($rtype eq "grub2") {
790 get_mandatory_config("GRUB_MENU"); 781 get_mandatory_config("GRUB_MENU");
791 get_mandatory_config("GRUB_FILE"); 782 get_mandatory_config("GRUB_FILE");
792 } 783 }
793 784
794 if ($rtype eq "syslinux") { 785 if ($rtype eq "syslinux") {
795 get_mandatory_config("SYSLINUX_LABEL") 786 get_mandatory_config("SYSLINUX_LABEL");
796 } 787 }
797 } 788 }
798 789
799 sub process_variables { 790 sub process_variables {
800 my ($value, $remove_undef) = @_; 791 my ($value, $remove_undef) = @_;
801 my $retval = ""; 792 my $retval = "";
802 793
803 # We want to check for '\', and it is just 794 # We want to check for '\', and it is just easier
804 # to check the previous character of '$' a !! 795 # to check the previous characet of '$' and not need
805 # to worry if '$' is the first character. 796 # to worry if '$' is the first character. By adding
806 # a space to $value, we can just check [^\ 797 # a space to $value, we can just check [^\\]\$ and
807 # it will still work. 798 # it will still work.
808 $value = " $value"; 799 $value = " $value";
809 800
810 while ($value =~ /(.*?[^\\])\$\{([^\{]*?)\ !! 801 while ($value =~ /(.*?[^\\])\$\{(.*?)\}(.*)/) {
811 my $begin = $1; 802 my $begin = $1;
812 my $var = $2; 803 my $var = $2;
813 my $end = $3; 804 my $end = $3;
814 # append beginning of value to retval 805 # append beginning of value to retval
815 $retval = "$retval$begin"; 806 $retval = "$retval$begin";
816 if ($var =~ s/^shell\s+//) { 807 if ($var =~ s/^shell\s+//) {
817 $retval = `$var`; 808 $retval = `$var`;
818 if ($?) { 809 if ($?) {
819 doprint "WARNING: $var returne 810 doprint "WARNING: $var returned an error\n";
820 } else { 811 } else {
821 chomp $retval; 812 chomp $retval;
822 } 813 }
823 } elsif (defined($variable{$var})) { 814 } elsif (defined($variable{$var})) {
824 $retval = "$retval$variable{$var}" 815 $retval = "$retval$variable{$var}";
825 } elsif (defined($remove_undef) && $re 816 } elsif (defined($remove_undef) && $remove_undef) {
826 # for if statements, any variable 817 # for if statements, any variable that is not defined,
827 # we simple convert to 0 818 # we simple convert to 0
828 $retval = "${retval}0"; 819 $retval = "${retval}0";
829 } else { 820 } else {
830 # put back the origin piece, but w !! 821 # put back the origin piece.
831 $retval = "$retval\$####\{$var\}"; !! 822 $retval = "$retval\$\{$var\}";
832 # This could be an option that is 823 # This could be an option that is used later, save
833 # it so we don't warn if this opti 824 # it so we don't warn if this option is not one of
834 # ktests options. 825 # ktests options.
835 $used_options{$var} = 1; 826 $used_options{$var} = 1;
836 } 827 }
837 $value = "$retval$end"; !! 828 $value = $end;
838 $retval = ""; <<
839 } 829 }
840 $retval = $value; !! 830 $retval = "$retval$value";
841 <<
842 # Convert the saved variables with $####{v <<
843 $retval =~ s/\$####/\$/g; <<
844 831
845 # remove the space added in the beginning 832 # remove the space added in the beginning
846 $retval =~ s/ //; 833 $retval =~ s/ //;
847 834
848 return "$retval"; 835 return "$retval";
849 } 836 }
850 837
851 sub set_value { 838 sub set_value {
852 my ($lvalue, $rvalue, $override, $override 839 my ($lvalue, $rvalue, $override, $overrides, $name) = @_;
853 840
854 my $prvalue = process_variables($rvalue); 841 my $prvalue = process_variables($rvalue);
855 842
856 if ($lvalue =~ /^(TEST|BISECT|CONFIG_BISEC 843 if ($lvalue =~ /^(TEST|BISECT|CONFIG_BISECT)_TYPE(\[.*\])?$/ &&
857 $prvalue !~ /^(config_|)bisect$/ && 844 $prvalue !~ /^(config_|)bisect$/ &&
858 $prvalue !~ /^build$/ && 845 $prvalue !~ /^build$/ &&
859 $prvalue !~ /^make_warnings_file$/ && <<
860 $buildonly) { 846 $buildonly) {
861 847
862 # Note if a test is something other th 848 # Note if a test is something other than build, then we
863 # will need other mandatory options. 849 # will need other mandatory options.
864 if ($prvalue ne "install") { 850 if ($prvalue ne "install") {
865 $buildonly = 0; 851 $buildonly = 0;
866 } else { 852 } else {
867 # install still limits some mandat 853 # install still limits some mandatory options.
868 $buildonly = 2; 854 $buildonly = 2;
869 } 855 }
870 } 856 }
871 857
872 if (defined($opt{$lvalue})) { 858 if (defined($opt{$lvalue})) {
873 if (!$override || defined(${$overrides 859 if (!$override || defined(${$overrides}{$lvalue})) {
874 my $extra = ""; 860 my $extra = "";
875 if ($override) { 861 if ($override) {
876 $extra = "In the same override 862 $extra = "In the same override section!\n";
877 } 863 }
878 die "$name: $.: Option $lvalue def 864 die "$name: $.: Option $lvalue defined more than once!\n$extra";
879 } 865 }
880 ${$overrides}{$lvalue} = $prvalue; 866 ${$overrides}{$lvalue} = $prvalue;
881 } 867 }
882 868
883 $opt{$lvalue} = $prvalue; 869 $opt{$lvalue} = $prvalue;
884 } 870 }
885 871
886 sub set_eval { 872 sub set_eval {
887 my ($lvalue, $rvalue, $name) = @_; 873 my ($lvalue, $rvalue, $name) = @_;
888 874
889 my $prvalue = process_variables($rvalue); 875 my $prvalue = process_variables($rvalue);
890 my $arr; 876 my $arr;
891 877
892 if (defined($evals{$lvalue})) { 878 if (defined($evals{$lvalue})) {
893 $arr = $evals{$lvalue}; 879 $arr = $evals{$lvalue};
894 } else { 880 } else {
895 $arr = []; 881 $arr = [];
896 $evals{$lvalue} = $arr; 882 $evals{$lvalue} = $arr;
897 } 883 }
898 884
899 push @{$arr}, $rvalue; 885 push @{$arr}, $rvalue;
900 } 886 }
901 887
902 sub set_variable { 888 sub set_variable {
903 my ($lvalue, $rvalue) = @_; 889 my ($lvalue, $rvalue) = @_;
904 890
905 if ($rvalue =~ /^\s*$/) { 891 if ($rvalue =~ /^\s*$/) {
906 delete $variable{$lvalue}; 892 delete $variable{$lvalue};
907 } else { 893 } else {
908 $rvalue = process_variables($rvalue); 894 $rvalue = process_variables($rvalue);
909 $variable{$lvalue} = $rvalue; 895 $variable{$lvalue} = $rvalue;
910 } 896 }
911 } 897 }
912 898
913 sub process_compare { 899 sub process_compare {
914 my ($lval, $cmp, $rval) = @_; 900 my ($lval, $cmp, $rval) = @_;
915 901
916 # remove whitespace 902 # remove whitespace
917 903
918 $lval =~ s/^\s*//; 904 $lval =~ s/^\s*//;
919 $lval =~ s/\s*$//; 905 $lval =~ s/\s*$//;
920 906
921 $rval =~ s/^\s*//; 907 $rval =~ s/^\s*//;
922 $rval =~ s/\s*$//; 908 $rval =~ s/\s*$//;
923 909
924 if ($cmp eq "==") { 910 if ($cmp eq "==") {
925 return $lval eq $rval; 911 return $lval eq $rval;
926 } elsif ($cmp eq "!=") { 912 } elsif ($cmp eq "!=") {
927 return $lval ne $rval; 913 return $lval ne $rval;
928 } elsif ($cmp eq "=~") { 914 } elsif ($cmp eq "=~") {
929 return $lval =~ m/$rval/; 915 return $lval =~ m/$rval/;
930 } elsif ($cmp eq "!~") { 916 } elsif ($cmp eq "!~") {
931 return $lval !~ m/$rval/; 917 return $lval !~ m/$rval/;
932 } 918 }
933 919
934 my $statement = "$lval $cmp $rval"; 920 my $statement = "$lval $cmp $rval";
935 my $ret = eval $statement; 921 my $ret = eval $statement;
936 922
937 # $@ stores error of eval 923 # $@ stores error of eval
938 if ($@) { 924 if ($@) {
939 return -1; 925 return -1;
940 } 926 }
941 927
942 return $ret; 928 return $ret;
943 } 929 }
944 930
945 sub value_defined { 931 sub value_defined {
946 my ($val) = @_; 932 my ($val) = @_;
947 933
948 return defined($variable{$2}) || 934 return defined($variable{$2}) ||
949 defined($opt{$2}); 935 defined($opt{$2});
950 } 936 }
951 937
952 sub process_expression { 938 sub process_expression {
953 my ($name, $val) = @_; 939 my ($name, $val) = @_;
954 940
955 my $c = $d++; 941 my $c = $d++;
956 942
957 while ($val =~ s/\(([^\(]*?)\)/\&\&\&\&VAL 943 while ($val =~ s/\(([^\(]*?)\)/\&\&\&\&VAL\&\&\&\&/) {
958 my $express = $1; 944 my $express = $1;
959 945
960 if (process_expression($name, $express 946 if (process_expression($name, $express)) {
961 $val =~ s/\&\&\&\&VAL\&\&\&\&/ 1 / 947 $val =~ s/\&\&\&\&VAL\&\&\&\&/ 1 /;
962 } else { 948 } else {
963 $val =~ s/\&\&\&\&VAL\&\&\&\&/ 0 / 949 $val =~ s/\&\&\&\&VAL\&\&\&\&/ 0 /;
964 } 950 }
965 } 951 }
966 952
967 $d--; 953 $d--;
968 my $OR = "\\|\\|"; 954 my $OR = "\\|\\|";
969 my $AND = "\\&\\&"; 955 my $AND = "\\&\\&";
970 956
971 while ($val =~ s/^(.*?)($OR|$AND)//) { 957 while ($val =~ s/^(.*?)($OR|$AND)//) {
972 my $express = $1; 958 my $express = $1;
973 my $op = $2; 959 my $op = $2;
974 960
975 if (process_expression($name, $express 961 if (process_expression($name, $express)) {
976 if ($op eq "||") { 962 if ($op eq "||") {
977 return 1; 963 return 1;
978 } 964 }
979 } else { 965 } else {
980 if ($op eq "&&") { 966 if ($op eq "&&") {
981 return 0; 967 return 0;
982 } 968 }
983 } 969 }
984 } 970 }
985 971
986 if ($val =~ /(.*)(==|\!=|>=|<=|>|<|=~|\!~) 972 if ($val =~ /(.*)(==|\!=|>=|<=|>|<|=~|\!~)(.*)/) {
987 my $ret = process_compare($1, $2, $3); 973 my $ret = process_compare($1, $2, $3);
988 if ($ret < 0) { 974 if ($ret < 0) {
989 die "$name: $.: Unable to process 975 die "$name: $.: Unable to process comparison\n";
990 } 976 }
991 return $ret; 977 return $ret;
992 } 978 }
993 979
994 if ($val =~ /^\s*(NOT\s*)?DEFINED\s+(\S+)\ 980 if ($val =~ /^\s*(NOT\s*)?DEFINED\s+(\S+)\s*$/) {
995 if (defined $1) { 981 if (defined $1) {
996 return !value_defined($2); 982 return !value_defined($2);
997 } else { 983 } else {
998 return value_defined($2); 984 return value_defined($2);
999 } 985 }
1000 } 986 }
1001 987
1002 if ($val =~ s/^\s*NOT\s+(.*)//) { 988 if ($val =~ s/^\s*NOT\s+(.*)//) {
1003 my $express = $1; 989 my $express = $1;
1004 my $ret = process_expression($name, $ 990 my $ret = process_expression($name, $express);
1005 return !$ret; 991 return !$ret;
1006 } 992 }
1007 993
1008 if ($val =~ /^\s*0\s*$/) { 994 if ($val =~ /^\s*0\s*$/) {
1009 return 0; 995 return 0;
1010 } elsif ($val =~ /^\s*\d+\s*$/) { 996 } elsif ($val =~ /^\s*\d+\s*$/) {
1011 return 1; 997 return 1;
1012 } 998 }
1013 999
1014 die ("$name: $.: Undefined content $val i 1000 die ("$name: $.: Undefined content $val in if statement\n");
1015 } 1001 }
1016 1002
1017 sub process_if { 1003 sub process_if {
1018 my ($name, $value) = @_; 1004 my ($name, $value) = @_;
1019 1005
1020 # Convert variables and replace undefined 1006 # Convert variables and replace undefined ones with 0
1021 my $val = process_variables($value, 1); 1007 my $val = process_variables($value, 1);
1022 my $ret = process_expression $name, $val; 1008 my $ret = process_expression $name, $val;
1023 1009
1024 return $ret; 1010 return $ret;
1025 } 1011 }
1026 1012
1027 sub __read_config { 1013 sub __read_config {
1028 my ($config, $current_test_num) = @_; 1014 my ($config, $current_test_num) = @_;
1029 1015
1030 my $in; 1016 my $in;
1031 open($in, $config) || die "can't read fil 1017 open($in, $config) || die "can't read file $config";
1032 1018
1033 my $name = $config; 1019 my $name = $config;
1034 $name =~ s,.*/(.*),$1,; 1020 $name =~ s,.*/(.*),$1,;
1035 1021
1036 my $test_num = $$current_test_num; 1022 my $test_num = $$current_test_num;
1037 my $default = 1; 1023 my $default = 1;
1038 my $repeat = 1; 1024 my $repeat = 1;
1039 my $num_tests_set = 0; 1025 my $num_tests_set = 0;
1040 my $skip = 0; 1026 my $skip = 0;
1041 my $rest; 1027 my $rest;
1042 my $line; 1028 my $line;
1043 my $test_case = 0; 1029 my $test_case = 0;
1044 my $if = 0; 1030 my $if = 0;
1045 my $if_set = 0; 1031 my $if_set = 0;
1046 my $override = 0; 1032 my $override = 0;
1047 1033
1048 my %overrides; 1034 my %overrides;
1049 1035
1050 while (<$in>) { 1036 while (<$in>) {
1051 1037
1052 # ignore blank lines and comments 1038 # ignore blank lines and comments
1053 next if (/^\s*$/ || /\s*\#/); 1039 next if (/^\s*$/ || /\s*\#/);
1054 1040
1055 if (/^\s*(TEST_START|DEFAULTS)\b(.*)/ 1041 if (/^\s*(TEST_START|DEFAULTS)\b(.*)/) {
1056 1042
1057 my $type = $1; 1043 my $type = $1;
1058 $rest = $2; 1044 $rest = $2;
1059 $line = $2; 1045 $line = $2;
1060 1046
1061 my $old_test_num; 1047 my $old_test_num;
1062 my $old_repeat; 1048 my $old_repeat;
1063 $override = 0; 1049 $override = 0;
1064 1050
1065 if ($type eq "TEST_START") { 1051 if ($type eq "TEST_START") {
1066 if ($num_tests_set) { 1052 if ($num_tests_set) {
1067 die "$name: $.: Can not s 1053 die "$name: $.: Can not specify both NUM_TESTS and TEST_START\n";
1068 } 1054 }
1069 1055
1070 $old_test_num = $test_num; 1056 $old_test_num = $test_num;
1071 $old_repeat = $repeat; 1057 $old_repeat = $repeat;
1072 1058
1073 $test_num += $repeat; 1059 $test_num += $repeat;
1074 $default = 0; 1060 $default = 0;
1075 $repeat = 1; 1061 $repeat = 1;
1076 } else { 1062 } else {
1077 $default = 1; 1063 $default = 1;
1078 } 1064 }
1079 1065
1080 # If SKIP is anywhere in the line 1066 # If SKIP is anywhere in the line, the command will be skipped
1081 if ($rest =~ s/\s+SKIP\b//) { 1067 if ($rest =~ s/\s+SKIP\b//) {
1082 $skip = 1; 1068 $skip = 1;
1083 } else { 1069 } else {
1084 $test_case = 1; 1070 $test_case = 1;
1085 $skip = 0; 1071 $skip = 0;
1086 } 1072 }
1087 1073
1088 if ($rest =~ s/\sELSE\b//) { 1074 if ($rest =~ s/\sELSE\b//) {
1089 if (!$if) { 1075 if (!$if) {
1090 die "$name: $.: ELSE foun 1076 die "$name: $.: ELSE found with out matching IF section\n$_";
1091 } 1077 }
1092 $if = 0; 1078 $if = 0;
1093 1079
1094 if ($if_set) { 1080 if ($if_set) {
1095 $skip = 1; 1081 $skip = 1;
1096 } else { 1082 } else {
1097 $skip = 0; 1083 $skip = 0;
1098 } 1084 }
1099 } 1085 }
1100 1086
1101 if ($rest =~ s/\sIF\s+(.*)//) { 1087 if ($rest =~ s/\sIF\s+(.*)//) {
1102 if (process_if($name, $1)) { 1088 if (process_if($name, $1)) {
1103 $if_set = 1; 1089 $if_set = 1;
1104 } else { 1090 } else {
1105 $skip = 1; 1091 $skip = 1;
1106 } 1092 }
1107 $if = 1; 1093 $if = 1;
1108 } else { 1094 } else {
1109 $if = 0; 1095 $if = 0;
1110 $if_set = 0; 1096 $if_set = 0;
1111 } 1097 }
1112 1098
1113 if (!$skip) { 1099 if (!$skip) {
1114 if ($type eq "TEST_START") { 1100 if ($type eq "TEST_START") {
1115 if ($rest =~ s/\s+ITERATE 1101 if ($rest =~ s/\s+ITERATE\s+(\d+)//) {
1116 $repeat = $1; 1102 $repeat = $1;
1117 $repeat_tests{"$test_ 1103 $repeat_tests{"$test_num"} = $repeat;
1118 } 1104 }
1119 } elsif ($rest =~ s/\sOVERRID 1105 } elsif ($rest =~ s/\sOVERRIDE\b//) {
1120 # DEFAULT only 1106 # DEFAULT only
1121 $override = 1; 1107 $override = 1;
1122 # Clear previous override 1108 # Clear previous overrides
1123 %overrides = (); 1109 %overrides = ();
1124 } 1110 }
1125 } 1111 }
1126 1112
1127 if (!$skip && $rest !~ /^\s*$/) { 1113 if (!$skip && $rest !~ /^\s*$/) {
1128 die "$name: $.: Garbage found 1114 die "$name: $.: Garbage found after $type\n$_";
1129 } 1115 }
1130 1116
1131 if ($skip && $type eq "TEST_START 1117 if ($skip && $type eq "TEST_START") {
1132 $test_num = $old_test_num; 1118 $test_num = $old_test_num;
1133 $repeat = $old_repeat; 1119 $repeat = $old_repeat;
1134 } 1120 }
1135 } elsif (/^\s*ELSE\b(.*)$/) { 1121 } elsif (/^\s*ELSE\b(.*)$/) {
1136 if (!$if) { 1122 if (!$if) {
1137 die "$name: $.: ELSE found wi 1123 die "$name: $.: ELSE found with out matching IF section\n$_";
1138 } 1124 }
1139 $rest = $1; 1125 $rest = $1;
1140 if ($if_set) { 1126 if ($if_set) {
1141 $skip = 1; 1127 $skip = 1;
1142 $rest = ""; 1128 $rest = "";
1143 } else { 1129 } else {
1144 $skip = 0; 1130 $skip = 0;
1145 1131
1146 if ($rest =~ /\sIF\s+(.*)/) { 1132 if ($rest =~ /\sIF\s+(.*)/) {
1147 # May be a ELSE IF sectio 1133 # May be a ELSE IF section.
1148 if (process_if($name, $1) 1134 if (process_if($name, $1)) {
1149 $if_set = 1; 1135 $if_set = 1;
1150 } else { 1136 } else {
1151 $skip = 1; 1137 $skip = 1;
1152 } 1138 }
1153 $rest = ""; 1139 $rest = "";
1154 } else { 1140 } else {
1155 $if = 0; 1141 $if = 0;
1156 } 1142 }
1157 } 1143 }
1158 1144
1159 if ($rest !~ /^\s*$/) { 1145 if ($rest !~ /^\s*$/) {
1160 die "$name: $.: Garbage found 1146 die "$name: $.: Garbage found after DEFAULTS\n$_";
1161 } 1147 }
1162 1148
1163 } elsif (/^\s*INCLUDE\s+(\S+)/) { 1149 } elsif (/^\s*INCLUDE\s+(\S+)/) {
1164 1150
1165 next if ($skip); 1151 next if ($skip);
1166 1152
1167 if (!$default) { 1153 if (!$default) {
1168 die "$name: $.: INCLUDE can o 1154 die "$name: $.: INCLUDE can only be done in default sections\n$_";
1169 } 1155 }
1170 1156
1171 my $file = process_variables($1); 1157 my $file = process_variables($1);
1172 1158
1173 if ($file !~ m,^/,) { 1159 if ($file !~ m,^/,) {
1174 # check the path of the confi 1160 # check the path of the config file first
1175 if ($config =~ m,(.*)/,) { 1161 if ($config =~ m,(.*)/,) {
1176 if (-f "$1/$file") { 1162 if (-f "$1/$file") {
1177 $file = "$1/$file"; 1163 $file = "$1/$file";
1178 } 1164 }
1179 } 1165 }
1180 } 1166 }
1181 1167
1182 if ( ! -r $file ) { 1168 if ( ! -r $file ) {
1183 die "$name: $.: Can't read fi 1169 die "$name: $.: Can't read file $file\n$_";
1184 } 1170 }
1185 1171
1186 if (__read_config($file, \$test_n 1172 if (__read_config($file, \$test_num)) {
1187 $test_case = 1; 1173 $test_case = 1;
1188 } 1174 }
1189 1175
1190 } elsif (/^\s*([A-Z_\[\]\d]+)\s*=~\s* 1176 } elsif (/^\s*([A-Z_\[\]\d]+)\s*=~\s*(.*?)\s*$/) {
1191 1177
1192 next if ($skip); 1178 next if ($skip);
1193 1179
1194 my $lvalue = $1; 1180 my $lvalue = $1;
1195 my $rvalue = $2; 1181 my $rvalue = $2;
1196 1182
1197 if ($default || $lvalue =~ /\[\d+ 1183 if ($default || $lvalue =~ /\[\d+\]$/) {
1198 set_eval($lvalue, $rvalue, $n 1184 set_eval($lvalue, $rvalue, $name);
1199 } else { 1185 } else {
1200 my $val = "$lvalue\[$test_num 1186 my $val = "$lvalue\[$test_num\]";
1201 set_eval($val, $rvalue, $name 1187 set_eval($val, $rvalue, $name);
1202 } 1188 }
1203 1189
1204 } elsif (/^\s*([A-Z_\[\]\d]+)\s*=\s*( 1190 } elsif (/^\s*([A-Z_\[\]\d]+)\s*=\s*(.*?)\s*$/) {
1205 1191
1206 next if ($skip); 1192 next if ($skip);
1207 1193
1208 my $lvalue = $1; 1194 my $lvalue = $1;
1209 my $rvalue = $2; 1195 my $rvalue = $2;
1210 1196
1211 if (!$default && 1197 if (!$default &&
1212 ($lvalue eq "NUM_TESTS" || 1198 ($lvalue eq "NUM_TESTS" ||
1213 $lvalue eq "LOG_FILE" || 1199 $lvalue eq "LOG_FILE" ||
1214 $lvalue eq "CLEAR_LOG")) { 1200 $lvalue eq "CLEAR_LOG")) {
1215 die "$name: $.: $lvalue must 1201 die "$name: $.: $lvalue must be set in DEFAULTS section\n";
1216 } 1202 }
1217 1203
1218 if ($lvalue eq "NUM_TESTS") { 1204 if ($lvalue eq "NUM_TESTS") {
1219 if ($test_num) { 1205 if ($test_num) {
1220 die "$name: $.: Can not s 1206 die "$name: $.: Can not specify both NUM_TESTS and TEST_START\n";
1221 } 1207 }
1222 if (!$default) { 1208 if (!$default) {
1223 die "$name: $.: NUM_TESTS 1209 die "$name: $.: NUM_TESTS must be set in default section\n";
1224 } 1210 }
1225 $num_tests_set = 1; 1211 $num_tests_set = 1;
1226 } 1212 }
1227 1213
1228 if ($default || $lvalue =~ /\[\d+ 1214 if ($default || $lvalue =~ /\[\d+\]$/) {
1229 set_value($lvalue, $rvalue, $ 1215 set_value($lvalue, $rvalue, $override, \%overrides, $name);
1230 } else { 1216 } else {
1231 my $val = "$lvalue\[$test_num 1217 my $val = "$lvalue\[$test_num\]";
1232 set_value($val, $rvalue, $ove 1218 set_value($val, $rvalue, $override, \%overrides, $name);
1233 1219
1234 if ($repeat > 1) { 1220 if ($repeat > 1) {
1235 $repeats{$val} = $repeat; 1221 $repeats{$val} = $repeat;
1236 } 1222 }
1237 } 1223 }
1238 } elsif (/^\s*([A-Z_\[\]\d]+)\s*:=\s* 1224 } elsif (/^\s*([A-Z_\[\]\d]+)\s*:=\s*(.*?)\s*$/) {
1239 next if ($skip); 1225 next if ($skip);
1240 1226
1241 my $lvalue = $1; 1227 my $lvalue = $1;
1242 my $rvalue = $2; 1228 my $rvalue = $2;
1243 1229
1244 # process config variables. 1230 # process config variables.
1245 # Config variables are only activ 1231 # Config variables are only active while reading the
1246 # config and can be defined anywh 1232 # config and can be defined anywhere. They also ignore
1247 # TEST_START and DEFAULTS, but ar 1233 # TEST_START and DEFAULTS, but are skipped if they are in
1248 # on of these sections that have 1234 # on of these sections that have SKIP defined.
1249 # The save variable can be 1235 # The save variable can be
1250 # defined multiple times and the 1236 # defined multiple times and the new one simply overrides
1251 # the previous one. 1237 # the previous one.
1252 set_variable($lvalue, $rvalue); 1238 set_variable($lvalue, $rvalue);
1253 1239
1254 } else { 1240 } else {
1255 die "$name: $.: Garbage found in 1241 die "$name: $.: Garbage found in config\n$_";
1256 } 1242 }
1257 } 1243 }
1258 1244
1259 if ($test_num) { 1245 if ($test_num) {
1260 $test_num += $repeat - 1; 1246 $test_num += $repeat - 1;
1261 $opt{"NUM_TESTS"} = $test_num; 1247 $opt{"NUM_TESTS"} = $test_num;
1262 } 1248 }
1263 1249
1264 close($in); 1250 close($in);
1265 1251
1266 $$current_test_num = $test_num; 1252 $$current_test_num = $test_num;
1267 1253
1268 return $test_case; 1254 return $test_case;
1269 } 1255 }
1270 1256
1271 sub get_test_case { 1257 sub get_test_case {
1272 print "What test case would you like to r 1258 print "What test case would you like to run?\n";
1273 print " (build, install or boot)\n"; 1259 print " (build, install or boot)\n";
1274 print " Other tests are available but req 1260 print " Other tests are available but require editing ktest.conf\n";
1275 print " (see tools/testing/ktest/sample.c 1261 print " (see tools/testing/ktest/sample.conf)\n";
1276 my $ans = <STDIN>; 1262 my $ans = <STDIN>;
1277 chomp $ans; 1263 chomp $ans;
1278 $default{"TEST_TYPE"} = $ans; 1264 $default{"TEST_TYPE"} = $ans;
1279 } 1265 }
1280 1266
1281 sub read_config { 1267 sub read_config {
1282 my ($config) = @_; 1268 my ($config) = @_;
1283 1269
1284 my $test_case; 1270 my $test_case;
1285 my $test_num = 0; 1271 my $test_num = 0;
1286 1272
1287 $test_case = __read_config $config, \$tes 1273 $test_case = __read_config $config, \$test_num;
1288 1274
1289 # make sure we have all mandatory configs 1275 # make sure we have all mandatory configs
1290 get_mandatory_configs; 1276 get_mandatory_configs;
1291 1277
1292 # was a test specified? 1278 # was a test specified?
1293 if (!$test_case) { 1279 if (!$test_case) {
1294 print "No test case specified.\n"; 1280 print "No test case specified.\n";
1295 get_test_case; 1281 get_test_case;
1296 } 1282 }
1297 1283
1298 # set any defaults 1284 # set any defaults
1299 1285
1300 foreach my $default (keys %default) { 1286 foreach my $default (keys %default) {
1301 if (!defined($opt{$default})) { 1287 if (!defined($opt{$default})) {
1302 $opt{$default} = $default{$defaul 1288 $opt{$default} = $default{$default};
1303 } 1289 }
1304 } 1290 }
1305 1291
1306 if ($opt{"IGNORE_UNUSED"} == 1) { 1292 if ($opt{"IGNORE_UNUSED"} == 1) {
1307 return; 1293 return;
1308 } 1294 }
1309 1295
1310 my %not_used; 1296 my %not_used;
1311 1297
1312 # check if there are any stragglers (typo 1298 # check if there are any stragglers (typos?)
1313 foreach my $option (keys %opt) { 1299 foreach my $option (keys %opt) {
1314 my $op = $option; 1300 my $op = $option;
1315 # remove per test labels. 1301 # remove per test labels.
1316 $op =~ s/\[.*\]//; 1302 $op =~ s/\[.*\]//;
1317 if (!exists($option_map{$op}) && 1303 if (!exists($option_map{$op}) &&
1318 !exists($default{$op}) && 1304 !exists($default{$op}) &&
1319 !exists($used_options{$op})) { 1305 !exists($used_options{$op})) {
1320 $not_used{$op} = 1; 1306 $not_used{$op} = 1;
1321 } 1307 }
1322 } 1308 }
1323 1309
1324 if (%not_used) { 1310 if (%not_used) {
1325 my $s = "s are"; 1311 my $s = "s are";
1326 $s = " is" if (keys %not_used == 1); 1312 $s = " is" if (keys %not_used == 1);
1327 print "The following option$s not use 1313 print "The following option$s not used; could be a typo:\n";
1328 foreach my $option (keys %not_used) { 1314 foreach my $option (keys %not_used) {
1329 print "$option\n"; 1315 print "$option\n";
1330 } 1316 }
1331 print "Set IGNORE_UNUSED = 1 to have 1317 print "Set IGNORE_UNUSED = 1 to have ktest ignore unused variables\n";
1332 if (!read_yn "Do you want to continue 1318 if (!read_yn "Do you want to continue?") {
1333 exit -1; 1319 exit -1;
1334 } 1320 }
1335 } 1321 }
1336 } 1322 }
1337 1323
1338 sub __eval_option { 1324 sub __eval_option {
1339 my ($name, $option, $i) = @_; 1325 my ($name, $option, $i) = @_;
1340 1326
1341 # Add space to evaluate the character bef 1327 # Add space to evaluate the character before $
1342 $option = " $option"; 1328 $option = " $option";
1343 my $retval = ""; 1329 my $retval = "";
1344 my $repeated = 0; 1330 my $repeated = 0;
1345 my $parent = 0; 1331 my $parent = 0;
1346 1332
1347 foreach my $test (keys %repeat_tests) { 1333 foreach my $test (keys %repeat_tests) {
1348 if ($i >= $test && 1334 if ($i >= $test &&
1349 $i < $test + $repeat_tests{$test} 1335 $i < $test + $repeat_tests{$test}) {
1350 1336
1351 $repeated = 1; 1337 $repeated = 1;
1352 $parent = $test; 1338 $parent = $test;
1353 last; 1339 last;
1354 } 1340 }
1355 } 1341 }
1356 1342
1357 while ($option =~ /(.*?[^\\])\$\{(.*?)\}( 1343 while ($option =~ /(.*?[^\\])\$\{(.*?)\}(.*)/) {
1358 my $start = $1; 1344 my $start = $1;
1359 my $var = $2; 1345 my $var = $2;
1360 my $end = $3; 1346 my $end = $3;
1361 1347
1362 # Append beginning of line 1348 # Append beginning of line
1363 $retval = "$retval$start"; 1349 $retval = "$retval$start";
1364 1350
1365 # If the iteration option OPT[$i] exi 1351 # If the iteration option OPT[$i] exists, then use that.
1366 # otherwise see if the default OPT (w 1352 # otherwise see if the default OPT (without [$i]) exists.
1367 1353
1368 my $o = "$var\[$i\]"; 1354 my $o = "$var\[$i\]";
1369 my $parento = "$var\[$parent\]"; 1355 my $parento = "$var\[$parent\]";
1370 1356
1371 # If a variable contains itself, use 1357 # If a variable contains itself, use the default var
1372 if (($var eq $name) && defined($opt{$ 1358 if (($var eq $name) && defined($opt{$var})) {
1373 $o = $opt{$var}; 1359 $o = $opt{$var};
1374 $retval = "$retval$o"; 1360 $retval = "$retval$o";
1375 } elsif (defined($opt{$o})) { 1361 } elsif (defined($opt{$o})) {
1376 $o = $opt{$o}; 1362 $o = $opt{$o};
1377 $retval = "$retval$o"; 1363 $retval = "$retval$o";
1378 } elsif ($repeated && defined($opt{$p 1364 } elsif ($repeated && defined($opt{$parento})) {
1379 $o = $opt{$parento}; 1365 $o = $opt{$parento};
1380 $retval = "$retval$o"; 1366 $retval = "$retval$o";
1381 } elsif (defined($opt{$var})) { 1367 } elsif (defined($opt{$var})) {
1382 $o = $opt{$var}; 1368 $o = $opt{$var};
1383 $retval = "$retval$o"; 1369 $retval = "$retval$o";
1384 } elsif ($var eq "KERNEL_VERSION" && 1370 } elsif ($var eq "KERNEL_VERSION" && defined($make)) {
1385 # special option KERNEL_VERSION u 1371 # special option KERNEL_VERSION uses kernel version
1386 get_version(); 1372 get_version();
1387 $retval = "$retval$version"; 1373 $retval = "$retval$version";
1388 } else { 1374 } else {
1389 $retval = "$retval\$\{$var\}"; 1375 $retval = "$retval\$\{$var\}";
1390 } 1376 }
1391 1377
1392 $option = $end; 1378 $option = $end;
1393 } 1379 }
1394 1380
1395 $retval = "$retval$option"; 1381 $retval = "$retval$option";
1396 1382
1397 $retval =~ s/^ //; 1383 $retval =~ s/^ //;
1398 1384
1399 return $retval; 1385 return $retval;
1400 } 1386 }
1401 1387
1402 sub process_evals { 1388 sub process_evals {
1403 my ($name, $option, $i) = @_; 1389 my ($name, $option, $i) = @_;
1404 1390
1405 my $option_name = "$name\[$i\]"; 1391 my $option_name = "$name\[$i\]";
1406 my $ev; 1392 my $ev;
1407 1393
1408 my $old_option = $option; 1394 my $old_option = $option;
1409 1395
1410 if (defined($evals{$option_name})) { 1396 if (defined($evals{$option_name})) {
1411 $ev = $evals{$option_name}; 1397 $ev = $evals{$option_name};
1412 } elsif (defined($evals{$name})) { 1398 } elsif (defined($evals{$name})) {
1413 $ev = $evals{$name}; 1399 $ev = $evals{$name};
1414 } else { 1400 } else {
1415 return $option; 1401 return $option;
1416 } 1402 }
1417 1403
1418 for my $e (@{$ev}) { 1404 for my $e (@{$ev}) {
1419 eval "\$option =~ $e"; 1405 eval "\$option =~ $e";
1420 } 1406 }
1421 1407
1422 if ($option ne $old_option) { 1408 if ($option ne $old_option) {
1423 doprint("$name changed from '$old_opt 1409 doprint("$name changed from '$old_option' to '$option'\n");
1424 } 1410 }
1425 1411
1426 return $option; 1412 return $option;
1427 } 1413 }
1428 1414
1429 sub eval_option { 1415 sub eval_option {
1430 my ($name, $option, $i) = @_; 1416 my ($name, $option, $i) = @_;
1431 1417
1432 my $prev = ""; 1418 my $prev = "";
1433 1419
1434 # Since an option can evaluate to another 1420 # Since an option can evaluate to another option,
1435 # keep iterating until we do not evaluate 1421 # keep iterating until we do not evaluate any more
1436 # options. 1422 # options.
1437 my $r = 0; 1423 my $r = 0;
1438 while ($prev ne $option) { 1424 while ($prev ne $option) {
1439 # Check for recursive evaluations. 1425 # Check for recursive evaluations.
1440 # 100 deep should be more than enough 1426 # 100 deep should be more than enough.
1441 if ($r++ > 100) { 1427 if ($r++ > 100) {
1442 die "Over 100 evaluations occurre 1428 die "Over 100 evaluations occurred with $option\n" .
1443 "Check for recursive variable 1429 "Check for recursive variables\n";
1444 } 1430 }
1445 $prev = $option; 1431 $prev = $option;
1446 $option = __eval_option($name, $optio 1432 $option = __eval_option($name, $option, $i);
1447 } 1433 }
1448 1434
1449 $option = process_evals($name, $option, $ 1435 $option = process_evals($name, $option, $i);
1450 1436
1451 return $option; 1437 return $option;
1452 } 1438 }
1453 1439
1454 sub reboot { 1440 sub reboot {
1455 my ($time) = @_; 1441 my ($time) = @_;
1456 my $powercycle = 0; 1442 my $powercycle = 0;
1457 1443
1458 # test if the machine can be connected to 1444 # test if the machine can be connected to within a few seconds
1459 my $stat = run_ssh("echo check machine st 1445 my $stat = run_ssh("echo check machine status", $connect_timeout);
1460 if (!$stat) { 1446 if (!$stat) {
1461 doprint("power cycle\n"); 1447 doprint("power cycle\n");
1462 $powercycle = 1; 1448 $powercycle = 1;
1463 } 1449 }
1464 1450
1465 if ($powercycle) { 1451 if ($powercycle) {
1466 run_command "$power_cycle"; 1452 run_command "$power_cycle";
1467 1453
1468 start_monitor; 1454 start_monitor;
1469 # flush out current monitor 1455 # flush out current monitor
1470 # May contain the reboot success line 1456 # May contain the reboot success line
1471 wait_for_monitor 1; 1457 wait_for_monitor 1;
1472 1458
1473 } else { 1459 } else {
1474 # Make sure everything has been writt 1460 # Make sure everything has been written to disk
1475 run_ssh("sync", 10); 1461 run_ssh("sync", 10);
1476 1462
1477 if (defined($time)) { 1463 if (defined($time)) {
1478 start_monitor; 1464 start_monitor;
1479 # flush out current monitor 1465 # flush out current monitor
1480 # May contain the reboot success 1466 # May contain the reboot success line
1481 wait_for_monitor 1; 1467 wait_for_monitor 1;
1482 } 1468 }
1483 1469
1484 # try to reboot normally 1470 # try to reboot normally
1485 if (run_command $reboot) { 1471 if (run_command $reboot) {
1486 if (defined($powercycle_after_reb 1472 if (defined($powercycle_after_reboot)) {
1487 sleep $powercycle_after_reboo 1473 sleep $powercycle_after_reboot;
1488 run_command "$power_cycle"; 1474 run_command "$power_cycle";
1489 } 1475 }
1490 } else { 1476 } else {
1491 # nope? power cycle it. 1477 # nope? power cycle it.
1492 run_command "$power_cycle"; 1478 run_command "$power_cycle";
1493 } 1479 }
1494 } 1480 }
1495 1481
1496 if (defined($time)) { 1482 if (defined($time)) {
1497 1483
1498 # We only want to get to the new kern 1484 # We only want to get to the new kernel, don't fail
1499 # if we stumble over a call trace. 1485 # if we stumble over a call trace.
1500 my $save_ignore_errors = $ignore_erro 1486 my $save_ignore_errors = $ignore_errors;
1501 $ignore_errors = 1; 1487 $ignore_errors = 1;
1502 1488
1503 # Look for the good kernel to boot 1489 # Look for the good kernel to boot
1504 if (wait_for_monitor($time, "Linux ve 1490 if (wait_for_monitor($time, "Linux version")) {
1505 # reboot got stuck? 1491 # reboot got stuck?
1506 doprint "Reboot did not finish. F 1492 doprint "Reboot did not finish. Forcing power cycle\n";
1507 run_command "$power_cycle"; 1493 run_command "$power_cycle";
1508 } 1494 }
1509 1495
1510 $ignore_errors = $save_ignore_errors; 1496 $ignore_errors = $save_ignore_errors;
1511 1497
1512 # Still need to wait for the reboot t 1498 # Still need to wait for the reboot to finish
1513 wait_for_monitor($time, $reboot_succe 1499 wait_for_monitor($time, $reboot_success_line);
1514 } 1500 }
1515 if ($powercycle || $time) { 1501 if ($powercycle || $time) {
1516 end_monitor; 1502 end_monitor;
1517 } 1503 }
1518 } 1504 }
1519 1505
1520 sub reboot_to_good { 1506 sub reboot_to_good {
1521 my ($time) = @_; 1507 my ($time) = @_;
1522 1508
1523 if (defined($switch_to_good)) { 1509 if (defined($switch_to_good)) {
1524 run_command $switch_to_good; 1510 run_command $switch_to_good;
1525 } 1511 }
1526 1512
1527 reboot $time; 1513 reboot $time;
1528 } 1514 }
1529 1515
1530 sub do_not_reboot { 1516 sub do_not_reboot {
1531 my $i = $iteration; 1517 my $i = $iteration;
1532 1518
1533 return $test_type eq "build" || $no_reboo 1519 return $test_type eq "build" || $no_reboot ||
1534 ($test_type eq "patchcheck" && $opt{" 1520 ($test_type eq "patchcheck" && $opt{"PATCHCHECK_TYPE[$i]"} eq "build") ||
1535 ($test_type eq "bisect" && $opt{"BISE 1521 ($test_type eq "bisect" && $opt{"BISECT_TYPE[$i]"} eq "build") ||
1536 ($test_type eq "config_bisect" && $op 1522 ($test_type eq "config_bisect" && $opt{"CONFIG_BISECT_TYPE[$i]"} eq "build");
1537 } 1523 }
1538 1524
1539 sub get_test_name() { 1525 sub get_test_name() {
1540 my $name; 1526 my $name;
1541 1527
1542 if (defined($test_name)) { 1528 if (defined($test_name)) {
1543 $name = "$test_name:$test_type"; 1529 $name = "$test_name:$test_type";
1544 } else { 1530 } else {
1545 $name = $test_type; 1531 $name = $test_type;
1546 } 1532 }
1547 return $name; 1533 return $name;
1548 } 1534 }
1549 1535
1550 sub dodie { 1536 sub dodie {
1551 # avoid recursion 1537 # avoid recursion
1552 return if ($in_die); 1538 return if ($in_die);
1553 $in_die = 1; 1539 $in_die = 1;
1554 1540
1555 if ($monitor_cnt) { 1541 if ($monitor_cnt) {
1556 # restore terminal settings 1542 # restore terminal settings
1557 system("stty $stty_orig"); 1543 system("stty $stty_orig");
1558 } 1544 }
1559 1545
1560 my $i = $iteration; 1546 my $i = $iteration;
1561 1547
1562 doprint "CRITICAL FAILURE... [TEST $i] ", 1548 doprint "CRITICAL FAILURE... [TEST $i] ", @_, "\n";
1563 1549
1564 if ($reboot_on_error && !do_not_reboot) { 1550 if ($reboot_on_error && !do_not_reboot) {
1565 doprint "REBOOTING\n"; 1551 doprint "REBOOTING\n";
1566 reboot_to_good; 1552 reboot_to_good;
1567 } elsif ($poweroff_on_error && defined($p 1553 } elsif ($poweroff_on_error && defined($power_off)) {
1568 doprint "POWERING OFF\n"; 1554 doprint "POWERING OFF\n";
1569 `$power_off`; 1555 `$power_off`;
1570 } 1556 }
1571 1557
1572 if (defined($opt{"LOG_FILE"})) { 1558 if (defined($opt{"LOG_FILE"})) {
1573 print " See $opt{LOG_FILE} for more i 1559 print " See $opt{LOG_FILE} for more info.\n";
1574 } 1560 }
1575 1561
1576 if ($email_on_error) { 1562 if ($email_on_error) {
1577 my $name = get_test_name; 1563 my $name = get_test_name;
1578 my $log_file; 1564 my $log_file;
1579 1565
1580 if (defined($opt{"LOG_FILE"})) { 1566 if (defined($opt{"LOG_FILE"})) {
1581 my $whence = 2; # End of file 1567 my $whence = 2; # End of file
1582 my $log_size = tell LOG; 1568 my $log_size = tell LOG;
1583 my $size = $log_size - $test_log_ 1569 my $size = $log_size - $test_log_start;
1584 1570
1585 if (defined($mail_max_size)) { 1571 if (defined($mail_max_size)) {
1586 if ($size > $mail_max_size) { 1572 if ($size > $mail_max_size) {
1587 $size = $mail_max_size; 1573 $size = $mail_max_size;
1588 } 1574 }
1589 } 1575 }
1590 my $pos = - $size; 1576 my $pos = - $size;
1591 $log_file = "$tmpdir/log"; 1577 $log_file = "$tmpdir/log";
1592 open (L, "$opt{LOG_FILE}") or die 1578 open (L, "$opt{LOG_FILE}") or die "Can't open $opt{LOG_FILE} to read)";
1593 open (O, "> $tmpdir/log") or die 1579 open (O, "> $tmpdir/log") or die "Can't open $tmpdir/log\n";
1594 seek(L, $pos, $whence); 1580 seek(L, $pos, $whence);
1595 while (<L>) { 1581 while (<L>) {
1596 print O; 1582 print O;
1597 } 1583 }
1598 close O; 1584 close O;
1599 close L; 1585 close L;
1600 } 1586 }
1601 1587
1602 send_email("KTEST: critical failure f 1588 send_email("KTEST: critical failure for test $i [$name]",
1603 "Your test started at $script 1589 "Your test started at $script_start_time has failed with:\n@_\n", $log_file);
1604 } 1590 }
1605 1591
1606 if (defined($post_test)) { 1592 if (defined($post_test)) {
1607 run_command $post_test; 1593 run_command $post_test;
1608 } 1594 }
1609 1595
1610 die @_, "\n"; 1596 die @_, "\n";
1611 } 1597 }
1612 1598
1613 sub create_pty { 1599 sub create_pty {
1614 my ($ptm, $pts) = @_; 1600 my ($ptm, $pts) = @_;
1615 my $tmp; 1601 my $tmp;
1616 my $TIOCSPTLCK = 0x40045431; 1602 my $TIOCSPTLCK = 0x40045431;
1617 my $TIOCGPTN = 0x80045430; 1603 my $TIOCGPTN = 0x80045430;
1618 1604
1619 sysopen($ptm, "/dev/ptmx", O_RDWR | O_NON 1605 sysopen($ptm, "/dev/ptmx", O_RDWR | O_NONBLOCK) or
1620 dodie "Can't open /dev/ptmx"; 1606 dodie "Can't open /dev/ptmx";
1621 1607
1622 # unlockpt() 1608 # unlockpt()
1623 $tmp = pack("i", 0); 1609 $tmp = pack("i", 0);
1624 ioctl($ptm, $TIOCSPTLCK, $tmp) or 1610 ioctl($ptm, $TIOCSPTLCK, $tmp) or
1625 dodie "ioctl TIOCSPTLCK for /dev/ptmx 1611 dodie "ioctl TIOCSPTLCK for /dev/ptmx failed";
1626 1612
1627 # ptsname() 1613 # ptsname()
1628 ioctl($ptm, $TIOCGPTN, $tmp) or 1614 ioctl($ptm, $TIOCGPTN, $tmp) or
1629 dodie "ioctl TIOCGPTN for /dev/ptmx f 1615 dodie "ioctl TIOCGPTN for /dev/ptmx failed";
1630 $tmp = unpack("i", $tmp); 1616 $tmp = unpack("i", $tmp);
1631 1617
1632 sysopen($pts, "/dev/pts/$tmp", O_RDWR | O 1618 sysopen($pts, "/dev/pts/$tmp", O_RDWR | O_NONBLOCK) or
1633 dodie "Can't open /dev/pts/$tmp"; 1619 dodie "Can't open /dev/pts/$tmp";
1634 } 1620 }
1635 1621
1636 sub exec_console { 1622 sub exec_console {
1637 my ($ptm, $pts) = @_; 1623 my ($ptm, $pts) = @_;
1638 1624
1639 close($ptm); 1625 close($ptm);
1640 1626
1641 close(\*STDIN); 1627 close(\*STDIN);
1642 close(\*STDOUT); 1628 close(\*STDOUT);
1643 close(\*STDERR); 1629 close(\*STDERR);
1644 1630
1645 open(\*STDIN, '<&', $pts); 1631 open(\*STDIN, '<&', $pts);
1646 open(\*STDOUT, '>&', $pts); 1632 open(\*STDOUT, '>&', $pts);
1647 open(\*STDERR, '>&', $pts); 1633 open(\*STDERR, '>&', $pts);
1648 1634
1649 close($pts); 1635 close($pts);
1650 1636
1651 exec $console or 1637 exec $console or
1652 dodie "Can't open console $console"; 1638 dodie "Can't open console $console";
1653 } 1639 }
1654 1640
1655 sub open_console { 1641 sub open_console {
1656 my ($ptm) = @_; 1642 my ($ptm) = @_;
1657 my $pts = \*PTSFD; 1643 my $pts = \*PTSFD;
1658 my $pid; 1644 my $pid;
1659 1645
1660 # save terminal settings 1646 # save terminal settings
1661 $stty_orig = `stty -g`; 1647 $stty_orig = `stty -g`;
1662 1648
1663 # place terminal in cbreak mode so that s 1649 # place terminal in cbreak mode so that stdin can be read one character at
1664 # a time without having to wait for a new 1650 # a time without having to wait for a newline
1665 system("stty -icanon -echo -icrnl"); 1651 system("stty -icanon -echo -icrnl");
1666 1652
1667 create_pty($ptm, $pts); 1653 create_pty($ptm, $pts);
1668 1654
1669 $pid = fork; 1655 $pid = fork;
1670 1656
1671 if (!$pid) { 1657 if (!$pid) {
1672 # child 1658 # child
1673 exec_console($ptm, $pts) 1659 exec_console($ptm, $pts)
1674 } 1660 }
1675 1661
1676 # parent 1662 # parent
1677 close($pts); 1663 close($pts);
1678 1664
1679 return $pid; 1665 return $pid;
1680 1666
1681 open(PTSFD, "Stop perl from warning about 1667 open(PTSFD, "Stop perl from warning about single use of PTSFD");
1682 } 1668 }
1683 1669
1684 sub close_console { 1670 sub close_console {
1685 my ($fp, $pid) = @_; 1671 my ($fp, $pid) = @_;
1686 1672
1687 doprint "kill child process $pid\n"; 1673 doprint "kill child process $pid\n";
1688 kill $close_console_signal, $pid; 1674 kill $close_console_signal, $pid;
1689 1675
1690 doprint "wait for child process $pid to e 1676 doprint "wait for child process $pid to exit\n";
1691 waitpid($pid, 0); 1677 waitpid($pid, 0);
1692 1678
1693 print "closing!\n"; 1679 print "closing!\n";
1694 close($fp); 1680 close($fp);
1695 1681
1696 # restore terminal settings 1682 # restore terminal settings
1697 system("stty $stty_orig"); 1683 system("stty $stty_orig");
1698 } 1684 }
1699 1685
1700 sub start_monitor { 1686 sub start_monitor {
1701 if ($monitor_cnt++) { 1687 if ($monitor_cnt++) {
1702 return; 1688 return;
1703 } 1689 }
1704 $monitor_fp = \*MONFD; 1690 $monitor_fp = \*MONFD;
1705 $monitor_pid = open_console $monitor_fp; 1691 $monitor_pid = open_console $monitor_fp;
1706 1692
1707 return; 1693 return;
1708 1694
1709 open(MONFD, "Stop perl from warning about 1695 open(MONFD, "Stop perl from warning about single use of MONFD");
1710 } 1696 }
1711 1697
1712 sub end_monitor { 1698 sub end_monitor {
1713 return if (!defined $console); 1699 return if (!defined $console);
1714 if (--$monitor_cnt) { 1700 if (--$monitor_cnt) {
1715 return; 1701 return;
1716 } 1702 }
1717 close_console($monitor_fp, $monitor_pid); 1703 close_console($monitor_fp, $monitor_pid);
1718 } 1704 }
1719 1705
1720 sub wait_for_monitor { 1706 sub wait_for_monitor {
1721 my ($time, $stop) = @_; 1707 my ($time, $stop) = @_;
1722 my $full_line = ""; 1708 my $full_line = "";
1723 my $line; 1709 my $line;
1724 my $booted = 0; 1710 my $booted = 0;
1725 my $start_time = time; 1711 my $start_time = time;
1726 my $skip_call_trace = 0; 1712 my $skip_call_trace = 0;
1727 my $bug = 0; 1713 my $bug = 0;
1728 my $bug_ignored = 0; 1714 my $bug_ignored = 0;
1729 my $now; 1715 my $now;
1730 1716
1731 doprint "** Wait for monitor to settle do 1717 doprint "** Wait for monitor to settle down **\n";
1732 1718
1733 # read the monitor and wait for the syste 1719 # read the monitor and wait for the system to calm down
1734 while (!$booted) { 1720 while (!$booted) {
1735 $line = wait_for_input($monitor_fp, $ 1721 $line = wait_for_input($monitor_fp, $time);
1736 last if (!defined($line)); 1722 last if (!defined($line));
1737 print "$line"; 1723 print "$line";
1738 $full_line .= $line; 1724 $full_line .= $line;
1739 1725
1740 if (defined($stop) && $full_line =~ / 1726 if (defined($stop) && $full_line =~ /$stop/) {
1741 doprint "wait for monitor detecte 1727 doprint "wait for monitor detected $stop\n";
1742 $booted = 1; 1728 $booted = 1;
1743 } 1729 }
1744 1730
1745 if ($full_line =~ /\[ backtrace testi 1731 if ($full_line =~ /\[ backtrace testing \]/) {
1746 $skip_call_trace = 1; 1732 $skip_call_trace = 1;
1747 } 1733 }
1748 1734
1749 if ($full_line =~ /call trace:/i) { 1735 if ($full_line =~ /call trace:/i) {
1750 if (!$bug && !$skip_call_trace) { 1736 if (!$bug && !$skip_call_trace) {
1751 if ($ignore_errors) { 1737 if ($ignore_errors) {
1752 $bug_ignored = 1; 1738 $bug_ignored = 1;
1753 } else { 1739 } else {
1754 $bug = 1; 1740 $bug = 1;
1755 } 1741 }
1756 } 1742 }
1757 } 1743 }
1758 1744
1759 if ($full_line =~ /\[ end of backtrac 1745 if ($full_line =~ /\[ end of backtrace testing \]/) {
1760 $skip_call_trace = 0; 1746 $skip_call_trace = 0;
1761 } 1747 }
1762 1748
1763 if ($full_line =~ /Kernel panic -/) { 1749 if ($full_line =~ /Kernel panic -/) {
1764 $bug = 1; 1750 $bug = 1;
1765 } 1751 }
1766 1752
1767 if ($line =~ /\n/) { 1753 if ($line =~ /\n/) {
1768 $full_line = ""; 1754 $full_line = "";
1769 } 1755 }
1770 $now = time; 1756 $now = time;
1771 if ($now - $start_time >= $max_monito 1757 if ($now - $start_time >= $max_monitor_wait) {
1772 doprint "Exiting monitor flush du 1758 doprint "Exiting monitor flush due to hitting MAX_MONITOR_WAIT\n";
1773 return 1; 1759 return 1;
1774 } 1760 }
1775 } 1761 }
1776 print "** Monitor flushed **\n"; 1762 print "** Monitor flushed **\n";
1777 1763
1778 # if stop is defined but wasn't hit, retu 1764 # if stop is defined but wasn't hit, return error
1779 # used by reboot (which wants to see a re 1765 # used by reboot (which wants to see a reboot)
1780 if (defined($stop) && !$booted) { 1766 if (defined($stop) && !$booted) {
1781 $bug = 1; 1767 $bug = 1;
1782 } 1768 }
1783 return $bug; 1769 return $bug;
1784 } 1770 }
1785 1771
1786 sub save_logs { 1772 sub save_logs {
1787 my ($result, $basedir) = @_; 1773 my ($result, $basedir) = @_;
1788 my @t = localtime; 1774 my @t = localtime;
1789 my $date = sprintf "%04d%02d%02d%02d%02d% 1775 my $date = sprintf "%04d%02d%02d%02d%02d%02d",
1790 1900+$t[5],$t[4],$t[3],$t[2],$t[1],$t 1776 1900+$t[5],$t[4],$t[3],$t[2],$t[1],$t[0];
1791 1777
1792 my $type = $build_type; 1778 my $type = $build_type;
1793 if ($type =~ /useconfig/) { 1779 if ($type =~ /useconfig/) {
1794 $type = "useconfig"; 1780 $type = "useconfig";
1795 } 1781 }
1796 1782
1797 my $dir = "$machine-$test_type-$type-$res 1783 my $dir = "$machine-$test_type-$type-$result-$date";
1798 1784
1799 $dir = "$basedir/$dir"; 1785 $dir = "$basedir/$dir";
1800 1786
1801 if (!-d $dir) { 1787 if (!-d $dir) {
1802 mkpath($dir) or 1788 mkpath($dir) or
1803 dodie "can't create $dir"; 1789 dodie "can't create $dir";
1804 } 1790 }
1805 1791
1806 my %files = ( 1792 my %files = (
1807 "config" => $output_config, 1793 "config" => $output_config,
1808 "buildlog" => $buildlog, 1794 "buildlog" => $buildlog,
1809 "dmesg" => $dmesg, 1795 "dmesg" => $dmesg,
1810 "testlog" => $testlog, 1796 "testlog" => $testlog,
1811 ); 1797 );
1812 1798
1813 while (my ($name, $source) = each(%files) 1799 while (my ($name, $source) = each(%files)) {
1814 if (-f "$source") { 1800 if (-f "$source") {
1815 cp "$source", "$dir/$name" or 1801 cp "$source", "$dir/$name" or
1816 dodie "failed to copy $source 1802 dodie "failed to copy $source";
1817 } 1803 }
1818 } 1804 }
1819 1805
1820 doprint "*** Saved info to $dir ***\n"; 1806 doprint "*** Saved info to $dir ***\n";
1821 } 1807 }
1822 1808
1823 sub fail { 1809 sub fail {
1824 1810
1825 if ($die_on_failure) { 1811 if ($die_on_failure) {
1826 dodie @_; 1812 dodie @_;
1827 } 1813 }
1828 1814
1829 doprint "FAILED\n"; 1815 doprint "FAILED\n";
1830 1816
1831 my $i = $iteration; 1817 my $i = $iteration;
1832 1818
1833 # no need to reboot for just building. 1819 # no need to reboot for just building.
1834 if (!do_not_reboot) { 1820 if (!do_not_reboot) {
1835 doprint "REBOOTING\n"; 1821 doprint "REBOOTING\n";
1836 reboot_to_good $sleep_time; 1822 reboot_to_good $sleep_time;
1837 } 1823 }
1838 1824
1839 my $name = ""; 1825 my $name = "";
1840 1826
1841 if (defined($test_name)) { 1827 if (defined($test_name)) {
1842 $name = " ($test_name)"; 1828 $name = " ($test_name)";
1843 } 1829 }
1844 1830
1845 print_times; 1831 print_times;
1846 1832
1847 doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 1833 doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
1848 doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 1834 doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
1849 doprint "KTEST RESULT: TEST $i$name Faile 1835 doprint "KTEST RESULT: TEST $i$name Failed: ", @_, "\n";
1850 doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 1836 doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
1851 doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 1837 doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
1852 1838
1853 if (defined($store_failures)) { 1839 if (defined($store_failures)) {
1854 save_logs "fail", $store_failures; 1840 save_logs "fail", $store_failures;
1855 } 1841 }
1856 1842
1857 if (defined($post_test)) { 1843 if (defined($post_test)) {
1858 run_command $post_test; 1844 run_command $post_test;
1859 } 1845 }
1860 1846
1861 return 1; 1847 return 1;
1862 } 1848 }
1863 1849
1864 sub run_command { 1850 sub run_command {
1865 my ($command, $redirect, $timeout) = @_; 1851 my ($command, $redirect, $timeout) = @_;
1866 my $start_time; 1852 my $start_time;
1867 my $end_time; 1853 my $end_time;
1868 my $dolog = 0; 1854 my $dolog = 0;
1869 my $dord = 0; 1855 my $dord = 0;
1870 my $dostdout = 0; 1856 my $dostdout = 0;
1871 my $pid; 1857 my $pid;
1872 my $command_orig = $command; 1858 my $command_orig = $command;
1873 1859
1874 $command =~ s/\$SSH_USER/$ssh_user/g; 1860 $command =~ s/\$SSH_USER/$ssh_user/g;
1875 $command =~ s/\$MACHINE/$machine/g; 1861 $command =~ s/\$MACHINE/$machine/g;
1876 1862
1877 if (!defined($timeout)) { 1863 if (!defined($timeout)) {
1878 $timeout = $run_timeout; 1864 $timeout = $run_timeout;
1879 } 1865 }
1880 1866
1881 if (!defined($timeout)) { 1867 if (!defined($timeout)) {
1882 $timeout = -1; # tell wait_for_input 1868 $timeout = -1; # tell wait_for_input to wait indefinitely
1883 } 1869 }
1884 1870
1885 doprint("$command ... "); 1871 doprint("$command ... ");
1886 $start_time = time; 1872 $start_time = time;
1887 1873
1888 $pid = open(CMD, "$command 2>&1 |") or 1874 $pid = open(CMD, "$command 2>&1 |") or
1889 (fail "unable to exec $command" and r 1875 (fail "unable to exec $command" and return 0);
1890 1876
1891 if (defined($opt{"LOG_FILE"})) { 1877 if (defined($opt{"LOG_FILE"})) {
1892 $dolog = 1; 1878 $dolog = 1;
1893 } 1879 }
1894 1880
1895 if (defined($redirect)) { 1881 if (defined($redirect)) {
1896 if ($redirect eq 1) { 1882 if ($redirect eq 1) {
1897 $dostdout = 1; 1883 $dostdout = 1;
1898 # Have the output of the command 1884 # Have the output of the command on its own line
1899 doprint "\n"; 1885 doprint "\n";
1900 } else { 1886 } else {
1901 open (RD, ">$redirect") or 1887 open (RD, ">$redirect") or
1902 dodie "failed to write to red 1888 dodie "failed to write to redirect $redirect";
1903 $dord = 1; 1889 $dord = 1;
1904 } 1890 }
1905 } 1891 }
1906 1892
1907 my $hit_timeout = 0; 1893 my $hit_timeout = 0;
1908 1894
1909 while (1) { 1895 while (1) {
1910 my $fp = \*CMD; 1896 my $fp = \*CMD;
1911 my $line = wait_for_input($fp, $timeo 1897 my $line = wait_for_input($fp, $timeout);
1912 if (!defined($line)) { 1898 if (!defined($line)) {
1913 my $now = time; 1899 my $now = time;
1914 if ($timeout >= 0 && (($now - $st 1900 if ($timeout >= 0 && (($now - $start_time) >= $timeout)) {
1915 doprint "Hit timeout of $time 1901 doprint "Hit timeout of $timeout, killing process\n";
1916 $hit_timeout = 1; 1902 $hit_timeout = 1;
1917 kill 9, $pid; 1903 kill 9, $pid;
1918 } 1904 }
1919 last; 1905 last;
1920 } 1906 }
1921 print LOG $line if ($dolog); 1907 print LOG $line if ($dolog);
1922 print RD $line if ($dord); 1908 print RD $line if ($dord);
1923 print $line if ($dostdout); 1909 print $line if ($dostdout);
1924 } 1910 }
1925 1911
1926 waitpid($pid, 0); 1912 waitpid($pid, 0);
1927 # shift 8 for real exit status 1913 # shift 8 for real exit status
1928 $run_command_status = $? >> 8; 1914 $run_command_status = $? >> 8;
1929 1915
1930 if ($command_orig eq $default{REBOOT} && 1916 if ($command_orig eq $default{REBOOT} &&
1931 $run_command_status == $reboot_return 1917 $run_command_status == $reboot_return_code) {
1932 $run_command_status = 0; 1918 $run_command_status = 0;
1933 } 1919 }
1934 1920
1935 close(CMD); 1921 close(CMD);
1936 close(RD) if ($dord); 1922 close(RD) if ($dord);
1937 1923
1938 $end_time = time; 1924 $end_time = time;
1939 my $delta = $end_time - $start_time; 1925 my $delta = $end_time - $start_time;
1940 1926
1941 if ($delta == 1) { 1927 if ($delta == 1) {
1942 doprint "[1 second] "; 1928 doprint "[1 second] ";
1943 } else { 1929 } else {
1944 doprint "[$delta seconds] "; 1930 doprint "[$delta seconds] ";
1945 } 1931 }
1946 1932
1947 if ($hit_timeout) { 1933 if ($hit_timeout) {
1948 $run_command_status = 1; 1934 $run_command_status = 1;
1949 } 1935 }
1950 1936
1951 if ($run_command_status) { 1937 if ($run_command_status) {
1952 doprint "FAILED!\n"; 1938 doprint "FAILED!\n";
1953 } else { 1939 } else {
1954 doprint "SUCCESS\n"; 1940 doprint "SUCCESS\n";
1955 } 1941 }
1956 1942
1957 return !$run_command_status; 1943 return !$run_command_status;
1958 } 1944 }
1959 1945
1960 sub run_ssh { 1946 sub run_ssh {
1961 my ($cmd, $timeout) = @_; 1947 my ($cmd, $timeout) = @_;
1962 my $cp_exec = $ssh_exec; 1948 my $cp_exec = $ssh_exec;
1963 1949
1964 $cp_exec =~ s/\$SSH_COMMAND/$cmd/g; 1950 $cp_exec =~ s/\$SSH_COMMAND/$cmd/g;
1965 return run_command "$cp_exec", undef , $t 1951 return run_command "$cp_exec", undef , $timeout;
1966 } 1952 }
1967 1953
1968 sub run_scp { 1954 sub run_scp {
1969 my ($src, $dst, $cp_scp) = @_; 1955 my ($src, $dst, $cp_scp) = @_;
1970 1956
1971 $cp_scp =~ s/\$SRC_FILE/$src/g; 1957 $cp_scp =~ s/\$SRC_FILE/$src/g;
1972 $cp_scp =~ s/\$DST_FILE/$dst/g; 1958 $cp_scp =~ s/\$DST_FILE/$dst/g;
1973 1959
1974 return run_command "$cp_scp"; 1960 return run_command "$cp_scp";
1975 } 1961 }
1976 1962
1977 sub run_scp_install { 1963 sub run_scp_install {
1978 my ($src, $dst) = @_; 1964 my ($src, $dst) = @_;
1979 1965
1980 my $cp_scp = $scp_to_target_install; 1966 my $cp_scp = $scp_to_target_install;
1981 1967
1982 return run_scp($src, $dst, $cp_scp); 1968 return run_scp($src, $dst, $cp_scp);
1983 } 1969 }
1984 1970
1985 sub run_scp_mod { 1971 sub run_scp_mod {
1986 my ($src, $dst) = @_; 1972 my ($src, $dst) = @_;
1987 1973
1988 my $cp_scp = $scp_to_target; 1974 my $cp_scp = $scp_to_target;
1989 1975
1990 return run_scp($src, $dst, $cp_scp); 1976 return run_scp($src, $dst, $cp_scp);
1991 } 1977 }
1992 1978
1993 sub _get_grub_index { 1979 sub _get_grub_index {
1994 1980
1995 my ($command, $target, $skip, $submenu) = 1981 my ($command, $target, $skip, $submenu) = @_;
1996 1982
1997 return if (defined($grub_number) && defin 1983 return if (defined($grub_number) && defined($last_grub_menu) &&
1998 $last_grub_menu eq $grub_menu && defi 1984 $last_grub_menu eq $grub_menu && defined($last_machine) &&
1999 $last_machine eq $machine); 1985 $last_machine eq $machine);
2000 1986
2001 doprint "Find $reboot_type menu ... "; 1987 doprint "Find $reboot_type menu ... ";
2002 $grub_number = -1; 1988 $grub_number = -1;
2003 1989
2004 my $ssh_grub = $ssh_exec; 1990 my $ssh_grub = $ssh_exec;
2005 $ssh_grub =~ s,\$SSH_COMMAND,$command,g; 1991 $ssh_grub =~ s,\$SSH_COMMAND,$command,g;
2006 1992
2007 open(IN, "$ssh_grub |") or 1993 open(IN, "$ssh_grub |") or
2008 dodie "unable to execute $command"; 1994 dodie "unable to execute $command";
2009 1995
2010 my $found = 0; 1996 my $found = 0;
2011 1997
2012 my $submenu_number = 0; 1998 my $submenu_number = 0;
2013 1999
2014 while (<IN>) { 2000 while (<IN>) {
2015 if (/$target/) { 2001 if (/$target/) {
2016 $grub_number++; 2002 $grub_number++;
2017 $found = 1; 2003 $found = 1;
2018 last; 2004 last;
2019 } elsif (defined($submenu) && /$subme 2005 } elsif (defined($submenu) && /$submenu/) {
2020 $submenu_number++; 2006 $submenu_number++;
2021 $grub_number = -1; 2007 $grub_number = -1;
2022 } elsif (/$skip/) { 2008 } elsif (/$skip/) {
2023 $grub_number++; 2009 $grub_number++;
2024 } 2010 }
2025 } 2011 }
2026 close(IN); 2012 close(IN);
2027 2013
2028 dodie "Could not find '$grub_menu' throug 2014 dodie "Could not find '$grub_menu' through $command on $machine"
2029 if (!$found); 2015 if (!$found);
2030 if ($submenu_number > 0) { 2016 if ($submenu_number > 0) {
2031 $grub_number = "$submenu_number>$grub 2017 $grub_number = "$submenu_number>$grub_number";
2032 } 2018 }
2033 doprint "$grub_number\n"; 2019 doprint "$grub_number\n";
2034 $last_grub_menu = $grub_menu; 2020 $last_grub_menu = $grub_menu;
2035 $last_machine = $machine; 2021 $last_machine = $machine;
2036 } 2022 }
2037 2023
2038 sub get_grub_index { 2024 sub get_grub_index {
2039 2025
2040 my $command; 2026 my $command;
2041 my $target; 2027 my $target;
2042 my $skip; 2028 my $skip;
2043 my $submenu; 2029 my $submenu;
2044 my $grub_menu_qt; 2030 my $grub_menu_qt;
2045 2031
2046 if ($reboot_type !~ /^grub/) { 2032 if ($reboot_type !~ /^grub/) {
2047 return; 2033 return;
2048 } 2034 }
2049 2035
2050 $grub_menu_qt = quotemeta($grub_menu); 2036 $grub_menu_qt = quotemeta($grub_menu);
2051 2037
2052 if ($reboot_type eq "grub") { 2038 if ($reboot_type eq "grub") {
2053 $command = "cat /boot/grub/menu.lst"; 2039 $command = "cat /boot/grub/menu.lst";
2054 $target = '^\s*title\s+' . $grub_menu 2040 $target = '^\s*title\s+' . $grub_menu_qt . '\s*$';
2055 $skip = '^\s*title\s'; 2041 $skip = '^\s*title\s';
2056 } elsif ($reboot_type eq "grub2") { 2042 } elsif ($reboot_type eq "grub2") {
2057 $command = "cat $grub_file"; 2043 $command = "cat $grub_file";
2058 $target = '^\s*menuentry.*' . $grub_m 2044 $target = '^\s*menuentry.*' . $grub_menu_qt;
2059 $skip = '^\s*menuentry\s'; !! 2045 $skip = '^\s*menuentry';
2060 $submenu = '^\s*submenu\s'; 2046 $submenu = '^\s*submenu\s';
2061 } elsif ($reboot_type eq "grub2bls") { 2047 } elsif ($reboot_type eq "grub2bls") {
2062 $command = $grub_bls_get; 2048 $command = $grub_bls_get;
2063 $target = '^title=.*' . $grub_menu_qt 2049 $target = '^title=.*' . $grub_menu_qt;
2064 $skip = '^title='; 2050 $skip = '^title=';
2065 } else { 2051 } else {
2066 return; 2052 return;
2067 } 2053 }
2068 2054
2069 _get_grub_index($command, $target, $skip, 2055 _get_grub_index($command, $target, $skip, $submenu);
2070 } 2056 }
2071 2057
2072 sub wait_for_input { 2058 sub wait_for_input {
2073 my ($fp, $time) = @_; 2059 my ($fp, $time) = @_;
2074 my $start_time; 2060 my $start_time;
2075 my $rin; 2061 my $rin;
2076 my $rout; 2062 my $rout;
2077 my $nr; 2063 my $nr;
2078 my $buf; 2064 my $buf;
2079 my $line; 2065 my $line;
2080 my $ch; 2066 my $ch;
2081 2067
2082 if (!defined($time)) { 2068 if (!defined($time)) {
2083 $time = $timeout; 2069 $time = $timeout;
2084 } 2070 }
2085 2071
2086 if ($time < 0) { 2072 if ($time < 0) {
2087 # Negative number means wait indefini 2073 # Negative number means wait indefinitely
2088 undef $time; 2074 undef $time;
2089 } 2075 }
2090 2076
2091 $rin = ''; 2077 $rin = '';
2092 vec($rin, fileno($fp), 1) = 1; 2078 vec($rin, fileno($fp), 1) = 1;
2093 vec($rin, fileno(\*STDIN), 1) = 1; 2079 vec($rin, fileno(\*STDIN), 1) = 1;
2094 2080
2095 $start_time = time; 2081 $start_time = time;
2096 2082
2097 while (1) { 2083 while (1) {
2098 $nr = select($rout=$rin, undef, undef 2084 $nr = select($rout=$rin, undef, undef, $time);
2099 2085
2100 last if ($nr <= 0); 2086 last if ($nr <= 0);
2101 2087
2102 # copy data from stdin to the console 2088 # copy data from stdin to the console
2103 if (vec($rout, fileno(\*STDIN), 1) == 2089 if (vec($rout, fileno(\*STDIN), 1) == 1) {
2104 $nr = sysread(\*STDIN, $buf, 1000 2090 $nr = sysread(\*STDIN, $buf, 1000);
2105 syswrite($fp, $buf, $nr) if ($nr 2091 syswrite($fp, $buf, $nr) if ($nr > 0);
2106 } 2092 }
2107 2093
2108 # The timeout is based on time waitin 2094 # The timeout is based on time waiting for the fp data
2109 if (vec($rout, fileno($fp), 1) != 1) 2095 if (vec($rout, fileno($fp), 1) != 1) {
2110 last if (defined($time) && (time 2096 last if (defined($time) && (time - $start_time > $time));
2111 next; 2097 next;
2112 } 2098 }
2113 2099
2114 $line = ""; 2100 $line = "";
2115 2101
2116 # try to read one char at a time 2102 # try to read one char at a time
2117 while (sysread $fp, $ch, 1) { 2103 while (sysread $fp, $ch, 1) {
2118 $line .= $ch; 2104 $line .= $ch;
2119 last if ($ch eq "\n"); 2105 last if ($ch eq "\n");
2120 } 2106 }
2121 2107
2122 last if (!length($line)); 2108 last if (!length($line));
2123 2109
2124 return $line; 2110 return $line;
2125 } 2111 }
2126 return undef; 2112 return undef;
2127 } 2113 }
2128 2114
2129 sub reboot_to { 2115 sub reboot_to {
2130 if (defined($switch_to_test)) { 2116 if (defined($switch_to_test)) {
2131 run_command $switch_to_test; 2117 run_command $switch_to_test;
2132 } 2118 }
2133 2119
2134 if ($reboot_type eq "grub") { 2120 if ($reboot_type eq "grub") {
2135 run_ssh "'(echo \"savedefault --defau 2121 run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch)'";
2136 } elsif (($reboot_type eq "grub2") or ($r 2122 } elsif (($reboot_type eq "grub2") or ($reboot_type eq "grub2bls")) {
2137 run_ssh "$grub_reboot \"'$grub_number 2123 run_ssh "$grub_reboot \"'$grub_number'\"";
2138 } elsif ($reboot_type eq "syslinux") { 2124 } elsif ($reboot_type eq "syslinux") {
2139 run_ssh "$syslinux --once \\\"$syslin 2125 run_ssh "$syslinux --once \\\"$syslinux_label\\\" $syslinux_path";
2140 } elsif (defined $reboot_script) { 2126 } elsif (defined $reboot_script) {
2141 run_command "$reboot_script"; 2127 run_command "$reboot_script";
2142 } 2128 }
2143 reboot; 2129 reboot;
2144 } 2130 }
2145 2131
2146 sub get_sha1 { 2132 sub get_sha1 {
2147 my ($commit) = @_; 2133 my ($commit) = @_;
2148 2134
2149 doprint "git rev-list --max-count=1 $comm 2135 doprint "git rev-list --max-count=1 $commit ... ";
2150 my $sha1 = `git rev-list --max-count=1 $c 2136 my $sha1 = `git rev-list --max-count=1 $commit`;
2151 my $ret = $?; 2137 my $ret = $?;
2152 2138
2153 logit $sha1; 2139 logit $sha1;
2154 2140
2155 if ($ret) { 2141 if ($ret) {
2156 doprint "FAILED\n"; 2142 doprint "FAILED\n";
2157 dodie "Failed to get git $commit"; 2143 dodie "Failed to get git $commit";
2158 } 2144 }
2159 2145
2160 print "SUCCESS\n"; 2146 print "SUCCESS\n";
2161 2147
2162 chomp $sha1; 2148 chomp $sha1;
2163 2149
2164 return $sha1; 2150 return $sha1;
2165 } 2151 }
2166 2152
2167 sub monitor { 2153 sub monitor {
2168 my $booted = 0; 2154 my $booted = 0;
2169 my $bug = 0; 2155 my $bug = 0;
2170 my $bug_ignored = 0; 2156 my $bug_ignored = 0;
2171 my $skip_call_trace = 0; 2157 my $skip_call_trace = 0;
2172 my $loops; 2158 my $loops;
2173 2159
2174 my $start_time = time; 2160 my $start_time = time;
2175 2161
2176 wait_for_monitor 5; 2162 wait_for_monitor 5;
2177 2163
2178 my $line; 2164 my $line;
2179 my $full_line = ""; 2165 my $full_line = "";
2180 2166
2181 open(DMESG, "> $dmesg") or 2167 open(DMESG, "> $dmesg") or
2182 dodie "unable to write to $dmesg"; 2168 dodie "unable to write to $dmesg";
2183 2169
2184 reboot_to; 2170 reboot_to;
2185 2171
2186 my $success_start; 2172 my $success_start;
2187 my $failure_start; 2173 my $failure_start;
2188 my $monitor_start = time; 2174 my $monitor_start = time;
2189 my $done = 0; 2175 my $done = 0;
2190 my $version_found = 0; 2176 my $version_found = 0;
2191 2177
2192 while (!$done) { 2178 while (!$done) {
2193 if ($bug && defined($stop_after_failu 2179 if ($bug && defined($stop_after_failure) &&
2194 $stop_after_failure >= 0) { 2180 $stop_after_failure >= 0) {
2195 my $time = $stop_after_failure - 2181 my $time = $stop_after_failure - (time - $failure_start);
2196 $line = wait_for_input($monitor_f 2182 $line = wait_for_input($monitor_fp, $time);
2197 if (!defined($line)) { 2183 if (!defined($line)) {
2198 doprint "bug timed out after 2184 doprint "bug timed out after $booted_timeout seconds\n";
2199 doprint "Test forced to stop 2185 doprint "Test forced to stop after $stop_after_failure seconds after failure\n";
2200 last; 2186 last;
2201 } 2187 }
2202 } elsif ($booted) { 2188 } elsif ($booted) {
2203 $line = wait_for_input($monitor_f 2189 $line = wait_for_input($monitor_fp, $booted_timeout);
2204 if (!defined($line)) { 2190 if (!defined($line)) {
2205 my $s = $booted_timeout == 1 2191 my $s = $booted_timeout == 1 ? "" : "s";
2206 doprint "Successful boot foun 2192 doprint "Successful boot found: break after $booted_timeout second$s\n";
2207 last; 2193 last;
2208 } 2194 }
2209 } else { 2195 } else {
2210 $line = wait_for_input($monitor_f 2196 $line = wait_for_input($monitor_fp);
2211 if (!defined($line)) { 2197 if (!defined($line)) {
2212 my $s = $timeout == 1 ? "" : 2198 my $s = $timeout == 1 ? "" : "s";
2213 doprint "Timed out after $tim 2199 doprint "Timed out after $timeout second$s\n";
2214 last; 2200 last;
2215 } 2201 }
2216 } 2202 }
2217 2203
2218 doprint $line; 2204 doprint $line;
2219 print DMESG $line; 2205 print DMESG $line;
2220 2206
2221 # we are not guaranteed to get a full 2207 # we are not guaranteed to get a full line
2222 $full_line .= $line; 2208 $full_line .= $line;
2223 2209
2224 if ($full_line =~ /$success_line/) { 2210 if ($full_line =~ /$success_line/) {
2225 $booted = 1; 2211 $booted = 1;
2226 $success_start = time; 2212 $success_start = time;
2227 } 2213 }
2228 2214
2229 if ($booted && defined($stop_after_su 2215 if ($booted && defined($stop_after_success) &&
2230 $stop_after_success >= 0) { 2216 $stop_after_success >= 0) {
2231 my $now = time; 2217 my $now = time;
2232 if ($now - $success_start >= $sto 2218 if ($now - $success_start >= $stop_after_success) {
2233 doprint "Test forced to stop 2219 doprint "Test forced to stop after $stop_after_success seconds after success\n";
2234 last; 2220 last;
2235 } 2221 }
2236 } 2222 }
2237 2223
2238 if ($full_line =~ /\[ backtrace testi 2224 if ($full_line =~ /\[ backtrace testing \]/) {
2239 $skip_call_trace = 1; 2225 $skip_call_trace = 1;
2240 } 2226 }
2241 2227
2242 if ($full_line =~ /call trace:/i) { 2228 if ($full_line =~ /call trace:/i) {
2243 if (!$bug && !$skip_call_trace) { 2229 if (!$bug && !$skip_call_trace) {
2244 if ($ignore_errors) { 2230 if ($ignore_errors) {
2245 $bug_ignored = 1; 2231 $bug_ignored = 1;
2246 } else { 2232 } else {
2247 $bug = 1; 2233 $bug = 1;
2248 $failure_start = time; 2234 $failure_start = time;
2249 } 2235 }
2250 } 2236 }
2251 } 2237 }
2252 2238
2253 if ($bug && defined($stop_after_failu 2239 if ($bug && defined($stop_after_failure) &&
2254 $stop_after_failure >= 0) { 2240 $stop_after_failure >= 0) {
2255 my $now = time; 2241 my $now = time;
2256 if ($now - $failure_start >= $sto 2242 if ($now - $failure_start >= $stop_after_failure) {
2257 doprint "Test forced to stop 2243 doprint "Test forced to stop after $stop_after_failure seconds after failure\n";
2258 last; 2244 last;
2259 } 2245 }
2260 } 2246 }
2261 2247
2262 if ($full_line =~ /\[ end of backtrac 2248 if ($full_line =~ /\[ end of backtrace testing \]/) {
2263 $skip_call_trace = 0; 2249 $skip_call_trace = 0;
2264 } 2250 }
2265 2251
2266 if ($full_line =~ /Kernel panic -/) { 2252 if ($full_line =~ /Kernel panic -/) {
2267 $failure_start = time; 2253 $failure_start = time;
2268 $bug = 1; 2254 $bug = 1;
2269 } 2255 }
2270 2256
2271 # Detect triple faults by testing the 2257 # Detect triple faults by testing the banner
2272 if ($full_line =~ /\bLinux version (\ 2258 if ($full_line =~ /\bLinux version (\S+).*\n/) {
2273 if ($1 eq $version) { 2259 if ($1 eq $version) {
2274 $version_found = 1; 2260 $version_found = 1;
2275 } elsif ($version_found && $detec 2261 } elsif ($version_found && $detect_triplefault) {
2276 # We already booted into the 2262 # We already booted into the kernel we are testing,
2277 # but now we booted into anot 2263 # but now we booted into another kernel?
2278 # Consider this a triple faul 2264 # Consider this a triple fault.
2279 doprint "Already booted in Li 2265 doprint "Already booted in Linux kernel $version, but now\n";
2280 doprint "we booted into Linux 2266 doprint "we booted into Linux kernel $1.\n";
2281 doprint "Assuming that this i 2267 doprint "Assuming that this is a triple fault.\n";
2282 doprint "To disable this: set 2268 doprint "To disable this: set DETECT_TRIPLE_FAULT to 0\n";
2283 last; 2269 last;
2284 } 2270 }
2285 } 2271 }
2286 2272
2287 if ($line =~ /\n/) { 2273 if ($line =~ /\n/) {
2288 $full_line = ""; 2274 $full_line = "";
2289 } 2275 }
2290 2276
2291 if ($stop_test_after > 0 && !$booted 2277 if ($stop_test_after > 0 && !$booted && !$bug) {
2292 if (time - $monitor_start > $stop 2278 if (time - $monitor_start > $stop_test_after) {
2293 doprint "STOP_TEST_AFTER ($st 2279 doprint "STOP_TEST_AFTER ($stop_test_after seconds) timed out\n";
2294 $done = 1; 2280 $done = 1;
2295 } 2281 }
2296 } 2282 }
2297 } 2283 }
2298 2284
2299 my $end_time = time; 2285 my $end_time = time;
2300 $reboot_time = $end_time - $start_time; 2286 $reboot_time = $end_time - $start_time;
2301 2287
2302 close(DMESG); 2288 close(DMESG);
2303 2289
2304 if ($bug) { 2290 if ($bug) {
2305 return 0 if ($in_bisect); 2291 return 0 if ($in_bisect);
2306 fail "failed - got a bug report" and 2292 fail "failed - got a bug report" and return 0;
2307 } 2293 }
2308 2294
2309 if (!$booted) { 2295 if (!$booted) {
2310 return 0 if ($in_bisect); 2296 return 0 if ($in_bisect);
2311 fail "failed - never got a boot promp 2297 fail "failed - never got a boot prompt." and return 0;
2312 } 2298 }
2313 2299
2314 if ($bug_ignored) { 2300 if ($bug_ignored) {
2315 doprint "WARNING: Call Trace detected 2301 doprint "WARNING: Call Trace detected but ignored due to IGNORE_ERRORS=1\n";
2316 } 2302 }
2317 2303
2318 return 1; 2304 return 1;
2319 } 2305 }
2320 2306
2321 sub eval_kernel_version { 2307 sub eval_kernel_version {
2322 my ($option) = @_; 2308 my ($option) = @_;
2323 2309
2324 $option =~ s/\$KERNEL_VERSION/$version/g; 2310 $option =~ s/\$KERNEL_VERSION/$version/g;
2325 2311
2326 return $option; 2312 return $option;
2327 } 2313 }
2328 2314
2329 sub do_post_install { 2315 sub do_post_install {
2330 2316
2331 return if (!defined($post_install)); 2317 return if (!defined($post_install));
2332 2318
2333 my $cp_post_install = eval_kernel_version 2319 my $cp_post_install = eval_kernel_version $post_install;
2334 run_command "$cp_post_install" or 2320 run_command "$cp_post_install" or
2335 dodie "Failed to run post install"; 2321 dodie "Failed to run post install";
2336 } 2322 }
2337 2323
2338 # Sometimes the reboot fails, and will hang. 2324 # Sometimes the reboot fails, and will hang. We try to ssh to the box
2339 # and if we fail, we force another reboot, th 2325 # and if we fail, we force another reboot, that should powercycle it.
2340 sub test_booted { 2326 sub test_booted {
2341 if (!run_ssh "echo testing connection") { 2327 if (!run_ssh "echo testing connection") {
2342 reboot $sleep_time; 2328 reboot $sleep_time;
2343 } 2329 }
2344 } 2330 }
2345 2331
2346 sub install { 2332 sub install {
2347 2333
2348 return if ($no_install); 2334 return if ($no_install);
2349 2335
2350 my $start_time = time; 2336 my $start_time = time;
2351 2337
2352 if (defined($pre_install)) { 2338 if (defined($pre_install)) {
2353 my $cp_pre_install = eval_kernel_vers 2339 my $cp_pre_install = eval_kernel_version $pre_install;
2354 run_command "$cp_pre_install" or 2340 run_command "$cp_pre_install" or
2355 dodie "Failed to run pre install" 2341 dodie "Failed to run pre install";
2356 } 2342 }
2357 2343
2358 my $cp_target = eval_kernel_version $targ 2344 my $cp_target = eval_kernel_version $target_image;
2359 2345
2360 test_booted; 2346 test_booted;
2361 2347
2362 run_scp_install "$outputdir/$build_target 2348 run_scp_install "$outputdir/$build_target", "$cp_target" or
2363 dodie "failed to copy image"; 2349 dodie "failed to copy image";
2364 2350
2365 my $install_mods = 0; 2351 my $install_mods = 0;
2366 2352
2367 # should we process modules? 2353 # should we process modules?
2368 $install_mods = 0; 2354 $install_mods = 0;
2369 open(IN, "$output_config") or dodie("Can' 2355 open(IN, "$output_config") or dodie("Can't read config file");
2370 while (<IN>) { 2356 while (<IN>) {
2371 if (/CONFIG_MODULES(=y)?/) { 2357 if (/CONFIG_MODULES(=y)?/) {
2372 if (defined($1)) { 2358 if (defined($1)) {
2373 $install_mods = 1; 2359 $install_mods = 1;
2374 last; 2360 last;
2375 } 2361 }
2376 } 2362 }
2377 } 2363 }
2378 close(IN); 2364 close(IN);
2379 2365
2380 if (!$install_mods) { 2366 if (!$install_mods) {
2381 do_post_install; 2367 do_post_install;
2382 doprint "No modules needed\n"; 2368 doprint "No modules needed\n";
2383 my $end_time = time; 2369 my $end_time = time;
2384 $install_time = $end_time - $start_ti 2370 $install_time = $end_time - $start_time;
2385 return; 2371 return;
2386 } 2372 }
2387 2373
2388 run_command "$make INSTALL_MOD_STRIP=1 IN 2374 run_command "$make INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=$tmpdir modules_install" or
2389 dodie "Failed to install modules"; 2375 dodie "Failed to install modules";
2390 2376
2391 my $modlib = "/lib/modules/$version"; 2377 my $modlib = "/lib/modules/$version";
2392 my $modtar = "ktest-mods.tar.bz2"; 2378 my $modtar = "ktest-mods.tar.bz2";
2393 2379
2394 run_ssh "rm -rf $modlib" or 2380 run_ssh "rm -rf $modlib" or
2395 dodie "failed to remove old mods: $mo 2381 dodie "failed to remove old mods: $modlib";
2396 2382
2397 # would be nice if scp -r did not follow 2383 # would be nice if scp -r did not follow symbolic links
2398 run_command "cd $tmpdir && tar -cjf $modt 2384 run_command "cd $tmpdir && tar -cjf $modtar lib/modules/$version" or
2399 dodie "making tarball"; 2385 dodie "making tarball";
2400 2386
2401 run_scp_mod "$tmpdir/$modtar", "/tmp" or 2387 run_scp_mod "$tmpdir/$modtar", "/tmp" or
2402 dodie "failed to copy modules"; 2388 dodie "failed to copy modules";
2403 2389
2404 unlink "$tmpdir/$modtar"; 2390 unlink "$tmpdir/$modtar";
2405 2391
2406 run_ssh "'(cd / && tar xjf /tmp/$modtar)' 2392 run_ssh "'(cd / && tar xjf /tmp/$modtar)'" or
2407 dodie "failed to tar modules"; 2393 dodie "failed to tar modules";
2408 2394
2409 run_ssh "rm -f /tmp/$modtar"; 2395 run_ssh "rm -f /tmp/$modtar";
2410 2396
2411 do_post_install; 2397 do_post_install;
2412 2398
2413 my $end_time = time; 2399 my $end_time = time;
2414 $install_time = $end_time - $start_time; 2400 $install_time = $end_time - $start_time;
2415 } 2401 }
2416 2402
2417 sub get_version { 2403 sub get_version {
2418 # get the release name 2404 # get the release name
2419 return if ($have_version); 2405 return if ($have_version);
2420 doprint "$make kernelrelease ... "; 2406 doprint "$make kernelrelease ... ";
2421 $version = `$make -s kernelrelease | tail 2407 $version = `$make -s kernelrelease | tail -1`;
2422 chomp($version); 2408 chomp($version);
2423 doprint "$version\n"; 2409 doprint "$version\n";
2424 $have_version = 1; 2410 $have_version = 1;
2425 } 2411 }
2426 2412
2427 sub start_monitor_and_install { 2413 sub start_monitor_and_install {
2428 # Make sure the stable kernel has finishe 2414 # Make sure the stable kernel has finished booting
2429 2415
2430 # Install bisects, don't need console 2416 # Install bisects, don't need console
2431 if (defined $console) { 2417 if (defined $console) {
2432 start_monitor; 2418 start_monitor;
2433 wait_for_monitor 5; 2419 wait_for_monitor 5;
2434 end_monitor; 2420 end_monitor;
2435 } 2421 }
2436 2422
2437 get_grub_index; 2423 get_grub_index;
2438 get_version; 2424 get_version;
2439 install; 2425 install;
2440 2426
2441 start_monitor if (defined $console); 2427 start_monitor if (defined $console);
2442 return monitor; 2428 return monitor;
2443 } 2429 }
2444 2430
2445 sub process_warning_line { 2431 sub process_warning_line {
2446 my ($line) = @_; 2432 my ($line) = @_;
2447 2433
2448 chomp $line; 2434 chomp $line;
2449 2435
2450 # for distcc heterogeneous systems, some 2436 # for distcc heterogeneous systems, some compilers
2451 # do things differently causing warning l 2437 # do things differently causing warning lines
2452 # to be slightly different. This makes an 2438 # to be slightly different. This makes an attempt
2453 # to fixe those issues. 2439 # to fixe those issues.
2454 2440
2455 # chop off the index into the line 2441 # chop off the index into the line
2456 # using distcc, some compilers give diffe 2442 # using distcc, some compilers give different indexes
2457 # depending on white space 2443 # depending on white space
2458 $line =~ s/^(\s*\S+:\d+:)\d+/$1/; 2444 $line =~ s/^(\s*\S+:\d+:)\d+/$1/;
2459 2445
2460 # Some compilers use UTF-8 extended for q 2446 # Some compilers use UTF-8 extended for quotes and some don't.
2461 $line =~ s/$utf8_quote/'/g; 2447 $line =~ s/$utf8_quote/'/g;
2462 2448
2463 return $line; 2449 return $line;
2464 } 2450 }
2465 2451
2466 # Read buildlog and check against warnings fi 2452 # Read buildlog and check against warnings file for any
2467 # new warnings. 2453 # new warnings.
2468 # 2454 #
2469 # Returns 1 if OK 2455 # Returns 1 if OK
2470 # 0 otherwise 2456 # 0 otherwise
2471 sub check_buildlog { 2457 sub check_buildlog {
>> 2458 return 1 if (!defined $warnings_file);
>> 2459
2472 my %warnings_list; 2460 my %warnings_list;
2473 2461
2474 # Failed builds should not reboot the tar 2462 # Failed builds should not reboot the target
2475 my $save_no_reboot = $no_reboot; 2463 my $save_no_reboot = $no_reboot;
2476 $no_reboot = 1; 2464 $no_reboot = 1;
2477 2465
2478 if (-f $warnings_file) { 2466 if (-f $warnings_file) {
2479 open(IN, $warnings_file) or 2467 open(IN, $warnings_file) or
2480 dodie "Error opening $warnings_fi 2468 dodie "Error opening $warnings_file";
2481 2469
2482 while (<IN>) { 2470 while (<IN>) {
2483 if (/$check_build_re/) { 2471 if (/$check_build_re/) {
2484 my $warning = process_warning 2472 my $warning = process_warning_line $_;
2485 2473
2486 $warnings_list{$warning} = 1; 2474 $warnings_list{$warning} = 1;
2487 } 2475 }
2488 } 2476 }
2489 close(IN); 2477 close(IN);
2490 } 2478 }
2491 2479
>> 2480 # If warnings file didn't exist, and WARNINGS_FILE exist,
>> 2481 # then we fail on any warning!
>> 2482
2492 open(IN, $buildlog) or dodie "Can't open 2483 open(IN, $buildlog) or dodie "Can't open $buildlog";
2493 while (<IN>) { 2484 while (<IN>) {
2494 if (/$check_build_re/) { 2485 if (/$check_build_re/) {
2495 my $warning = process_warning_lin 2486 my $warning = process_warning_line $_;
2496 2487
2497 if (!defined $warnings_list{$warn 2488 if (!defined $warnings_list{$warning}) {
2498 $warning_found++; !! 2489 fail "New warning found (not in $warnings_file)\n$_\n";
2499 !! 2490 $no_reboot = $save_no_reboot;
2500 # If warnings file didn't exi !! 2491 return 0;
2501 # then we fail on any warning <<
2502 if (defined $warnings_file) { <<
2503 fail "New warning found ( <<
2504 $no_reboot = $save_no_reb <<
2505 return 0; <<
2506 } <<
2507 } 2492 }
2508 } 2493 }
2509 } 2494 }
2510 $no_reboot = $save_no_reboot; 2495 $no_reboot = $save_no_reboot;
2511 close(IN); 2496 close(IN);
2512 } 2497 }
2513 2498
2514 sub check_patch_buildlog { 2499 sub check_patch_buildlog {
2515 my ($patch) = @_; 2500 my ($patch) = @_;
2516 2501
2517 my @files = `git show $patch | diffstat - 2502 my @files = `git show $patch | diffstat -l`;
2518 2503
2519 foreach my $file (@files) { 2504 foreach my $file (@files) {
2520 chomp $file; 2505 chomp $file;
2521 } 2506 }
2522 2507
2523 open(IN, "git show $patch |") or 2508 open(IN, "git show $patch |") or
2524 dodie "failed to show $patch"; 2509 dodie "failed to show $patch";
2525 while (<IN>) { 2510 while (<IN>) {
2526 if (m,^--- a/(.*),) { 2511 if (m,^--- a/(.*),) {
2527 chomp $1; 2512 chomp $1;
2528 $files[$#files] = $1; 2513 $files[$#files] = $1;
2529 } 2514 }
2530 } 2515 }
2531 close(IN); 2516 close(IN);
2532 2517
2533 open(IN, $buildlog) or dodie "Can't open 2518 open(IN, $buildlog) or dodie "Can't open $buildlog";
2534 while (<IN>) { 2519 while (<IN>) {
2535 if (/^\s*(.*?):.*(warning|error)/) { 2520 if (/^\s*(.*?):.*(warning|error)/) {
2536 my $err = $1; 2521 my $err = $1;
2537 foreach my $file (@files) { 2522 foreach my $file (@files) {
2538 my $fullpath = "$builddir/$fi 2523 my $fullpath = "$builddir/$file";
2539 if ($file eq $err || $fullpat 2524 if ($file eq $err || $fullpath eq $err) {
2540 fail "$file built with wa 2525 fail "$file built with warnings" and return 0;
2541 } 2526 }
2542 } 2527 }
2543 } 2528 }
2544 } 2529 }
2545 close(IN); 2530 close(IN);
2546 2531
2547 return 1; 2532 return 1;
2548 } 2533 }
2549 2534
2550 sub apply_min_config { 2535 sub apply_min_config {
2551 my $outconfig = "$output_config.new"; 2536 my $outconfig = "$output_config.new";
2552 2537
2553 # Read the config file and remove anythin 2538 # Read the config file and remove anything that
2554 # is in the force_config hash (from minco 2539 # is in the force_config hash (from minconfig and others)
2555 # then add the force config back. 2540 # then add the force config back.
2556 2541
2557 doprint "Applying minimum configurations 2542 doprint "Applying minimum configurations into $output_config.new\n";
2558 2543
2559 open (OUT, ">$outconfig") or 2544 open (OUT, ">$outconfig") or
2560 dodie "Can't create $outconfig"; 2545 dodie "Can't create $outconfig";
2561 2546
2562 if (-f $output_config) { 2547 if (-f $output_config) {
2563 open (IN, $output_config) or 2548 open (IN, $output_config) or
2564 dodie "Failed to open $output_con 2549 dodie "Failed to open $output_config";
2565 while (<IN>) { 2550 while (<IN>) {
2566 if (/^(# )?(CONFIG_[^\s=]*)/) { 2551 if (/^(# )?(CONFIG_[^\s=]*)/) {
2567 next if (defined($force_confi 2552 next if (defined($force_config{$2}));
2568 } 2553 }
2569 print OUT; 2554 print OUT;
2570 } 2555 }
2571 close IN; 2556 close IN;
2572 } 2557 }
2573 foreach my $config (keys %force_config) { 2558 foreach my $config (keys %force_config) {
2574 print OUT "$force_config{$config}\n"; 2559 print OUT "$force_config{$config}\n";
2575 } 2560 }
2576 close OUT; 2561 close OUT;
2577 2562
2578 run_command "mv $outconfig $output_config 2563 run_command "mv $outconfig $output_config";
2579 } 2564 }
2580 2565
2581 sub make_oldconfig { 2566 sub make_oldconfig {
2582 2567
2583 my @force_list = keys %force_config; 2568 my @force_list = keys %force_config;
2584 2569
2585 if ($#force_list >= 0) { 2570 if ($#force_list >= 0) {
2586 apply_min_config; 2571 apply_min_config;
2587 } 2572 }
2588 2573
2589 if (!run_command "$make olddefconfig") { 2574 if (!run_command "$make olddefconfig") {
2590 # Perhaps olddefconfig doesn't exist 2575 # Perhaps olddefconfig doesn't exist in this version of the kernel
2591 # try oldnoconfig 2576 # try oldnoconfig
2592 doprint "olddefconfig failed, trying 2577 doprint "olddefconfig failed, trying make oldnoconfig\n";
2593 if (!run_command "$make oldnoconfig") 2578 if (!run_command "$make oldnoconfig") {
2594 doprint "oldnoconfig failed, tryi 2579 doprint "oldnoconfig failed, trying yes '' | make oldconfig\n";
2595 # try a yes '' | oldconfig 2580 # try a yes '' | oldconfig
2596 run_command "yes '' | $make oldco 2581 run_command "yes '' | $make oldconfig" or
2597 dodie "failed make config old 2582 dodie "failed make config oldconfig";
2598 } 2583 }
2599 } 2584 }
2600 } 2585 }
2601 2586
2602 # read a config file and use this to force ne 2587 # read a config file and use this to force new configs.
2603 sub load_force_config { 2588 sub load_force_config {
2604 my ($config) = @_; 2589 my ($config) = @_;
2605 2590
2606 doprint "Loading force configs from $conf 2591 doprint "Loading force configs from $config\n";
2607 open(IN, $config) or 2592 open(IN, $config) or
2608 dodie "failed to read $config"; 2593 dodie "failed to read $config";
2609 while (<IN>) { 2594 while (<IN>) {
2610 chomp; 2595 chomp;
2611 if (/^(CONFIG[^\s=]*)(\s*=.*)/) { 2596 if (/^(CONFIG[^\s=]*)(\s*=.*)/) {
2612 $force_config{$1} = $_; 2597 $force_config{$1} = $_;
2613 } elsif (/^# (CONFIG_\S*) is not set/ 2598 } elsif (/^# (CONFIG_\S*) is not set/) {
2614 $force_config{$1} = $_; 2599 $force_config{$1} = $_;
2615 } 2600 }
2616 } 2601 }
2617 close IN; 2602 close IN;
2618 } 2603 }
2619 2604
2620 sub build { 2605 sub build {
2621 my ($type) = @_; 2606 my ($type) = @_;
2622 2607
2623 unlink $buildlog; 2608 unlink $buildlog;
2624 2609
2625 my $start_time = time; 2610 my $start_time = time;
2626 2611
2627 # Failed builds should not reboot the tar 2612 # Failed builds should not reboot the target
2628 my $save_no_reboot = $no_reboot; 2613 my $save_no_reboot = $no_reboot;
2629 $no_reboot = 1; 2614 $no_reboot = 1;
2630 2615
2631 # Calculate a new version from here. 2616 # Calculate a new version from here.
2632 $have_version = 0; 2617 $have_version = 0;
2633 2618
2634 if (defined($pre_build)) { 2619 if (defined($pre_build)) {
2635 my $ret = run_command $pre_build; 2620 my $ret = run_command $pre_build;
2636 if (!$ret && defined($pre_build_die) 2621 if (!$ret && defined($pre_build_die) &&
2637 $pre_build_die) { 2622 $pre_build_die) {
2638 dodie "failed to pre_build\n"; 2623 dodie "failed to pre_build\n";
2639 } 2624 }
2640 } 2625 }
2641 2626
2642 if ($type =~ /^useconfig:(.*)/) { 2627 if ($type =~ /^useconfig:(.*)/) {
2643 run_command "cp $1 $output_config" or 2628 run_command "cp $1 $output_config" or
2644 dodie "could not copy $1 to .conf 2629 dodie "could not copy $1 to .config";
2645 2630
2646 $type = "oldconfig"; 2631 $type = "oldconfig";
2647 } 2632 }
2648 2633
2649 # old config can ask questions 2634 # old config can ask questions
2650 if ($type eq "oldconfig") { 2635 if ($type eq "oldconfig") {
2651 $type = "olddefconfig"; 2636 $type = "olddefconfig";
2652 2637
2653 # allow for empty configs 2638 # allow for empty configs
2654 run_command "touch $output_config"; 2639 run_command "touch $output_config";
2655 2640
2656 if (!$noclean) { 2641 if (!$noclean) {
2657 run_command "mv $output_config $o 2642 run_command "mv $output_config $outputdir/config_temp" or
2658 dodie "moving .config"; 2643 dodie "moving .config";
2659 2644
2660 run_command "$make mrproper" or d 2645 run_command "$make mrproper" or dodie "make mrproper";
2661 2646
2662 run_command "mv $outputdir/config 2647 run_command "mv $outputdir/config_temp $output_config" or
2663 dodie "moving config_temp"; 2648 dodie "moving config_temp";
2664 } 2649 }
2665 } elsif (!$noclean) { 2650 } elsif (!$noclean) {
2666 unlink "$output_config"; 2651 unlink "$output_config";
2667 run_command "$make mrproper" or 2652 run_command "$make mrproper" or
2668 dodie "make mrproper"; 2653 dodie "make mrproper";
2669 } 2654 }
2670 2655
2671 # add something to distinguish this build 2656 # add something to distinguish this build
2672 open(OUT, "> $outputdir/localversion") or 2657 open(OUT, "> $outputdir/localversion") or dodie("Can't make localversion file");
2673 print OUT "$localversion\n"; 2658 print OUT "$localversion\n";
2674 close(OUT); 2659 close(OUT);
2675 2660
2676 if (defined($minconfig)) { 2661 if (defined($minconfig)) {
2677 load_force_config($minconfig); 2662 load_force_config($minconfig);
2678 } 2663 }
2679 2664
2680 if ($type ne "olddefconfig") { 2665 if ($type ne "olddefconfig") {
2681 run_command "$make $type" or 2666 run_command "$make $type" or
2682 dodie "failed make config"; 2667 dodie "failed make config";
2683 } 2668 }
2684 # Run old config regardless, to enforce m 2669 # Run old config regardless, to enforce min configurations
2685 make_oldconfig; 2670 make_oldconfig;
2686 2671
2687 if (not defined($build_options)){ 2672 if (not defined($build_options)){
2688 $build_options = ""; 2673 $build_options = "";
2689 } 2674 }
2690 my $build_ret = run_command "$make $build 2675 my $build_ret = run_command "$make $build_options", $buildlog;
2691 2676
2692 if (defined($post_build)) { 2677 if (defined($post_build)) {
2693 # Because a post build may change the 2678 # Because a post build may change the kernel version
2694 # do it now. 2679 # do it now.
2695 get_version; 2680 get_version;
2696 my $ret = run_command $post_build; 2681 my $ret = run_command $post_build;
2697 if (!$ret && defined($post_build_die) 2682 if (!$ret && defined($post_build_die) &&
2698 $post_build_die) { 2683 $post_build_die) {
2699 dodie "failed to post_build\n"; 2684 dodie "failed to post_build\n";
2700 } 2685 }
2701 } 2686 }
2702 2687
2703 if (!$build_ret) { 2688 if (!$build_ret) {
2704 # bisect may need this to pass 2689 # bisect may need this to pass
2705 if ($in_bisect) { 2690 if ($in_bisect) {
2706 $no_reboot = $save_no_reboot; 2691 $no_reboot = $save_no_reboot;
2707 return 0; 2692 return 0;
2708 } 2693 }
2709 fail "failed build" and return 0; 2694 fail "failed build" and return 0;
2710 } 2695 }
2711 2696
2712 $no_reboot = $save_no_reboot; 2697 $no_reboot = $save_no_reboot;
2713 2698
2714 my $end_time = time; 2699 my $end_time = time;
2715 $build_time = $end_time - $start_time; 2700 $build_time = $end_time - $start_time;
2716 2701
2717 return 1; 2702 return 1;
2718 } 2703 }
2719 2704
2720 sub halt { 2705 sub halt {
2721 if (!run_ssh "halt" or defined($power_off 2706 if (!run_ssh "halt" or defined($power_off)) {
2722 if (defined($poweroff_after_halt)) { 2707 if (defined($poweroff_after_halt)) {
2723 sleep $poweroff_after_halt; 2708 sleep $poweroff_after_halt;
2724 run_command "$power_off"; 2709 run_command "$power_off";
2725 } 2710 }
2726 } else { 2711 } else {
2727 # nope? the zap it! 2712 # nope? the zap it!
2728 run_command "$power_off"; 2713 run_command "$power_off";
2729 } 2714 }
2730 } 2715 }
2731 2716
2732 sub success { 2717 sub success {
2733 my ($i) = @_; 2718 my ($i) = @_;
2734 2719
2735 $successes++; 2720 $successes++;
2736 2721
2737 my $name = ""; 2722 my $name = "";
2738 2723
2739 if (defined($test_name)) { 2724 if (defined($test_name)) {
2740 $name = " ($test_name)"; 2725 $name = " ($test_name)";
2741 } 2726 }
2742 2727
2743 print_times; 2728 print_times;
2744 2729
2745 doprint "\n\n"; 2730 doprint "\n\n";
2746 doprint "******************************** 2731 doprint "*******************************************\n";
2747 doprint "******************************** 2732 doprint "*******************************************\n";
2748 doprint "KTEST RESULT: TEST $i$name SUCCE 2733 doprint "KTEST RESULT: TEST $i$name SUCCESS!!!! **\n";
2749 doprint "******************************** 2734 doprint "*******************************************\n";
2750 doprint "******************************** 2735 doprint "*******************************************\n";
2751 2736
2752 if (defined($store_successes)) { 2737 if (defined($store_successes)) {
2753 save_logs "success", $store_successes 2738 save_logs "success", $store_successes;
2754 } 2739 }
2755 2740
2756 if ($i != $opt{"NUM_TESTS"} && !do_not_re 2741 if ($i != $opt{"NUM_TESTS"} && !do_not_reboot) {
2757 doprint "Reboot and wait $sleep_time 2742 doprint "Reboot and wait $sleep_time seconds\n";
2758 reboot_to_good $sleep_time; 2743 reboot_to_good $sleep_time;
2759 } 2744 }
2760 2745
2761 if (defined($post_test)) { 2746 if (defined($post_test)) {
2762 run_command $post_test; 2747 run_command $post_test;
2763 } 2748 }
2764 } 2749 }
2765 2750
2766 sub answer_bisect { 2751 sub answer_bisect {
2767 for (;;) { 2752 for (;;) {
2768 doprint "Pass, fail, or skip? [p/f/s] 2753 doprint "Pass, fail, or skip? [p/f/s]";
2769 my $ans = <STDIN>; 2754 my $ans = <STDIN>;
2770 chomp $ans; 2755 chomp $ans;
2771 if ($ans eq "p" || $ans eq "P") { 2756 if ($ans eq "p" || $ans eq "P") {
2772 return 1; 2757 return 1;
2773 } elsif ($ans eq "f" || $ans eq "F") 2758 } elsif ($ans eq "f" || $ans eq "F") {
2774 return 0; 2759 return 0;
2775 } elsif ($ans eq "s" || $ans eq "S") 2760 } elsif ($ans eq "s" || $ans eq "S") {
2776 return -1; 2761 return -1;
2777 } else { 2762 } else {
2778 print "Please answer 'p', 'f', or 2763 print "Please answer 'p', 'f', or 's'\n";
2779 } 2764 }
2780 } 2765 }
2781 } 2766 }
2782 2767
2783 sub child_run_test { 2768 sub child_run_test {
2784 2769
2785 # child should have no power 2770 # child should have no power
2786 $reboot_on_error = 0; 2771 $reboot_on_error = 0;
2787 $poweroff_on_error = 0; 2772 $poweroff_on_error = 0;
2788 $die_on_failure = 1; 2773 $die_on_failure = 1;
2789 2774
2790 run_command $run_test, $testlog; 2775 run_command $run_test, $testlog;
2791 2776
2792 exit $run_command_status; 2777 exit $run_command_status;
2793 } 2778 }
2794 2779
2795 sub child_finished { 2780 sub child_finished {
2796 $child_done = 1; 2781 $child_done = 1;
2797 } 2782 }
2798 2783
2799 sub do_run_test { 2784 sub do_run_test {
2800 my $child_pid; 2785 my $child_pid;
2801 my $child_exit; 2786 my $child_exit;
2802 my $line; 2787 my $line;
2803 my $full_line; 2788 my $full_line;
2804 my $bug = 0; 2789 my $bug = 0;
2805 my $bug_ignored = 0; 2790 my $bug_ignored = 0;
2806 2791
2807 my $start_time = time; 2792 my $start_time = time;
2808 2793
2809 wait_for_monitor 1; 2794 wait_for_monitor 1;
2810 2795
2811 doprint "run test $run_test\n"; 2796 doprint "run test $run_test\n";
2812 2797
2813 $child_done = 0; 2798 $child_done = 0;
2814 2799
2815 $SIG{CHLD} = qw(child_finished); 2800 $SIG{CHLD} = qw(child_finished);
2816 2801
2817 $child_pid = fork; 2802 $child_pid = fork;
2818 2803
2819 child_run_test if (!$child_pid); 2804 child_run_test if (!$child_pid);
2820 2805
2821 $full_line = ""; 2806 $full_line = "";
2822 2807
2823 do { 2808 do {
2824 $line = wait_for_input($monitor_fp, 1 2809 $line = wait_for_input($monitor_fp, 1);
2825 if (defined($line)) { 2810 if (defined($line)) {
2826 2811
2827 # we are not guaranteed to get a 2812 # we are not guaranteed to get a full line
2828 $full_line .= $line; 2813 $full_line .= $line;
2829 doprint $line; 2814 doprint $line;
2830 2815
2831 if ($full_line =~ /call trace:/i) 2816 if ($full_line =~ /call trace:/i) {
2832 if ($ignore_errors) { 2817 if ($ignore_errors) {
2833 $bug_ignored = 1; 2818 $bug_ignored = 1;
2834 } else { 2819 } else {
2835 $bug = 1; 2820 $bug = 1;
2836 } 2821 }
2837 } 2822 }
2838 2823
2839 if ($full_line =~ /Kernel panic - 2824 if ($full_line =~ /Kernel panic -/) {
2840 $bug = 1; 2825 $bug = 1;
2841 } 2826 }
2842 2827
2843 if ($line =~ /\n/) { 2828 if ($line =~ /\n/) {
2844 $full_line = ""; 2829 $full_line = "";
2845 } 2830 }
2846 } 2831 }
2847 } while (!$child_done && !$bug); 2832 } while (!$child_done && !$bug);
2848 2833
2849 if (!$bug && $bug_ignored) { 2834 if (!$bug && $bug_ignored) {
2850 doprint "WARNING: Call Trace detected 2835 doprint "WARNING: Call Trace detected but ignored due to IGNORE_ERRORS=1\n";
2851 } 2836 }
2852 2837
2853 if ($bug) { 2838 if ($bug) {
2854 my $failure_start = time; 2839 my $failure_start = time;
2855 my $now; 2840 my $now;
2856 do { 2841 do {
2857 $line = wait_for_input($monitor_f 2842 $line = wait_for_input($monitor_fp, 1);
2858 if (defined($line)) { 2843 if (defined($line)) {
2859 doprint $line; 2844 doprint $line;
2860 } 2845 }
2861 $now = time; 2846 $now = time;
2862 if ($now - $failure_start >= $sto 2847 if ($now - $failure_start >= $stop_after_failure) {
2863 last; 2848 last;
2864 } 2849 }
2865 } while (defined($line)); 2850 } while (defined($line));
2866 2851
2867 doprint "Detected kernel crash!\n"; 2852 doprint "Detected kernel crash!\n";
2868 # kill the child with extreme prejudi 2853 # kill the child with extreme prejudice
2869 kill 9, $child_pid; 2854 kill 9, $child_pid;
2870 } 2855 }
2871 2856
2872 waitpid $child_pid, 0; 2857 waitpid $child_pid, 0;
2873 $child_exit = $? >> 8; 2858 $child_exit = $? >> 8;
2874 2859
2875 my $end_time = time; 2860 my $end_time = time;
2876 $test_time = $end_time - $start_time; 2861 $test_time = $end_time - $start_time;
2877 2862
2878 if (!$bug && $in_bisect) { 2863 if (!$bug && $in_bisect) {
2879 if (defined($bisect_ret_good)) { 2864 if (defined($bisect_ret_good)) {
2880 if ($child_exit == $bisect_ret_go 2865 if ($child_exit == $bisect_ret_good) {
2881 return 1; 2866 return 1;
2882 } 2867 }
2883 } 2868 }
2884 if (defined($bisect_ret_skip)) { 2869 if (defined($bisect_ret_skip)) {
2885 if ($child_exit == $bisect_ret_sk 2870 if ($child_exit == $bisect_ret_skip) {
2886 return -1; 2871 return -1;
2887 } 2872 }
2888 } 2873 }
2889 if (defined($bisect_ret_abort)) { 2874 if (defined($bisect_ret_abort)) {
2890 if ($child_exit == $bisect_ret_ab 2875 if ($child_exit == $bisect_ret_abort) {
2891 fail "test abort" and return 2876 fail "test abort" and return -2;
2892 } 2877 }
2893 } 2878 }
2894 if (defined($bisect_ret_bad)) { 2879 if (defined($bisect_ret_bad)) {
2895 if ($child_exit == $bisect_ret_sk 2880 if ($child_exit == $bisect_ret_skip) {
2896 return 0; 2881 return 0;
2897 } 2882 }
2898 } 2883 }
2899 if (defined($bisect_ret_default)) { 2884 if (defined($bisect_ret_default)) {
2900 if ($bisect_ret_default eq "good" 2885 if ($bisect_ret_default eq "good") {
2901 return 1; 2886 return 1;
2902 } elsif ($bisect_ret_default eq " 2887 } elsif ($bisect_ret_default eq "bad") {
2903 return 0; 2888 return 0;
2904 } elsif ($bisect_ret_default eq " 2889 } elsif ($bisect_ret_default eq "skip") {
2905 return -1; 2890 return -1;
2906 } elsif ($bisect_ret_default eq " 2891 } elsif ($bisect_ret_default eq "abort") {
2907 return -2; 2892 return -2;
2908 } else { 2893 } else {
2909 fail "unknown default action: 2894 fail "unknown default action: $bisect_ret_default"
2910 and return -2; 2895 and return -2;
2911 } 2896 }
2912 } 2897 }
2913 } 2898 }
2914 2899
2915 if ($bug || $child_exit) { 2900 if ($bug || $child_exit) {
2916 return 0 if $in_bisect; 2901 return 0 if $in_bisect;
2917 fail "test failed" and return 0; 2902 fail "test failed" and return 0;
2918 } 2903 }
2919 return 1; 2904 return 1;
2920 } 2905 }
2921 2906
2922 sub run_git_bisect { 2907 sub run_git_bisect {
2923 my ($command) = @_; 2908 my ($command) = @_;
2924 2909
2925 doprint "$command ... "; 2910 doprint "$command ... ";
2926 2911
2927 my $output = `$command 2>&1`; 2912 my $output = `$command 2>&1`;
2928 my $ret = $?; 2913 my $ret = $?;
2929 2914
2930 logit $output; 2915 logit $output;
2931 2916
2932 if ($ret) { 2917 if ($ret) {
2933 doprint "FAILED\n"; 2918 doprint "FAILED\n";
2934 dodie "Failed to git bisect"; 2919 dodie "Failed to git bisect";
2935 } 2920 }
2936 2921
2937 doprint "SUCCESS\n"; 2922 doprint "SUCCESS\n";
2938 if ($output =~ m/^(Bisecting: .*\(roughly 2923 if ($output =~ m/^(Bisecting: .*\(roughly \d+ steps?\))\s+\[([[:xdigit:]]+)\]/) {
2939 doprint "$1 [$2]\n"; 2924 doprint "$1 [$2]\n";
2940 } elsif ($output =~ m/^([[:xdigit:]]+) is 2925 } elsif ($output =~ m/^([[:xdigit:]]+) is the first bad commit/) {
2941 $bisect_bad_commit = $1; 2926 $bisect_bad_commit = $1;
2942 doprint "Found bad commit... $1\n"; 2927 doprint "Found bad commit... $1\n";
2943 return 0; 2928 return 0;
2944 } else { 2929 } else {
2945 # we already logged it, just print it 2930 # we already logged it, just print it now.
2946 print $output; 2931 print $output;
2947 } 2932 }
2948 2933
2949 return 1; 2934 return 1;
2950 } 2935 }
2951 2936
2952 sub bisect_reboot { 2937 sub bisect_reboot {
2953 doprint "Reboot and sleep $bisect_sleep_t 2938 doprint "Reboot and sleep $bisect_sleep_time seconds\n";
2954 reboot_to_good $bisect_sleep_time; 2939 reboot_to_good $bisect_sleep_time;
2955 } 2940 }
2956 2941
2957 # returns 1 on success, 0 on failure, -1 on s 2942 # returns 1 on success, 0 on failure, -1 on skip
2958 sub run_bisect_test { 2943 sub run_bisect_test {
2959 my ($type, $buildtype) = @_; 2944 my ($type, $buildtype) = @_;
2960 2945
2961 my $failed = 0; 2946 my $failed = 0;
2962 my $result; 2947 my $result;
2963 my $output; 2948 my $output;
2964 my $ret; 2949 my $ret;
2965 2950
2966 $in_bisect = 1; 2951 $in_bisect = 1;
2967 2952
2968 build $buildtype or $failed = 1; 2953 build $buildtype or $failed = 1;
2969 2954
2970 if ($type ne "build") { 2955 if ($type ne "build") {
2971 if ($failed && $bisect_skip) { 2956 if ($failed && $bisect_skip) {
2972 $in_bisect = 0; 2957 $in_bisect = 0;
2973 return -1; 2958 return -1;
2974 } 2959 }
2975 dodie "Failed on build" if $failed; 2960 dodie "Failed on build" if $failed;
2976 2961
2977 # Now boot the box 2962 # Now boot the box
2978 start_monitor_and_install or $failed 2963 start_monitor_and_install or $failed = 1;
2979 2964
2980 if ($type ne "boot") { 2965 if ($type ne "boot") {
2981 if ($failed && $bisect_skip) { 2966 if ($failed && $bisect_skip) {
2982 end_monitor; 2967 end_monitor;
2983 bisect_reboot; 2968 bisect_reboot;
2984 $in_bisect = 0; 2969 $in_bisect = 0;
2985 return -1; 2970 return -1;
2986 } 2971 }
2987 dodie "Failed on boot" if $failed 2972 dodie "Failed on boot" if $failed;
2988 2973
2989 do_run_test or $failed = 1; 2974 do_run_test or $failed = 1;
2990 } 2975 }
2991 end_monitor; 2976 end_monitor;
2992 } 2977 }
2993 2978
2994 if ($failed) { 2979 if ($failed) {
2995 $result = 0; 2980 $result = 0;
2996 } else { 2981 } else {
2997 $result = 1; 2982 $result = 1;
2998 } 2983 }
2999 2984
3000 # reboot the box to a kernel we can ssh t 2985 # reboot the box to a kernel we can ssh to
3001 if ($type ne "build") { 2986 if ($type ne "build") {
3002 bisect_reboot; 2987 bisect_reboot;
3003 } 2988 }
3004 $in_bisect = 0; 2989 $in_bisect = 0;
3005 2990
3006 return $result; 2991 return $result;
3007 } 2992 }
3008 2993
3009 sub run_bisect { 2994 sub run_bisect {
3010 my ($type) = @_; 2995 my ($type) = @_;
3011 my $buildtype = "oldconfig"; 2996 my $buildtype = "oldconfig";
3012 2997
3013 # We should have a minconfig to use? 2998 # We should have a minconfig to use?
3014 if (defined($minconfig)) { 2999 if (defined($minconfig)) {
3015 $buildtype = "useconfig:$minconfig"; 3000 $buildtype = "useconfig:$minconfig";
3016 } 3001 }
3017 3002
3018 # If the user sets bisect_tries to less t 3003 # If the user sets bisect_tries to less than 1, then no tries
3019 # is a success. 3004 # is a success.
3020 my $ret = 1; 3005 my $ret = 1;
3021 3006
3022 # Still let the user manually decide that 3007 # Still let the user manually decide that though.
3023 if ($bisect_tries < 1 && $bisect_manual) 3008 if ($bisect_tries < 1 && $bisect_manual) {
3024 $ret = answer_bisect; 3009 $ret = answer_bisect;
3025 } 3010 }
3026 3011
3027 for (my $i = 0; $i < $bisect_tries; $i++) 3012 for (my $i = 0; $i < $bisect_tries; $i++) {
3028 if ($bisect_tries > 1) { 3013 if ($bisect_tries > 1) {
3029 my $t = $i + 1; 3014 my $t = $i + 1;
3030 doprint("Running bisect trial $t 3015 doprint("Running bisect trial $t of $bisect_tries:\n");
3031 } 3016 }
3032 $ret = run_bisect_test $type, $buildt 3017 $ret = run_bisect_test $type, $buildtype;
3033 3018
3034 if ($bisect_manual) { 3019 if ($bisect_manual) {
3035 $ret = answer_bisect; 3020 $ret = answer_bisect;
3036 } 3021 }
3037 3022
3038 last if (!$ret); 3023 last if (!$ret);
3039 } 3024 }
3040 3025
3041 # Are we looking for where it worked, not 3026 # Are we looking for where it worked, not failed?
3042 if ($reverse_bisect && $ret >= 0) { 3027 if ($reverse_bisect && $ret >= 0) {
3043 $ret = !$ret; 3028 $ret = !$ret;
3044 } 3029 }
3045 3030
3046 if ($ret > 0) { 3031 if ($ret > 0) {
3047 return "good"; 3032 return "good";
3048 } elsif ($ret == 0) { 3033 } elsif ($ret == 0) {
3049 return "bad"; 3034 return "bad";
3050 } elsif ($bisect_skip) { 3035 } elsif ($bisect_skip) {
3051 doprint "HIT A BAD COMMIT ... SKIPPIN 3036 doprint "HIT A BAD COMMIT ... SKIPPING\n";
3052 return "skip"; 3037 return "skip";
3053 } 3038 }
3054 } 3039 }
3055 3040
3056 sub update_bisect_replay { 3041 sub update_bisect_replay {
3057 my $tmp_log = "$tmpdir/ktest_bisect_log"; 3042 my $tmp_log = "$tmpdir/ktest_bisect_log";
3058 run_command "git bisect log > $tmp_log" o 3043 run_command "git bisect log > $tmp_log" or
3059 dodie "can't create bisect log"; 3044 dodie "can't create bisect log";
3060 return $tmp_log; 3045 return $tmp_log;
3061 } 3046 }
3062 3047
3063 sub bisect { 3048 sub bisect {
3064 my ($i) = @_; 3049 my ($i) = @_;
3065 3050
3066 my $result; 3051 my $result;
3067 3052
3068 dodie "BISECT_GOOD[$i] not defined\n" 3053 dodie "BISECT_GOOD[$i] not defined\n" if (!defined($bisect_good));
3069 dodie "BISECT_BAD[$i] not defined\n" 3054 dodie "BISECT_BAD[$i] not defined\n" if (!defined($bisect_bad));
3070 dodie "BISECT_TYPE[$i] not defined\n" 3055 dodie "BISECT_TYPE[$i] not defined\n" if (!defined($bisect_type));
3071 3056
3072 my $good = $bisect_good; 3057 my $good = $bisect_good;
3073 my $bad = $bisect_bad; 3058 my $bad = $bisect_bad;
3074 my $type = $bisect_type; 3059 my $type = $bisect_type;
3075 my $start = $bisect_start; 3060 my $start = $bisect_start;
3076 my $replay = $bisect_replay; 3061 my $replay = $bisect_replay;
3077 my $start_files = $bisect_files; 3062 my $start_files = $bisect_files;
3078 3063
3079 if (defined($start_files)) { 3064 if (defined($start_files)) {
3080 $start_files = " -- " . $start_files; 3065 $start_files = " -- " . $start_files;
3081 } else { 3066 } else {
3082 $start_files = ""; 3067 $start_files = "";
3083 } 3068 }
3084 3069
3085 # convert to true sha1's 3070 # convert to true sha1's
3086 $good = get_sha1($good); 3071 $good = get_sha1($good);
3087 $bad = get_sha1($bad); 3072 $bad = get_sha1($bad);
3088 3073
3089 if (defined($bisect_reverse) && $bisect_r 3074 if (defined($bisect_reverse) && $bisect_reverse == 1) {
3090 doprint "Performing a reverse bisect 3075 doprint "Performing a reverse bisect (bad is good, good is bad!)\n";
3091 $reverse_bisect = 1; 3076 $reverse_bisect = 1;
3092 } else { 3077 } else {
3093 $reverse_bisect = 0; 3078 $reverse_bisect = 0;
3094 } 3079 }
3095 3080
3096 # Can't have a test without having a test 3081 # Can't have a test without having a test to run
3097 if ($type eq "test" && !defined($run_test 3082 if ($type eq "test" && !defined($run_test)) {
3098 $type = "boot"; 3083 $type = "boot";
3099 } 3084 }
3100 3085
3101 # Check if a bisect was running 3086 # Check if a bisect was running
3102 my $bisect_start_file = "$builddir/.git/B 3087 my $bisect_start_file = "$builddir/.git/BISECT_START";
3103 3088
3104 my $check = $bisect_check; 3089 my $check = $bisect_check;
3105 my $do_check = defined($check) && $check 3090 my $do_check = defined($check) && $check ne "0";
3106 3091
3107 if ( -f $bisect_start_file ) { 3092 if ( -f $bisect_start_file ) {
3108 print "Bisect in progress found\n"; 3093 print "Bisect in progress found\n";
3109 if ($do_check) { 3094 if ($do_check) {
3110 print " If you say yes, then no c 3095 print " If you say yes, then no checks of good or bad will be done\n";
3111 } 3096 }
3112 if (defined($replay)) { 3097 if (defined($replay)) {
3113 print "** BISECT_REPLAY is define 3098 print "** BISECT_REPLAY is defined in config file **";
3114 print " Ignore config option and 3099 print " Ignore config option and perform new git bisect log?\n";
3115 if (read_ync " (yes, no, or cance 3100 if (read_ync " (yes, no, or cancel) ") {
3116 $replay = update_bisect_repla 3101 $replay = update_bisect_replay;
3117 $do_check = 0; 3102 $do_check = 0;
3118 } 3103 }
3119 } elsif (read_yn "read git log and co 3104 } elsif (read_yn "read git log and continue?") {
3120 $replay = update_bisect_replay; 3105 $replay = update_bisect_replay;
3121 $do_check = 0; 3106 $do_check = 0;
3122 } 3107 }
3123 } 3108 }
3124 3109
3125 if ($do_check) { 3110 if ($do_check) {
3126 # get current HEAD 3111 # get current HEAD
3127 my $head = get_sha1("HEAD"); 3112 my $head = get_sha1("HEAD");
3128 3113
3129 if ($check ne "good") { 3114 if ($check ne "good") {
3130 doprint "TESTING BISECT BAD [$bad 3115 doprint "TESTING BISECT BAD [$bad]\n";
3131 run_command "git checkout $bad" o 3116 run_command "git checkout $bad" or
3132 dodie "Failed to checkout $ba 3117 dodie "Failed to checkout $bad";
3133 3118
3134 $result = run_bisect $type; 3119 $result = run_bisect $type;
3135 3120
3136 if ($result ne "bad") { 3121 if ($result ne "bad") {
3137 fail "Tested BISECT_BAD [$bad 3122 fail "Tested BISECT_BAD [$bad] and it succeeded" and return 0;
3138 } 3123 }
3139 } 3124 }
3140 3125
3141 if ($check ne "bad") { 3126 if ($check ne "bad") {
3142 doprint "TESTING BISECT GOOD [$go 3127 doprint "TESTING BISECT GOOD [$good]\n";
3143 run_command "git checkout $good" 3128 run_command "git checkout $good" or
3144 dodie "Failed to checkout $go 3129 dodie "Failed to checkout $good";
3145 3130
3146 $result = run_bisect $type; 3131 $result = run_bisect $type;
3147 3132
3148 if ($result ne "good") { 3133 if ($result ne "good") {
3149 fail "Tested BISECT_GOOD [$go 3134 fail "Tested BISECT_GOOD [$good] and it failed" and return 0;
3150 } 3135 }
3151 } 3136 }
3152 3137
3153 # checkout where we started 3138 # checkout where we started
3154 run_command "git checkout $head" or 3139 run_command "git checkout $head" or
3155 dodie "Failed to checkout $head"; 3140 dodie "Failed to checkout $head";
3156 } 3141 }
3157 3142
3158 run_command "git bisect start$start_files 3143 run_command "git bisect start$start_files" or
3159 dodie "could not start bisect"; 3144 dodie "could not start bisect";
3160 3145
3161 if (defined($replay)) { 3146 if (defined($replay)) {
3162 run_command "git bisect replay $repla 3147 run_command "git bisect replay $replay" or
3163 dodie "failed to run replay"; 3148 dodie "failed to run replay";
3164 } else { 3149 } else {
3165 run_command "git bisect good $good" o 3150 run_command "git bisect good $good" or
3166 dodie "could not set bisect good 3151 dodie "could not set bisect good to $good";
3167 3152
3168 run_git_bisect "git bisect bad $bad" 3153 run_git_bisect "git bisect bad $bad" or
3169 dodie "could not set bisect bad t 3154 dodie "could not set bisect bad to $bad";
3170 } 3155 }
3171 3156
3172 if (defined($start)) { 3157 if (defined($start)) {
3173 run_command "git checkout $start" or 3158 run_command "git checkout $start" or
3174 dodie "failed to checkout $start" 3159 dodie "failed to checkout $start";
3175 } 3160 }
3176 3161
3177 my $test; 3162 my $test;
3178 do { 3163 do {
3179 $result = run_bisect $type; 3164 $result = run_bisect $type;
3180 $test = run_git_bisect "git bisect $r 3165 $test = run_git_bisect "git bisect $result";
3181 print_times; 3166 print_times;
3182 } while ($test); 3167 } while ($test);
3183 3168
3184 run_command "git bisect log" or 3169 run_command "git bisect log" or
3185 dodie "could not capture git bisect l 3170 dodie "could not capture git bisect log";
3186 3171
3187 run_command "git bisect reset" or 3172 run_command "git bisect reset" or
3188 dodie "could not reset git bisect"; 3173 dodie "could not reset git bisect";
3189 3174
3190 doprint "Bad commit was [$bisect_bad_comm 3175 doprint "Bad commit was [$bisect_bad_commit]\n";
3191 3176
3192 success $i; 3177 success $i;
3193 } 3178 }
3194 3179
3195 sub assign_configs { 3180 sub assign_configs {
3196 my ($hash, $config) = @_; 3181 my ($hash, $config) = @_;
3197 3182
3198 doprint "Reading configs from $config\n"; 3183 doprint "Reading configs from $config\n";
3199 3184
3200 open (IN, $config) or 3185 open (IN, $config) or
3201 dodie "Failed to read $config"; 3186 dodie "Failed to read $config";
3202 3187
3203 while (<IN>) { 3188 while (<IN>) {
3204 chomp; 3189 chomp;
3205 if (/^((CONFIG\S*)=.*)/) { 3190 if (/^((CONFIG\S*)=.*)/) {
3206 ${$hash}{$2} = $1; 3191 ${$hash}{$2} = $1;
3207 } elsif (/^(# (CONFIG\S*) is not set) 3192 } elsif (/^(# (CONFIG\S*) is not set)/) {
3208 ${$hash}{$2} = $1; 3193 ${$hash}{$2} = $1;
3209 } 3194 }
3210 } 3195 }
3211 3196
3212 close(IN); 3197 close(IN);
3213 } 3198 }
3214 3199
3215 sub process_config_ignore { 3200 sub process_config_ignore {
3216 my ($config) = @_; 3201 my ($config) = @_;
3217 3202
3218 assign_configs \%config_ignore, $config; 3203 assign_configs \%config_ignore, $config;
3219 } 3204 }
3220 3205
3221 sub get_dependencies { 3206 sub get_dependencies {
3222 my ($config) = @_; 3207 my ($config) = @_;
3223 3208
3224 my $arr = $dependency{$config}; 3209 my $arr = $dependency{$config};
3225 if (!defined($arr)) { 3210 if (!defined($arr)) {
3226 return (); 3211 return ();
3227 } 3212 }
3228 3213
3229 my @deps = @{$arr}; 3214 my @deps = @{$arr};
3230 3215
3231 foreach my $dep (@{$arr}) { 3216 foreach my $dep (@{$arr}) {
3232 print "ADD DEP $dep\n"; 3217 print "ADD DEP $dep\n";
3233 @deps = (@deps, get_dependencies $dep 3218 @deps = (@deps, get_dependencies $dep);
3234 } 3219 }
3235 3220
3236 return @deps; 3221 return @deps;
3237 } 3222 }
3238 3223
3239 sub save_config { 3224 sub save_config {
3240 my ($pc, $file) = @_; 3225 my ($pc, $file) = @_;
3241 3226
3242 my %configs = %{$pc}; 3227 my %configs = %{$pc};
3243 3228
3244 doprint "Saving configs into $file\n"; 3229 doprint "Saving configs into $file\n";
3245 3230
3246 open(OUT, ">$file") or dodie "Can not wri 3231 open(OUT, ">$file") or dodie "Can not write to $file";
3247 3232
3248 foreach my $config (keys %configs) { 3233 foreach my $config (keys %configs) {
3249 print OUT "$configs{$config}\n"; 3234 print OUT "$configs{$config}\n";
3250 } 3235 }
3251 close(OUT); 3236 close(OUT);
3252 } 3237 }
3253 3238
3254 sub create_config { 3239 sub create_config {
3255 my ($name, $pc) = @_; 3240 my ($name, $pc) = @_;
3256 3241
3257 doprint "Creating old config from $name c 3242 doprint "Creating old config from $name configs\n";
3258 3243
3259 save_config $pc, $output_config; 3244 save_config $pc, $output_config;
3260 3245
3261 make_oldconfig; 3246 make_oldconfig;
3262 } 3247 }
3263 3248
3264 sub run_config_bisect_test { 3249 sub run_config_bisect_test {
3265 my ($type) = @_; 3250 my ($type) = @_;
3266 3251
3267 my $ret = run_bisect_test $type, "oldconf 3252 my $ret = run_bisect_test $type, "oldconfig";
3268 3253
3269 if ($bisect_manual) { 3254 if ($bisect_manual) {
3270 $ret = answer_bisect; 3255 $ret = answer_bisect;
3271 } 3256 }
3272 3257
3273 return $ret; 3258 return $ret;
3274 } 3259 }
3275 3260
3276 sub config_bisect_end { 3261 sub config_bisect_end {
3277 my ($good, $bad) = @_; 3262 my ($good, $bad) = @_;
3278 my $diffexec = "diff -u"; 3263 my $diffexec = "diff -u";
3279 3264
3280 if (-f "$builddir/scripts/diffconfig") { 3265 if (-f "$builddir/scripts/diffconfig") {
3281 $diffexec = "$builddir/scripts/diffco 3266 $diffexec = "$builddir/scripts/diffconfig";
3282 } 3267 }
3283 doprint "\n\n**************************** 3268 doprint "\n\n***************************************\n";
3284 doprint "No more config bisecting possibl 3269 doprint "No more config bisecting possible.\n";
3285 run_command "$diffexec $good $bad", 1; 3270 run_command "$diffexec $good $bad", 1;
3286 doprint "******************************** 3271 doprint "***************************************\n\n";
3287 } 3272 }
3288 3273
3289 sub run_config_bisect { 3274 sub run_config_bisect {
3290 my ($good, $bad, $last_result) = @_; 3275 my ($good, $bad, $last_result) = @_;
3291 my $reset = ""; 3276 my $reset = "";
3292 my $cmd; 3277 my $cmd;
3293 my $ret; 3278 my $ret;
3294 3279
3295 if (!length($last_result)) { 3280 if (!length($last_result)) {
3296 $reset = "-r"; 3281 $reset = "-r";
3297 } 3282 }
3298 run_command "$config_bisect_exec $reset - 3283 run_command "$config_bisect_exec $reset -b $outputdir $good $bad $last_result", 1;
3299 3284
3300 # config-bisect returns: 3285 # config-bisect returns:
3301 # 0 if there is more to bisect 3286 # 0 if there is more to bisect
3302 # 1 for finding a good config 3287 # 1 for finding a good config
3303 # 2 if it can not find any more configs 3288 # 2 if it can not find any more configs
3304 # -1 (255) on error 3289 # -1 (255) on error
3305 if ($run_command_status) { 3290 if ($run_command_status) {
3306 return $run_command_status; 3291 return $run_command_status;
3307 } 3292 }
3308 3293
3309 $ret = run_config_bisect_test $config_bis 3294 $ret = run_config_bisect_test $config_bisect_type;
3310 if ($ret) { 3295 if ($ret) {
3311 doprint "NEW GOOD CONFIG ($pass)\n"; 3296 doprint "NEW GOOD CONFIG ($pass)\n";
3312 system("cp $output_config $tmpdir/goo 3297 system("cp $output_config $tmpdir/good_config.tmp.$pass");
3313 $pass++; 3298 $pass++;
3314 # Return 3 for good config 3299 # Return 3 for good config
3315 return 3; 3300 return 3;
3316 } else { 3301 } else {
3317 doprint "NEW BAD CONFIG ($pass)\n"; 3302 doprint "NEW BAD CONFIG ($pass)\n";
3318 system("cp $output_config $tmpdir/bad 3303 system("cp $output_config $tmpdir/bad_config.tmp.$pass");
3319 $pass++; 3304 $pass++;
3320 # Return 4 for bad config 3305 # Return 4 for bad config
3321 return 4; 3306 return 4;
3322 } 3307 }
3323 } 3308 }
3324 3309
3325 sub config_bisect { 3310 sub config_bisect {
3326 my ($i) = @_; 3311 my ($i) = @_;
3327 3312
3328 my $good_config; 3313 my $good_config;
3329 my $bad_config; 3314 my $bad_config;
3330 3315
3331 my $type = $config_bisect_type; 3316 my $type = $config_bisect_type;
3332 my $ret; 3317 my $ret;
3333 3318
3334 $bad_config = $config_bisect; 3319 $bad_config = $config_bisect;
3335 3320
3336 if (defined($config_bisect_good)) { 3321 if (defined($config_bisect_good)) {
3337 $good_config = $config_bisect_good; 3322 $good_config = $config_bisect_good;
3338 } elsif (defined($minconfig)) { 3323 } elsif (defined($minconfig)) {
3339 $good_config = $minconfig; 3324 $good_config = $minconfig;
3340 } else { 3325 } else {
3341 doprint "No config specified, checkin 3326 doprint "No config specified, checking if defconfig works";
3342 $ret = run_bisect_test $type, "defcon 3327 $ret = run_bisect_test $type, "defconfig";
3343 if (!$ret) { 3328 if (!$ret) {
3344 fail "Have no good config to comp 3329 fail "Have no good config to compare with, please set CONFIG_BISECT_GOOD";
3345 return 1; 3330 return 1;
3346 } 3331 }
3347 $good_config = $output_config; 3332 $good_config = $output_config;
3348 } 3333 }
3349 3334
3350 if (!defined($config_bisect_exec)) { 3335 if (!defined($config_bisect_exec)) {
3351 # First check the location that ktest 3336 # First check the location that ktest.pl ran
3352 my @locations = ( 3337 my @locations = (
3353 "$pwd/config-bisect.pl", 3338 "$pwd/config-bisect.pl",
3354 "$dirname/config-bisect.pl", 3339 "$dirname/config-bisect.pl",
3355 "$builddir/tools/testing/ktes 3340 "$builddir/tools/testing/ktest/config-bisect.pl",
3356 undef ); 3341 undef );
3357 foreach my $loc (@locations) { 3342 foreach my $loc (@locations) {
3358 doprint "loc = $loc\n"; 3343 doprint "loc = $loc\n";
3359 $config_bisect_exec = $loc; 3344 $config_bisect_exec = $loc;
3360 last if (defined($config_bisect_e 3345 last if (defined($config_bisect_exec && -x $config_bisect_exec));
3361 } 3346 }
3362 if (!defined($config_bisect_exec)) { 3347 if (!defined($config_bisect_exec)) {
3363 fail "Could not find an executabl 3348 fail "Could not find an executable config-bisect.pl\n",
3364 " Set CONFIG_BISECT_EXEC to 3349 " Set CONFIG_BISECT_EXEC to point to config-bisect.pl";
3365 return 1; 3350 return 1;
3366 } 3351 }
3367 } 3352 }
3368 3353
3369 # we don't want min configs to cause issu 3354 # we don't want min configs to cause issues here.
3370 doprint "Disabling 'MIN_CONFIG' for this 3355 doprint "Disabling 'MIN_CONFIG' for this test\n";
3371 undef $minconfig; 3356 undef $minconfig;
3372 3357
3373 my %good_configs; 3358 my %good_configs;
3374 my %bad_configs; 3359 my %bad_configs;
3375 my %tmp_configs; 3360 my %tmp_configs;
3376 3361
3377 if (-f "$tmpdir/good_config.tmp" || -f "$ 3362 if (-f "$tmpdir/good_config.tmp" || -f "$tmpdir/bad_config.tmp") {
3378 if (read_yn "Interrupted config-bisec 3363 if (read_yn "Interrupted config-bisect. Continue (n - will start new)?") {
3379 if (-f "$tmpdir/good_config.tmp") 3364 if (-f "$tmpdir/good_config.tmp") {
3380 $good_config = "$tmpdir/good_ 3365 $good_config = "$tmpdir/good_config.tmp";
3381 } else { 3366 } else {
3382 $good_config = "$tmpdir/good_ 3367 $good_config = "$tmpdir/good_config";
3383 } 3368 }
3384 if (-f "$tmpdir/bad_config.tmp") 3369 if (-f "$tmpdir/bad_config.tmp") {
3385 $bad_config = "$tmpdir/bad_co 3370 $bad_config = "$tmpdir/bad_config.tmp";
3386 } else { 3371 } else {
3387 $bad_config = "$tmpdir/bad_co 3372 $bad_config = "$tmpdir/bad_config";
3388 } 3373 }
3389 } 3374 }
3390 } 3375 }
3391 doprint "Run good configs through make ol 3376 doprint "Run good configs through make oldconfig\n";
3392 assign_configs \%tmp_configs, $good_confi 3377 assign_configs \%tmp_configs, $good_config;
3393 create_config "$good_config", \%tmp_confi 3378 create_config "$good_config", \%tmp_configs;
3394 $good_config = "$tmpdir/good_config"; 3379 $good_config = "$tmpdir/good_config";
3395 system("cp $output_config $good_config") 3380 system("cp $output_config $good_config") == 0 or dodie "cp good config";
3396 3381
3397 doprint "Run bad configs through make old 3382 doprint "Run bad configs through make oldconfig\n";
3398 assign_configs \%tmp_configs, $bad_config 3383 assign_configs \%tmp_configs, $bad_config;
3399 create_config "$bad_config", \%tmp_config 3384 create_config "$bad_config", \%tmp_configs;
3400 $bad_config = "$tmpdir/bad_config"; 3385 $bad_config = "$tmpdir/bad_config";
3401 system("cp $output_config $bad_config") = 3386 system("cp $output_config $bad_config") == 0 or dodie "cp bad config";
3402 3387
3403 if (defined($config_bisect_check) && $con 3388 if (defined($config_bisect_check) && $config_bisect_check ne "0") {
3404 if ($config_bisect_check ne "good") { 3389 if ($config_bisect_check ne "good") {
3405 doprint "Testing bad config\n"; 3390 doprint "Testing bad config\n";
3406 3391
3407 $ret = run_bisect_test $type, "us 3392 $ret = run_bisect_test $type, "useconfig:$bad_config";
3408 if ($ret) { 3393 if ($ret) {
3409 fail "Bad config succeeded wh 3394 fail "Bad config succeeded when expected to fail!";
3410 return 0; 3395 return 0;
3411 } 3396 }
3412 } 3397 }
3413 if ($config_bisect_check ne "bad") { 3398 if ($config_bisect_check ne "bad") {
3414 doprint "Testing good config\n"; 3399 doprint "Testing good config\n";
3415 3400
3416 $ret = run_bisect_test $type, "us 3401 $ret = run_bisect_test $type, "useconfig:$good_config";
3417 if (!$ret) { 3402 if (!$ret) {
3418 fail "Good config failed when 3403 fail "Good config failed when expected to succeed!";
3419 return 0; 3404 return 0;
3420 } 3405 }
3421 } 3406 }
3422 } 3407 }
3423 3408
3424 my $last_run = ""; 3409 my $last_run = "";
3425 3410
3426 do { 3411 do {
3427 $ret = run_config_bisect $good_config 3412 $ret = run_config_bisect $good_config, $bad_config, $last_run;
3428 if ($ret == 3) { 3413 if ($ret == 3) {
3429 $last_run = "good"; 3414 $last_run = "good";
3430 } elsif ($ret == 4) { 3415 } elsif ($ret == 4) {
3431 $last_run = "bad"; 3416 $last_run = "bad";
3432 } 3417 }
3433 print_times; 3418 print_times;
3434 } while ($ret == 3 || $ret == 4); 3419 } while ($ret == 3 || $ret == 4);
3435 3420
3436 if ($ret == 2) { 3421 if ($ret == 2) {
3437 config_bisect_end "$good_config.tmp", 3422 config_bisect_end "$good_config.tmp", "$bad_config.tmp";
3438 } 3423 }
3439 3424
3440 return $ret if ($ret < 0); 3425 return $ret if ($ret < 0);
3441 3426
3442 success $i; 3427 success $i;
3443 } 3428 }
3444 3429
3445 sub patchcheck_reboot { 3430 sub patchcheck_reboot {
3446 doprint "Reboot and sleep $patchcheck_sle 3431 doprint "Reboot and sleep $patchcheck_sleep_time seconds\n";
3447 reboot_to_good $patchcheck_sleep_time; 3432 reboot_to_good $patchcheck_sleep_time;
3448 } 3433 }
3449 3434
3450 sub patchcheck { 3435 sub patchcheck {
3451 my ($i) = @_; 3436 my ($i) = @_;
3452 3437
3453 dodie "PATCHCHECK_START[$i] not defined\n 3438 dodie "PATCHCHECK_START[$i] not defined\n"
3454 if (!defined($patchcheck_start)); 3439 if (!defined($patchcheck_start));
3455 dodie "PATCHCHECK_TYPE[$i] not defined\n" 3440 dodie "PATCHCHECK_TYPE[$i] not defined\n"
3456 if (!defined($patchcheck_type)); 3441 if (!defined($patchcheck_type));
3457 3442
3458 my $start = $patchcheck_start; 3443 my $start = $patchcheck_start;
3459 3444
3460 my $cherry = $patchcheck_cherry; 3445 my $cherry = $patchcheck_cherry;
3461 if (!defined($cherry)) { 3446 if (!defined($cherry)) {
3462 $cherry = 0; 3447 $cherry = 0;
3463 } 3448 }
3464 3449
3465 my $end = "HEAD"; 3450 my $end = "HEAD";
3466 if (defined($patchcheck_end)) { 3451 if (defined($patchcheck_end)) {
3467 $end = $patchcheck_end; 3452 $end = $patchcheck_end;
3468 } elsif ($cherry) { 3453 } elsif ($cherry) {
3469 dodie "PATCHCHECK_END must be defined 3454 dodie "PATCHCHECK_END must be defined with PATCHCHECK_CHERRY\n";
3470 } 3455 }
3471 3456
3472 # Get the true sha1's since we can use th 3457 # Get the true sha1's since we can use things like HEAD~3
3473 $start = get_sha1($start); 3458 $start = get_sha1($start);
3474 $end = get_sha1($end); 3459 $end = get_sha1($end);
3475 3460
3476 my $type = $patchcheck_type; 3461 my $type = $patchcheck_type;
3477 3462
3478 # Can't have a test without having a test 3463 # Can't have a test without having a test to run
3479 if ($type eq "test" && !defined($run_test 3464 if ($type eq "test" && !defined($run_test)) {
3480 $type = "boot"; 3465 $type = "boot";
3481 } 3466 }
3482 3467
3483 if ($cherry) { 3468 if ($cherry) {
3484 open (IN, "git cherry -v $start $end| 3469 open (IN, "git cherry -v $start $end|") or
3485 dodie "could not get git list"; 3470 dodie "could not get git list";
3486 } else { 3471 } else {
3487 open (IN, "git log --pretty=oneline $ 3472 open (IN, "git log --pretty=oneline $end|") or
3488 dodie "could not get git list"; 3473 dodie "could not get git list";
3489 } 3474 }
3490 3475
3491 my @list; 3476 my @list;
3492 3477
3493 while (<IN>) { 3478 while (<IN>) {
3494 chomp; 3479 chomp;
3495 # git cherry adds a '+' we want to re 3480 # git cherry adds a '+' we want to remove
3496 s/^\+ //; 3481 s/^\+ //;
3497 $list[$#list+1] = $_; 3482 $list[$#list+1] = $_;
3498 last if (/^$start/); 3483 last if (/^$start/);
3499 } 3484 }
3500 close(IN); 3485 close(IN);
3501 3486
3502 if (!$cherry) { 3487 if (!$cherry) {
3503 if ($list[$#list] !~ /^$start/) { 3488 if ($list[$#list] !~ /^$start/) {
3504 fail "SHA1 $start not found"; 3489 fail "SHA1 $start not found";
3505 } 3490 }
3506 3491
3507 # go backwards in the list 3492 # go backwards in the list
3508 @list = reverse @list; 3493 @list = reverse @list;
3509 } 3494 }
3510 3495
3511 doprint("Going to test the following comm 3496 doprint("Going to test the following commits:\n");
3512 foreach my $l (@list) { 3497 foreach my $l (@list) {
3513 doprint "$l\n"; 3498 doprint "$l\n";
3514 } 3499 }
3515 3500
3516 my $save_clean = $noclean; 3501 my $save_clean = $noclean;
3517 my %ignored_warnings; 3502 my %ignored_warnings;
3518 3503
3519 if (defined($ignore_warnings)) { 3504 if (defined($ignore_warnings)) {
3520 foreach my $sha1 (split /\s+/, $ignor 3505 foreach my $sha1 (split /\s+/, $ignore_warnings) {
3521 $ignored_warnings{$sha1} = 1; 3506 $ignored_warnings{$sha1} = 1;
3522 } 3507 }
3523 } 3508 }
3524 3509
3525 $in_patchcheck = 1; 3510 $in_patchcheck = 1;
3526 foreach my $item (@list) { 3511 foreach my $item (@list) {
3527 my $sha1 = $item; 3512 my $sha1 = $item;
3528 $sha1 =~ s/^([[:xdigit:]]+).*/$1/; 3513 $sha1 =~ s/^([[:xdigit:]]+).*/$1/;
3529 3514
3530 doprint "\nProcessing commit \"$item\ 3515 doprint "\nProcessing commit \"$item\"\n\n";
3531 3516
3532 run_command "git checkout $sha1" or 3517 run_command "git checkout $sha1" or
3533 dodie "Failed to checkout $sha1"; 3518 dodie "Failed to checkout $sha1";
3534 3519
3535 # only clean on the first and last pa 3520 # only clean on the first and last patch
3536 if ($item eq $list[0] || 3521 if ($item eq $list[0] ||
3537 $item eq $list[$#list]) { 3522 $item eq $list[$#list]) {
3538 $noclean = $save_clean; 3523 $noclean = $save_clean;
3539 } else { 3524 } else {
3540 $noclean = 1; 3525 $noclean = 1;
3541 } 3526 }
3542 3527
3543 if (defined($minconfig)) { 3528 if (defined($minconfig)) {
3544 build "useconfig:$minconfig" or r 3529 build "useconfig:$minconfig" or return 0;
3545 } else { 3530 } else {
3546 # ?? no config to use? 3531 # ?? no config to use?
3547 build "oldconfig" or return 0; 3532 build "oldconfig" or return 0;
3548 } 3533 }
3549 3534
3550 # No need to do per patch checking if 3535 # No need to do per patch checking if warnings file exists
3551 if (!defined($warnings_file) && !defi 3536 if (!defined($warnings_file) && !defined($ignored_warnings{$sha1})) {
3552 check_patch_buildlog $sha1 or ret 3537 check_patch_buildlog $sha1 or return 0;
3553 } 3538 }
3554 3539
3555 check_buildlog or return 0; 3540 check_buildlog or return 0;
3556 3541
3557 next if ($type eq "build"); 3542 next if ($type eq "build");
3558 3543
3559 my $failed = 0; 3544 my $failed = 0;
3560 3545
3561 start_monitor_and_install or $failed 3546 start_monitor_and_install or $failed = 1;
3562 3547
3563 if (!$failed && $type ne "boot"){ 3548 if (!$failed && $type ne "boot"){
3564 do_run_test or $failed = 1; 3549 do_run_test or $failed = 1;
3565 } 3550 }
3566 end_monitor; 3551 end_monitor;
3567 if ($failed) { 3552 if ($failed) {
3568 print_times; 3553 print_times;
3569 return 0; 3554 return 0;
3570 } 3555 }
3571 patchcheck_reboot; 3556 patchcheck_reboot;
3572 print_times; 3557 print_times;
3573 } 3558 }
3574 $in_patchcheck = 0; 3559 $in_patchcheck = 0;
3575 success $i; 3560 success $i;
3576 3561
3577 return 1; 3562 return 1;
3578 } 3563 }
3579 3564
3580 sub add_dep { 3565 sub add_dep {
3581 # $config depends on $dep 3566 # $config depends on $dep
3582 my ($config, $dep) = @_; 3567 my ($config, $dep) = @_;
3583 3568
3584 if (defined($depends{$config})) { 3569 if (defined($depends{$config})) {
3585 $depends{$config} .= " " . $dep; 3570 $depends{$config} .= " " . $dep;
3586 } else { 3571 } else {
3587 $depends{$config} = $dep; 3572 $depends{$config} = $dep;
3588 } 3573 }
3589 3574
3590 # record the number of configs depending 3575 # record the number of configs depending on $dep
3591 if (defined $depcount{$dep}) { 3576 if (defined $depcount{$dep}) {
3592 $depcount{$dep}++; 3577 $depcount{$dep}++;
3593 } else { 3578 } else {
3594 $depcount{$dep} = 1; 3579 $depcount{$dep} = 1;
3595 } 3580 }
3596 } 3581 }
3597 3582
3598 # taken from streamline_config.pl 3583 # taken from streamline_config.pl
3599 sub read_kconfig { 3584 sub read_kconfig {
3600 my ($kconfig) = @_; 3585 my ($kconfig) = @_;
3601 3586
3602 my $state = "NONE"; 3587 my $state = "NONE";
3603 my $config; 3588 my $config;
3604 my @kconfigs; 3589 my @kconfigs;
3605 3590
3606 my $cont = 0; 3591 my $cont = 0;
3607 my $line; 3592 my $line;
3608 3593
3609 if (! -f $kconfig) { 3594 if (! -f $kconfig) {
3610 doprint "file $kconfig does not exist 3595 doprint "file $kconfig does not exist, skipping\n";
3611 return; 3596 return;
3612 } 3597 }
3613 3598
3614 open(KIN, "$kconfig") 3599 open(KIN, "$kconfig")
3615 or dodie "Can't open $kconfig"; 3600 or dodie "Can't open $kconfig";
3616 while (<KIN>) { 3601 while (<KIN>) {
3617 chomp; 3602 chomp;
3618 3603
3619 # Make sure that lines ending with \ 3604 # Make sure that lines ending with \ continue
3620 if ($cont) { 3605 if ($cont) {
3621 $_ = $line . " " . $_; 3606 $_ = $line . " " . $_;
3622 } 3607 }
3623 3608
3624 if (s/\\$//) { 3609 if (s/\\$//) {
3625 $cont = 1; 3610 $cont = 1;
3626 $line = $_; 3611 $line = $_;
3627 next; 3612 next;
3628 } 3613 }
3629 3614
3630 $cont = 0; 3615 $cont = 0;
3631 3616
3632 # collect any Kconfig sources 3617 # collect any Kconfig sources
3633 if (/^source\s*"(.*)"/) { 3618 if (/^source\s*"(.*)"/) {
3634 $kconfigs[$#kconfigs+1] = $1; 3619 $kconfigs[$#kconfigs+1] = $1;
3635 } 3620 }
3636 3621
3637 # configs found 3622 # configs found
3638 if (/^\s*(menu)?config\s+(\S+)\s*$/) 3623 if (/^\s*(menu)?config\s+(\S+)\s*$/) {
3639 $state = "NEW"; 3624 $state = "NEW";
3640 $config = $2; 3625 $config = $2;
3641 3626
3642 for (my $i = 0; $i < $iflevel; $i 3627 for (my $i = 0; $i < $iflevel; $i++) {
3643 add_dep $config, $ifdeps[$i]; 3628 add_dep $config, $ifdeps[$i];
3644 } 3629 }
3645 3630
3646 # collect the depends for the config 3631 # collect the depends for the config
3647 } elsif ($state eq "NEW" && /^\s*depe 3632 } elsif ($state eq "NEW" && /^\s*depends\s+on\s+(.*)$/) {
3648 3633
3649 add_dep $config, $1; 3634 add_dep $config, $1;
3650 3635
3651 # Get the configs that select this co 3636 # Get the configs that select this config
3652 } elsif ($state eq "NEW" && /^\s*sele 3637 } elsif ($state eq "NEW" && /^\s*select\s+(\S+)/) {
3653 3638
3654 # selected by depends on config 3639 # selected by depends on config
3655 add_dep $1, $config; 3640 add_dep $1, $config;
3656 3641
3657 # Check for if statements 3642 # Check for if statements
3658 } elsif (/^if\s+(.*\S)\s*$/) { 3643 } elsif (/^if\s+(.*\S)\s*$/) {
3659 my $deps = $1; 3644 my $deps = $1;
3660 # remove beginning and ending non 3645 # remove beginning and ending non text
3661 $deps =~ s/^[^a-zA-Z0-9_]*//; 3646 $deps =~ s/^[^a-zA-Z0-9_]*//;
3662 $deps =~ s/[^a-zA-Z0-9_]*$//; 3647 $deps =~ s/[^a-zA-Z0-9_]*$//;
3663 3648
3664 my @deps = split /[^a-zA-Z0-9_]+/ 3649 my @deps = split /[^a-zA-Z0-9_]+/, $deps;
3665 3650
3666 $ifdeps[$iflevel++] = join ':', @ 3651 $ifdeps[$iflevel++] = join ':', @deps;
3667 3652
3668 } elsif (/^endif/) { 3653 } elsif (/^endif/) {
3669 3654
3670 $iflevel-- if ($iflevel); 3655 $iflevel-- if ($iflevel);
3671 3656
3672 # stop on "help" 3657 # stop on "help"
3673 } elsif (/^\s*help\s*$/) { 3658 } elsif (/^\s*help\s*$/) {
3674 $state = "NONE"; 3659 $state = "NONE";
3675 } 3660 }
3676 } 3661 }
3677 close(KIN); 3662 close(KIN);
3678 3663
3679 # read in any configs that were found. 3664 # read in any configs that were found.
3680 foreach $kconfig (@kconfigs) { 3665 foreach $kconfig (@kconfigs) {
3681 if (!defined($read_kconfigs{$kconfig} 3666 if (!defined($read_kconfigs{$kconfig})) {
3682 $read_kconfigs{$kconfig} = 1; 3667 $read_kconfigs{$kconfig} = 1;
3683 read_kconfig("$builddir/$kconfig" 3668 read_kconfig("$builddir/$kconfig");
3684 } 3669 }
3685 } 3670 }
3686 } 3671 }
3687 3672
3688 sub read_depends { 3673 sub read_depends {
3689 # find out which arch this is by the kcon 3674 # find out which arch this is by the kconfig file
3690 open (IN, $output_config) or 3675 open (IN, $output_config) or
3691 dodie "Failed to read $output_config" 3676 dodie "Failed to read $output_config";
3692 my $arch; 3677 my $arch;
3693 while (<IN>) { 3678 while (<IN>) {
3694 if (m,Linux/(\S+)\s+\S+\s+Kernel Conf 3679 if (m,Linux/(\S+)\s+\S+\s+Kernel Configuration,) {
3695 $arch = $1; 3680 $arch = $1;
3696 last; 3681 last;
3697 } 3682 }
3698 } 3683 }
3699 close IN; 3684 close IN;
3700 3685
3701 if (!defined($arch)) { 3686 if (!defined($arch)) {
3702 doprint "Could not find arch from con 3687 doprint "Could not find arch from config file\n";
3703 doprint "no dependencies used\n"; 3688 doprint "no dependencies used\n";
3704 return; 3689 return;
3705 } 3690 }
3706 3691
3707 # arch is really the subarch, we need to 3692 # arch is really the subarch, we need to know
3708 # what directory to look at. 3693 # what directory to look at.
3709 if ($arch eq "i386" || $arch eq "x86_64") 3694 if ($arch eq "i386" || $arch eq "x86_64") {
3710 $arch = "x86"; 3695 $arch = "x86";
3711 } 3696 }
3712 3697
3713 my $kconfig = "$builddir/arch/$arch/Kconf 3698 my $kconfig = "$builddir/arch/$arch/Kconfig";
3714 3699
3715 if (! -f $kconfig && $arch =~ /\d$/) { 3700 if (! -f $kconfig && $arch =~ /\d$/) {
3716 my $orig = $arch; 3701 my $orig = $arch;
3717 # some subarchs have numbers, truncat 3702 # some subarchs have numbers, truncate them
3718 $arch =~ s/\d*$//; 3703 $arch =~ s/\d*$//;
3719 $kconfig = "$builddir/arch/$arch/Kcon 3704 $kconfig = "$builddir/arch/$arch/Kconfig";
3720 if (! -f $kconfig) { 3705 if (! -f $kconfig) {
3721 doprint "No idea what arch dir $o 3706 doprint "No idea what arch dir $orig is for\n";
3722 doprint "no dependencies used\n"; 3707 doprint "no dependencies used\n";
3723 return; 3708 return;
3724 } 3709 }
3725 } 3710 }
3726 3711
3727 read_kconfig($kconfig); 3712 read_kconfig($kconfig);
3728 } 3713 }
3729 3714
3730 sub make_new_config { 3715 sub make_new_config {
3731 my @configs = @_; 3716 my @configs = @_;
3732 3717
3733 open (OUT, ">$output_config") 3718 open (OUT, ">$output_config")
3734 or dodie "Failed to write $output_con 3719 or dodie "Failed to write $output_config";
3735 3720
3736 foreach my $config (@configs) { 3721 foreach my $config (@configs) {
3737 print OUT "$config\n"; 3722 print OUT "$config\n";
3738 } 3723 }
3739 close OUT; 3724 close OUT;
3740 } 3725 }
3741 3726
3742 sub chomp_config { 3727 sub chomp_config {
3743 my ($config) = @_; 3728 my ($config) = @_;
3744 3729
3745 $config =~ s/CONFIG_//; 3730 $config =~ s/CONFIG_//;
3746 3731
3747 return $config; 3732 return $config;
3748 } 3733 }
3749 3734
3750 sub get_depends { 3735 sub get_depends {
3751 my ($dep) = @_; 3736 my ($dep) = @_;
3752 3737
3753 my $kconfig = chomp_config $dep; 3738 my $kconfig = chomp_config $dep;
3754 3739
3755 $dep = $depends{"$kconfig"}; 3740 $dep = $depends{"$kconfig"};
3756 3741
3757 # the dep string we have saves the depend 3742 # the dep string we have saves the dependencies as they
3758 # were found, including expressions like 3743 # were found, including expressions like ! && ||. We
3759 # want to split this out into just an arr 3744 # want to split this out into just an array of configs.
3760 3745
3761 my $valid = "A-Za-z_0-9"; 3746 my $valid = "A-Za-z_0-9";
3762 3747
3763 my @configs; 3748 my @configs;
3764 3749
3765 while ($dep =~ /[$valid]/) { 3750 while ($dep =~ /[$valid]/) {
3766 if ($dep =~ /^[^$valid]*([$valid]+)/) 3751 if ($dep =~ /^[^$valid]*([$valid]+)/) {
3767 my $conf = "CONFIG_" . $1; 3752 my $conf = "CONFIG_" . $1;
3768 3753
3769 $configs[$#configs + 1] = $conf; 3754 $configs[$#configs + 1] = $conf;
3770 3755
3771 $dep =~ s/^[^$valid]*[$valid]+//; 3756 $dep =~ s/^[^$valid]*[$valid]+//;
3772 } else { 3757 } else {
3773 dodie "this should never happen"; 3758 dodie "this should never happen";
3774 } 3759 }
3775 } 3760 }
3776 3761
3777 return @configs; 3762 return @configs;
3778 } 3763 }
3779 3764
3780 sub test_this_config { 3765 sub test_this_config {
3781 my ($config) = @_; 3766 my ($config) = @_;
3782 3767
3783 my $found; 3768 my $found;
3784 3769
3785 # if we already processed this config, sk 3770 # if we already processed this config, skip it
3786 if (defined($processed_configs{$config})) 3771 if (defined($processed_configs{$config})) {
3787 return undef; 3772 return undef;
3788 } 3773 }
3789 $processed_configs{$config} = 1; 3774 $processed_configs{$config} = 1;
3790 3775
3791 # if this config failed during this round 3776 # if this config failed during this round, skip it
3792 if (defined($nochange_config{$config})) { 3777 if (defined($nochange_config{$config})) {
3793 return undef; 3778 return undef;
3794 } 3779 }
3795 3780
3796 my $kconfig = chomp_config $config; 3781 my $kconfig = chomp_config $config;
3797 3782
3798 # Test dependencies first 3783 # Test dependencies first
3799 if (defined($depends{"$kconfig"})) { 3784 if (defined($depends{"$kconfig"})) {
3800 my @parents = get_depends $config; 3785 my @parents = get_depends $config;
3801 foreach my $parent (@parents) { 3786 foreach my $parent (@parents) {
3802 # if the parent is in the min con 3787 # if the parent is in the min config, check it first
3803 next if (!defined($min_configs{$p 3788 next if (!defined($min_configs{$parent}));
3804 $found = test_this_config($parent 3789 $found = test_this_config($parent);
3805 if (defined($found)) { 3790 if (defined($found)) {
3806 return $found; 3791 return $found;
3807 } 3792 }
3808 } 3793 }
3809 } 3794 }
3810 3795
3811 # Remove this config from the list of con 3796 # Remove this config from the list of configs
3812 # do a make olddefconfig and then read th 3797 # do a make olddefconfig and then read the resulting
3813 # .config to make sure it is missing the 3798 # .config to make sure it is missing the config that
3814 # we had before 3799 # we had before
3815 my %configs = %min_configs; 3800 my %configs = %min_configs;
3816 $configs{$config} = "# $config is not set 3801 $configs{$config} = "# $config is not set";
3817 make_new_config ((values %configs), (valu 3802 make_new_config ((values %configs), (values %keep_configs));
3818 make_oldconfig; 3803 make_oldconfig;
3819 delete $configs{$config}; 3804 delete $configs{$config};
3820 undef %configs; 3805 undef %configs;
3821 assign_configs \%configs, $output_config; 3806 assign_configs \%configs, $output_config;
3822 3807
3823 if (!defined($configs{$config}) || $confi 3808 if (!defined($configs{$config}) || $configs{$config} =~ /^#/) {
3824 return $config; 3809 return $config;
3825 } 3810 }
3826 3811
3827 doprint "disabling config $config did not 3812 doprint "disabling config $config did not change .config\n";
3828 3813
3829 $nochange_config{$config} = 1; 3814 $nochange_config{$config} = 1;
3830 3815
3831 return undef; 3816 return undef;
3832 } 3817 }
3833 3818
3834 sub make_min_config { 3819 sub make_min_config {
3835 my ($i) = @_; 3820 my ($i) = @_;
3836 3821
3837 my $type = $minconfig_type; 3822 my $type = $minconfig_type;
3838 if ($type ne "boot" && $type ne "test") { 3823 if ($type ne "boot" && $type ne "test") {
3839 fail "Invalid MIN_CONFIG_TYPE '$minco 3824 fail "Invalid MIN_CONFIG_TYPE '$minconfig_type'\n" .
3840 " make_min_config works only with 3825 " make_min_config works only with 'boot' and 'test'\n" and return;
3841 } 3826 }
3842 3827
3843 if (!defined($output_minconfig)) { 3828 if (!defined($output_minconfig)) {
3844 fail "OUTPUT_MIN_CONFIG not defined" 3829 fail "OUTPUT_MIN_CONFIG not defined" and return;
3845 } 3830 }
3846 3831
3847 # If output_minconfig exists, and the sta 3832 # If output_minconfig exists, and the start_minconfig
3848 # came from min_config, than ask if we sh 3833 # came from min_config, than ask if we should use
3849 # that instead. 3834 # that instead.
3850 if (-f $output_minconfig && !$start_minco 3835 if (-f $output_minconfig && !$start_minconfig_defined) {
3851 print "$output_minconfig exists\n"; 3836 print "$output_minconfig exists\n";
3852 if (!defined($use_output_minconfig)) 3837 if (!defined($use_output_minconfig)) {
3853 if (read_yn " Use it as minconfig 3838 if (read_yn " Use it as minconfig?") {
3854 $start_minconfig = $output_mi 3839 $start_minconfig = $output_minconfig;
3855 } 3840 }
3856 } elsif ($use_output_minconfig > 0) { 3841 } elsif ($use_output_minconfig > 0) {
3857 doprint "Using $output_minconfig 3842 doprint "Using $output_minconfig as MIN_CONFIG\n";
3858 $start_minconfig = $output_mincon 3843 $start_minconfig = $output_minconfig;
3859 } else { 3844 } else {
3860 doprint "Set to still use MIN_CON 3845 doprint "Set to still use MIN_CONFIG as starting point\n";
3861 } 3846 }
3862 } 3847 }
3863 3848
3864 if (!defined($start_minconfig)) { 3849 if (!defined($start_minconfig)) {
3865 fail "START_MIN_CONFIG or MIN_CONFIG 3850 fail "START_MIN_CONFIG or MIN_CONFIG not defined" and return;
3866 } 3851 }
3867 3852
3868 my $temp_config = "$tmpdir/temp_config"; 3853 my $temp_config = "$tmpdir/temp_config";
3869 3854
3870 # First things first. We build an allnoco 3855 # First things first. We build an allnoconfig to find
3871 # out what the defaults are that we can't 3856 # out what the defaults are that we can't touch.
3872 # Some are selections, but we really can' 3857 # Some are selections, but we really can't handle selections.
3873 3858
3874 my $save_minconfig = $minconfig; 3859 my $save_minconfig = $minconfig;
3875 undef $minconfig; 3860 undef $minconfig;
3876 3861
3877 run_command "$make allnoconfig" or return 3862 run_command "$make allnoconfig" or return 0;
3878 3863
3879 read_depends; 3864 read_depends;
3880 3865
3881 process_config_ignore $output_config; 3866 process_config_ignore $output_config;
3882 3867
3883 undef %save_configs; 3868 undef %save_configs;
3884 undef %min_configs; 3869 undef %min_configs;
3885 3870
3886 if (defined($ignore_config)) { 3871 if (defined($ignore_config)) {
3887 # make sure the file exists 3872 # make sure the file exists
3888 `touch $ignore_config`; 3873 `touch $ignore_config`;
3889 assign_configs \%save_configs, $ignor 3874 assign_configs \%save_configs, $ignore_config;
3890 } 3875 }
3891 3876
3892 %keep_configs = %save_configs; 3877 %keep_configs = %save_configs;
3893 3878
3894 doprint "Load initial configs from $start 3879 doprint "Load initial configs from $start_minconfig\n";
3895 3880
3896 # Look at the current min configs, and sa 3881 # Look at the current min configs, and save off all the
3897 # ones that were set via the allnoconfig 3882 # ones that were set via the allnoconfig
3898 assign_configs \%min_configs, $start_minc 3883 assign_configs \%min_configs, $start_minconfig;
3899 3884
3900 my @config_keys = keys %min_configs; 3885 my @config_keys = keys %min_configs;
3901 3886
3902 # All configs need a depcount 3887 # All configs need a depcount
3903 foreach my $config (@config_keys) { 3888 foreach my $config (@config_keys) {
3904 my $kconfig = chomp_config $config; 3889 my $kconfig = chomp_config $config;
3905 if (!defined $depcount{$kconfig}) { 3890 if (!defined $depcount{$kconfig}) {
3906 $depcount{$kconfig} = 0; 3891 $depcount{$kconfig} = 0;
3907 } 3892 }
3908 } 3893 }
3909 3894
3910 # Remove anything that was set by the mak 3895 # Remove anything that was set by the make allnoconfig
3911 # we shouldn't need them as they get set 3896 # we shouldn't need them as they get set for us anyway.
3912 foreach my $config (@config_keys) { 3897 foreach my $config (@config_keys) {
3913 # Remove anything in the ignore_confi 3898 # Remove anything in the ignore_config
3914 if (defined($keep_configs{$config})) 3899 if (defined($keep_configs{$config})) {
3915 my $file = $ignore_config; 3900 my $file = $ignore_config;
3916 $file =~ s,.*/(.*?)$,$1,; 3901 $file =~ s,.*/(.*?)$,$1,;
3917 doprint "$config set by $file ... 3902 doprint "$config set by $file ... ignored\n";
3918 delete $min_configs{$config}; 3903 delete $min_configs{$config};
3919 next; 3904 next;
3920 } 3905 }
3921 # But make sure the settings are the 3906 # But make sure the settings are the same. If a min config
3922 # sets a selection, we do not want to 3907 # sets a selection, we do not want to get rid of it if
3923 # it is not the same as what we have. 3908 # it is not the same as what we have. Just move it into
3924 # the keep configs. 3909 # the keep configs.
3925 if (defined($config_ignore{$config})) 3910 if (defined($config_ignore{$config})) {
3926 if ($config_ignore{$config} ne $m 3911 if ($config_ignore{$config} ne $min_configs{$config}) {
3927 doprint "$config is in allnoc 3912 doprint "$config is in allnoconfig as '$config_ignore{$config}'";
3928 doprint " but it is '$min_con 3913 doprint " but it is '$min_configs{$config}' in minconfig .. keeping\n";
3929 $keep_configs{$config} = $min 3914 $keep_configs{$config} = $min_configs{$config};
3930 } else { 3915 } else {
3931 doprint "$config set by allno 3916 doprint "$config set by allnoconfig ... ignored\n";
3932 } 3917 }
3933 delete $min_configs{$config}; 3918 delete $min_configs{$config};
3934 } 3919 }
3935 } 3920 }
3936 3921
3937 my $done = 0; 3922 my $done = 0;
3938 my $take_two = 0; 3923 my $take_two = 0;
3939 3924
3940 while (!$done) { 3925 while (!$done) {
3941 my $config; 3926 my $config;
3942 my $found; 3927 my $found;
3943 3928
3944 # Now disable each config one by one 3929 # Now disable each config one by one and do a make oldconfig
3945 # till we find a config that changes 3930 # till we find a config that changes our list.
3946 3931
3947 my @test_configs = keys %min_configs; 3932 my @test_configs = keys %min_configs;
3948 3933
3949 # Sort keys by who is most dependent 3934 # Sort keys by who is most dependent on
3950 @test_configs = sort { $depcount{cho 3935 @test_configs = sort { $depcount{chomp_config($b)} <=> $depcount{chomp_config($a)} }
3951 @test_configs ; 3936 @test_configs ;
3952 3937
3953 # Put configs that did not modify the 3938 # Put configs that did not modify the config at the end.
3954 my $reset = 1; 3939 my $reset = 1;
3955 for (my $i = 0; $i < $#test_configs; 3940 for (my $i = 0; $i < $#test_configs; $i++) {
3956 if (!defined($nochange_config{$te 3941 if (!defined($nochange_config{$test_configs[0]})) {
3957 $reset = 0; 3942 $reset = 0;
3958 last; 3943 last;
3959 } 3944 }
3960 # This config didn't change the . 3945 # This config didn't change the .config last time.
3961 # Place it at the end 3946 # Place it at the end
3962 my $config = shift @test_configs; 3947 my $config = shift @test_configs;
3963 push @test_configs, $config; 3948 push @test_configs, $config;
3964 } 3949 }
3965 3950
3966 # if every test config has failed to 3951 # if every test config has failed to modify the .config file
3967 # in the past, then reset and start o 3952 # in the past, then reset and start over.
3968 if ($reset) { 3953 if ($reset) {
3969 undef %nochange_config; 3954 undef %nochange_config;
3970 } 3955 }
3971 3956
3972 undef %processed_configs; 3957 undef %processed_configs;
3973 3958
3974 foreach my $config (@test_configs) { 3959 foreach my $config (@test_configs) {
3975 3960
3976 $found = test_this_config $config 3961 $found = test_this_config $config;
3977 3962
3978 last if (defined($found)); 3963 last if (defined($found));
3979 3964
3980 # oh well, try another config 3965 # oh well, try another config
3981 } 3966 }
3982 3967
3983 if (!defined($found)) { 3968 if (!defined($found)) {
3984 # we could have failed due to the 3969 # we could have failed due to the nochange_config hash
3985 # reset and try again 3970 # reset and try again
3986 if (!$take_two) { 3971 if (!$take_two) {
3987 undef %nochange_config; 3972 undef %nochange_config;
3988 $take_two = 1; 3973 $take_two = 1;
3989 next; 3974 next;
3990 } 3975 }
3991 doprint "No more configs found th 3976 doprint "No more configs found that we can disable\n";
3992 $done = 1; 3977 $done = 1;
3993 last; 3978 last;
3994 } 3979 }
3995 $take_two = 0; 3980 $take_two = 0;
3996 3981
3997 $config = $found; 3982 $config = $found;
3998 3983
3999 doprint "Test with $config disabled\n 3984 doprint "Test with $config disabled\n";
4000 3985
4001 # set in_bisect to keep build and mon 3986 # set in_bisect to keep build and monitor from dieing
4002 $in_bisect = 1; 3987 $in_bisect = 1;
4003 3988
4004 my $failed = 0; 3989 my $failed = 0;
4005 build "oldconfig" or $failed = 1; 3990 build "oldconfig" or $failed = 1;
4006 if (!$failed) { 3991 if (!$failed) {
4007 start_monitor_and_install or $fai 3992 start_monitor_and_install or $failed = 1;
4008 3993
4009 if ($type eq "test" && !$failed) 3994 if ($type eq "test" && !$failed) {
4010 do_run_test or $failed = 1; 3995 do_run_test or $failed = 1;
4011 } 3996 }
4012 3997
4013 end_monitor; 3998 end_monitor;
4014 } 3999 }
4015 4000
4016 $in_bisect = 0; 4001 $in_bisect = 0;
4017 4002
4018 if ($failed) { 4003 if ($failed) {
4019 doprint "$min_configs{$config} is 4004 doprint "$min_configs{$config} is needed to boot the box... keeping\n";
4020 # this config is needed, add it t 4005 # this config is needed, add it to the ignore list.
4021 $keep_configs{$config} = $min_con 4006 $keep_configs{$config} = $min_configs{$config};
4022 $save_configs{$config} = $min_con 4007 $save_configs{$config} = $min_configs{$config};
4023 delete $min_configs{$config}; 4008 delete $min_configs{$config};
4024 4009
4025 # update new ignore configs 4010 # update new ignore configs
4026 if (defined($ignore_config)) { 4011 if (defined($ignore_config)) {
4027 open (OUT, ">$temp_config") o 4012 open (OUT, ">$temp_config") or
4028 dodie "Can't write to $te 4013 dodie "Can't write to $temp_config";
4029 foreach my $config (keys %sav 4014 foreach my $config (keys %save_configs) {
4030 print OUT "$save_configs{ 4015 print OUT "$save_configs{$config}\n";
4031 } 4016 }
4032 close OUT; 4017 close OUT;
4033 run_command "mv $temp_config 4018 run_command "mv $temp_config $ignore_config" or
4034 dodie "failed to copy upd 4019 dodie "failed to copy update to $ignore_config";
4035 } 4020 }
4036 4021
4037 } else { 4022 } else {
4038 # We booted without this config, 4023 # We booted without this config, remove it from the minconfigs.
4039 doprint "$config is not needed, d 4024 doprint "$config is not needed, disabling\n";
4040 4025
4041 delete $min_configs{$config}; 4026 delete $min_configs{$config};
4042 4027
4043 # Also disable anything that is n 4028 # Also disable anything that is not enabled in this config
4044 my %configs; 4029 my %configs;
4045 assign_configs \%configs, $output 4030 assign_configs \%configs, $output_config;
4046 my @config_keys = keys %min_confi 4031 my @config_keys = keys %min_configs;
4047 foreach my $config (@config_keys) 4032 foreach my $config (@config_keys) {
4048 if (!defined($configs{$config 4033 if (!defined($configs{$config})) {
4049 doprint "$config is not s 4034 doprint "$config is not set, disabling\n";
4050 delete $min_configs{$conf 4035 delete $min_configs{$config};
4051 } 4036 }
4052 } 4037 }
4053 4038
4054 # Save off all the current mandat 4039 # Save off all the current mandatory configs
4055 open (OUT, ">$temp_config") or 4040 open (OUT, ">$temp_config") or
4056 dodie "Can't write to $temp_c 4041 dodie "Can't write to $temp_config";
4057 foreach my $config (keys %keep_co 4042 foreach my $config (keys %keep_configs) {
4058 print OUT "$keep_configs{$con 4043 print OUT "$keep_configs{$config}\n";
4059 } 4044 }
4060 foreach my $config (keys %min_con 4045 foreach my $config (keys %min_configs) {
4061 print OUT "$min_configs{$conf 4046 print OUT "$min_configs{$config}\n";
4062 } 4047 }
4063 close OUT; 4048 close OUT;
4064 4049
4065 run_command "mv $temp_config $out 4050 run_command "mv $temp_config $output_minconfig" or
4066 dodie "failed to copy update 4051 dodie "failed to copy update to $output_minconfig";
4067 } 4052 }
4068 4053
4069 doprint "Reboot and wait $sleep_time 4054 doprint "Reboot and wait $sleep_time seconds\n";
4070 reboot_to_good $sleep_time; 4055 reboot_to_good $sleep_time;
4071 } 4056 }
4072 4057
4073 success $i; 4058 success $i;
4074 return 1; 4059 return 1;
4075 } 4060 }
4076 4061
4077 sub make_warnings_file { 4062 sub make_warnings_file {
4078 my ($i) = @_; 4063 my ($i) = @_;
4079 4064
4080 if (!defined($warnings_file)) { 4065 if (!defined($warnings_file)) {
4081 dodie "Must define WARNINGS_FILE for 4066 dodie "Must define WARNINGS_FILE for make_warnings_file test";
4082 } 4067 }
4083 4068
4084 if ($build_type eq "nobuild") { 4069 if ($build_type eq "nobuild") {
4085 dodie "BUILD_TYPE can not be 'nobuild 4070 dodie "BUILD_TYPE can not be 'nobuild' for make_warnings_file test";
4086 } 4071 }
4087 4072
4088 build $build_type or dodie "Failed to bui 4073 build $build_type or dodie "Failed to build";
4089 4074
4090 open(OUT, ">$warnings_file") or dodie "Ca 4075 open(OUT, ">$warnings_file") or dodie "Can't create $warnings_file";
4091 4076
4092 open(IN, $buildlog) or dodie "Can't open 4077 open(IN, $buildlog) or dodie "Can't open $buildlog";
4093 while (<IN>) { 4078 while (<IN>) {
4094 # Some compilers use UTF-8 extended f 4079 # Some compilers use UTF-8 extended for quotes
4095 # for distcc heterogeneous systems, t 4080 # for distcc heterogeneous systems, this causes issues
4096 s/$utf8_quote/'/g; 4081 s/$utf8_quote/'/g;
4097 4082
4098 if (/$check_build_re/) { 4083 if (/$check_build_re/) {
4099 print OUT; 4084 print OUT;
4100 } 4085 }
4101 } 4086 }
4102 close(IN); 4087 close(IN);
4103 4088
4104 close(OUT); 4089 close(OUT);
4105 4090
4106 success $i; 4091 success $i;
4107 } 4092 }
4108 4093
4109 sub option_defined { 4094 sub option_defined {
4110 my ($option) = @_; 4095 my ($option) = @_;
4111 4096
4112 if (defined($opt{$option}) && $opt{$optio 4097 if (defined($opt{$option}) && $opt{$option} !~ /^\s*$/) {
4113 return 1; 4098 return 1;
4114 } 4099 }
4115 4100
4116 return 0; 4101 return 0;
4117 } 4102 }
4118 4103
4119 sub __set_test_option { 4104 sub __set_test_option {
4120 my ($name, $i) = @_; 4105 my ($name, $i) = @_;
4121 4106
4122 my $option = "$name\[$i\]"; 4107 my $option = "$name\[$i\]";
4123 4108
4124 if (option_defined($option)) { 4109 if (option_defined($option)) {
4125 return $opt{$option}; 4110 return $opt{$option};
4126 } 4111 }
4127 4112
4128 foreach my $test (keys %repeat_tests) { 4113 foreach my $test (keys %repeat_tests) {
4129 if ($i >= $test && 4114 if ($i >= $test &&
4130 $i < $test + $repeat_tests{$test} 4115 $i < $test + $repeat_tests{$test}) {
4131 $option = "$name\[$test\]"; 4116 $option = "$name\[$test\]";
4132 if (option_defined($option)) { 4117 if (option_defined($option)) {
4133 return $opt{$option}; 4118 return $opt{$option};
4134 } 4119 }
4135 } 4120 }
4136 } 4121 }
4137 4122
4138 if (option_defined($name)) { 4123 if (option_defined($name)) {
4139 return $opt{$name}; 4124 return $opt{$name};
4140 } 4125 }
4141 4126
4142 return undef; 4127 return undef;
4143 } 4128 }
4144 4129
4145 sub set_test_option { 4130 sub set_test_option {
4146 my ($name, $i) = @_; 4131 my ($name, $i) = @_;
4147 4132
4148 my $option = __set_test_option($name, $i) 4133 my $option = __set_test_option($name, $i);
4149 return $option if (!defined($option)); 4134 return $option if (!defined($option));
4150 4135
4151 return eval_option($name, $option, $i); 4136 return eval_option($name, $option, $i);
4152 } 4137 }
4153 4138
4154 sub find_mailer { 4139 sub find_mailer {
4155 my ($mailer) = @_; 4140 my ($mailer) = @_;
4156 4141
4157 my @paths = split /:/, $ENV{PATH}; 4142 my @paths = split /:/, $ENV{PATH};
4158 4143
4159 # sendmail is usually in /usr/sbin 4144 # sendmail is usually in /usr/sbin
4160 $paths[$#paths + 1] = "/usr/sbin"; 4145 $paths[$#paths + 1] = "/usr/sbin";
4161 4146
4162 foreach my $path (@paths) { 4147 foreach my $path (@paths) {
4163 if (-x "$path/$mailer") { 4148 if (-x "$path/$mailer") {
4164 return $path; 4149 return $path;
4165 } 4150 }
4166 } 4151 }
4167 4152
4168 return undef; 4153 return undef;
4169 } 4154 }
4170 4155
4171 sub do_send_mail { 4156 sub do_send_mail {
4172 my ($subject, $message, $file) = @_; 4157 my ($subject, $message, $file) = @_;
4173 4158
4174 if (!defined($mail_path)) { 4159 if (!defined($mail_path)) {
4175 # find the mailer 4160 # find the mailer
4176 $mail_path = find_mailer $mailer; 4161 $mail_path = find_mailer $mailer;
4177 if (!defined($mail_path)) { 4162 if (!defined($mail_path)) {
4178 die "\nCan not find $mailer in PA 4163 die "\nCan not find $mailer in PATH\n";
4179 } 4164 }
4180 } 4165 }
4181 4166
4182 my $header_file = "$tmpdir/header"; 4167 my $header_file = "$tmpdir/header";
4183 open (HEAD, ">$header_file") or die "Can 4168 open (HEAD, ">$header_file") or die "Can not create $header_file\n";
4184 print HEAD "To: $mailto\n"; 4169 print HEAD "To: $mailto\n";
4185 print HEAD "Subject: $subject\n\n"; 4170 print HEAD "Subject: $subject\n\n";
4186 print HEAD "$message\n"; 4171 print HEAD "$message\n";
4187 close HEAD; 4172 close HEAD;
4188 4173
4189 if (!defined($mail_command)) { 4174 if (!defined($mail_command)) {
4190 if ($mailer eq "mail" || $mailer eq " 4175 if ($mailer eq "mail" || $mailer eq "mailx") {
4191 $mail_command = "cat \$HEADER_FIL 4176 $mail_command = "cat \$HEADER_FILE \$BODY_FILE | \$MAIL_PATH/\$MAILER -s \'\$SUBJECT\' \$MAILTO";
4192 } elsif ($mailer eq "sendmail" ) { 4177 } elsif ($mailer eq "sendmail" ) {
4193 $mail_command = "cat \$HEADER_FI 4178 $mail_command = "cat \$HEADER_FILE \$BODY_FILE | \$MAIL_PATH/\$MAILER -t \$MAILTO";
4194 } else { 4179 } else {
4195 die "\nYour mailer: $mailer is no 4180 die "\nYour mailer: $mailer is not supported.\n";
4196 } 4181 }
4197 } 4182 }
4198 4183
4199 if (defined($file)) { 4184 if (defined($file)) {
4200 $mail_command =~ s/\$BODY_FILE/$file/ 4185 $mail_command =~ s/\$BODY_FILE/$file/g;
4201 } else { 4186 } else {
4202 $mail_command =~ s/\$BODY_FILE//g; 4187 $mail_command =~ s/\$BODY_FILE//g;
4203 } 4188 }
4204 4189
4205 $mail_command =~ s/\$HEADER_FILE/$header_ 4190 $mail_command =~ s/\$HEADER_FILE/$header_file/g;
4206 $mail_command =~ s/\$MAILER/$mailer/g; 4191 $mail_command =~ s/\$MAILER/$mailer/g;
4207 $mail_command =~ s/\$MAIL_PATH/$mail_path 4192 $mail_command =~ s/\$MAIL_PATH/$mail_path/g;
4208 $mail_command =~ s/\$MAILTO/$mailto/g; 4193 $mail_command =~ s/\$MAILTO/$mailto/g;
4209 $mail_command =~ s/\$SUBJECT/$subject/g; 4194 $mail_command =~ s/\$SUBJECT/$subject/g;
4210 $mail_command =~ s/\$MESSAGE/$message/g; 4195 $mail_command =~ s/\$MESSAGE/$message/g;
4211 4196
4212 my $ret = run_command $mail_command; 4197 my $ret = run_command $mail_command;
4213 if (!$ret && defined($file)) { 4198 if (!$ret && defined($file)) {
4214 # try again without the file 4199 # try again without the file
4215 $message .= "\n\n*** FAILED TO SEND L 4200 $message .= "\n\n*** FAILED TO SEND LOG ***\n\n";
4216 do_send_email($subject, $message); 4201 do_send_email($subject, $message);
4217 } 4202 }
4218 } 4203 }
4219 4204
4220 sub send_email { 4205 sub send_email {
4221 if (defined($mailto)) { 4206 if (defined($mailto)) {
4222 if (!defined($mailer)) { 4207 if (!defined($mailer)) {
4223 doprint "No email sent: email or 4208 doprint "No email sent: email or mailer not specified in config.\n";
4224 return; 4209 return;
4225 } 4210 }
4226 do_send_mail @_; 4211 do_send_mail @_;
4227 } 4212 }
4228 } 4213 }
4229 4214
4230 sub cancel_test { 4215 sub cancel_test {
4231 if ($monitor_cnt) { 4216 if ($monitor_cnt) {
4232 end_monitor; 4217 end_monitor;
4233 } 4218 }
4234 if ($email_when_canceled) { 4219 if ($email_when_canceled) {
4235 my $name = get_test_name; 4220 my $name = get_test_name;
4236 send_email("KTEST: Your [$name] test 4221 send_email("KTEST: Your [$name] test was cancelled",
4237 "Your test started at $script_sta 4222 "Your test started at $script_start_time was cancelled: sig int");
4238 } 4223 }
4239 die "\nCaught Sig Int, test interrupted: 4224 die "\nCaught Sig Int, test interrupted: $!\n"
4240 } 4225 }
4241 4226
4242 $#ARGV < 1 or die "ktest.pl version: $VERSION 4227 $#ARGV < 1 or die "ktest.pl version: $VERSION\n usage: ktest.pl [config-file]\n";
4243 4228
4244 if ($#ARGV == 0) { 4229 if ($#ARGV == 0) {
4245 $ktest_config = $ARGV[0]; 4230 $ktest_config = $ARGV[0];
4246 if (! -f $ktest_config) { 4231 if (! -f $ktest_config) {
4247 print "$ktest_config does not exist.\ 4232 print "$ktest_config does not exist.\n";
4248 if (!read_yn "Create it?") { 4233 if (!read_yn "Create it?") {
4249 exit 0; 4234 exit 0;
4250 } 4235 }
4251 } 4236 }
4252 } 4237 }
4253 4238
4254 if (! -f $ktest_config) { 4239 if (! -f $ktest_config) {
4255 $newconfig = 1; 4240 $newconfig = 1;
4256 get_test_case; 4241 get_test_case;
4257 open(OUT, ">$ktest_config") or die "Can n 4242 open(OUT, ">$ktest_config") or die "Can not create $ktest_config";
4258 print OUT << "EOF" 4243 print OUT << "EOF"
4259 # Generated by ktest.pl 4244 # Generated by ktest.pl
4260 # 4245 #
4261 4246
4262 # PWD is a ktest.pl variable that will result 4247 # PWD is a ktest.pl variable that will result in the process working
4263 # directory that ktest.pl is executed in. 4248 # directory that ktest.pl is executed in.
4264 4249
4265 # THIS_DIR is automatically assigned the PWD 4250 # THIS_DIR is automatically assigned the PWD of the path that generated
4266 # the config file. It is best to use this var 4251 # the config file. It is best to use this variable when assigning other
4267 # directory paths within this directory. This 4252 # directory paths within this directory. This allows you to easily
4268 # move the test cases to other locations or t 4253 # move the test cases to other locations or to other machines.
4269 # 4254 #
4270 THIS_DIR := $variable{"PWD"} 4255 THIS_DIR := $variable{"PWD"}
4271 4256
4272 # Define each test with TEST_START 4257 # Define each test with TEST_START
4273 # The config options below it will override t 4258 # The config options below it will override the defaults
4274 TEST_START 4259 TEST_START
4275 TEST_TYPE = $default{"TEST_TYPE"} 4260 TEST_TYPE = $default{"TEST_TYPE"}
4276 4261
4277 DEFAULTS 4262 DEFAULTS
4278 EOF 4263 EOF
4279 ; 4264 ;
4280 close(OUT); 4265 close(OUT);
4281 } 4266 }
4282 read_config $ktest_config; 4267 read_config $ktest_config;
4283 4268
4284 if (defined($opt{"LOG_FILE"})) { 4269 if (defined($opt{"LOG_FILE"})) {
4285 $opt{"LOG_FILE"} = eval_option("LOG_FILE" 4270 $opt{"LOG_FILE"} = eval_option("LOG_FILE", $opt{"LOG_FILE"}, -1);
4286 } 4271 }
4287 4272
4288 # Append any configs entered in manually to t 4273 # Append any configs entered in manually to the config file.
4289 my @new_configs = keys %entered_configs; 4274 my @new_configs = keys %entered_configs;
4290 if ($#new_configs >= 0) { 4275 if ($#new_configs >= 0) {
4291 print "\nAppending entered in configs to 4276 print "\nAppending entered in configs to $ktest_config\n";
4292 open(OUT, ">>$ktest_config") or die "Can 4277 open(OUT, ">>$ktest_config") or die "Can not append to $ktest_config";
4293 foreach my $config (@new_configs) { 4278 foreach my $config (@new_configs) {
4294 print OUT "$config = $entered_configs 4279 print OUT "$config = $entered_configs{$config}\n";
4295 $opt{$config} = process_variables($en 4280 $opt{$config} = process_variables($entered_configs{$config});
4296 } 4281 }
4297 } 4282 }
4298 4283
4299 if (defined($opt{"LOG_FILE"})) { 4284 if (defined($opt{"LOG_FILE"})) {
4300 if ($opt{"CLEAR_LOG"}) { 4285 if ($opt{"CLEAR_LOG"}) {
4301 unlink $opt{"LOG_FILE"}; 4286 unlink $opt{"LOG_FILE"};
4302 } 4287 }
4303 open(LOG, ">> $opt{LOG_FILE}") or die "Ca 4288 open(LOG, ">> $opt{LOG_FILE}") or die "Can't write to $opt{LOG_FILE}";
4304 LOG->autoflush(1); 4289 LOG->autoflush(1);
4305 } 4290 }
4306 4291
4307 doprint "\n\nSTARTING AUTOMATED TESTS\n\n"; 4292 doprint "\n\nSTARTING AUTOMATED TESTS\n\n";
4308 4293
4309 for (my $i = 0, my $repeat = 1; $i <= $opt{"N 4294 for (my $i = 0, my $repeat = 1; $i <= $opt{"NUM_TESTS"}; $i += $repeat) {
4310 4295
4311 if (!$i) { 4296 if (!$i) {
4312 doprint "DEFAULT OPTIONS:\n"; 4297 doprint "DEFAULT OPTIONS:\n";
4313 } else { 4298 } else {
4314 doprint "\nTEST $i OPTIONS"; 4299 doprint "\nTEST $i OPTIONS";
4315 if (defined($repeat_tests{$i})) { 4300 if (defined($repeat_tests{$i})) {
4316 $repeat = $repeat_tests{$i}; 4301 $repeat = $repeat_tests{$i};
4317 doprint " ITERATE $repeat"; 4302 doprint " ITERATE $repeat";
4318 } 4303 }
4319 doprint "\n"; 4304 doprint "\n";
4320 } 4305 }
4321 4306
4322 foreach my $option (sort keys %opt) { 4307 foreach my $option (sort keys %opt) {
4323 if ($option =~ /\[(\d+)\]$/) { 4308 if ($option =~ /\[(\d+)\]$/) {
4324 next if ($i != $1); 4309 next if ($i != $1);
4325 } else { 4310 } else {
4326 next if ($i); 4311 next if ($i);
4327 } 4312 }
4328 4313
4329 doprint "$option = $opt{$option}\n"; 4314 doprint "$option = $opt{$option}\n";
4330 } 4315 }
4331 } 4316 }
4332 4317
4333 $SIG{INT} = qw(cancel_test); 4318 $SIG{INT} = qw(cancel_test);
4334 4319
4335 # First we need to do is the builds 4320 # First we need to do is the builds
4336 for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++ 4321 for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
4337 4322
4338 # Do not reboot on failing test options 4323 # Do not reboot on failing test options
4339 $no_reboot = 1; 4324 $no_reboot = 1;
4340 $reboot_success = 0; 4325 $reboot_success = 0;
4341 4326
4342 $have_version = 0; 4327 $have_version = 0;
4343 4328
4344 $iteration = $i; 4329 $iteration = $i;
4345 4330
4346 $build_time = 0; 4331 $build_time = 0;
4347 $install_time = 0; 4332 $install_time = 0;
4348 $reboot_time = 0; 4333 $reboot_time = 0;
4349 $test_time = 0; 4334 $test_time = 0;
4350 4335
4351 undef %force_config; 4336 undef %force_config;
4352 4337
4353 my $makecmd = set_test_option("MAKE_CMD", 4338 my $makecmd = set_test_option("MAKE_CMD", $i);
4354 4339
4355 $outputdir = set_test_option("OUTPUT_DIR" 4340 $outputdir = set_test_option("OUTPUT_DIR", $i);
4356 $builddir = set_test_option("BUILD_DIR", 4341 $builddir = set_test_option("BUILD_DIR", $i);
4357 4342
4358 chdir $builddir || dodie "can't change di 4343 chdir $builddir || dodie "can't change directory to $builddir";
4359 4344
4360 if (!-d $outputdir) { 4345 if (!-d $outputdir) {
4361 mkpath($outputdir) or 4346 mkpath($outputdir) or
4362 dodie "can't create $outputdir"; 4347 dodie "can't create $outputdir";
4363 } 4348 }
4364 4349
4365 $make = "$makecmd O=$outputdir"; 4350 $make = "$makecmd O=$outputdir";
4366 4351
4367 # Load all the options into their mapped 4352 # Load all the options into their mapped variable names
4368 foreach my $opt (keys %option_map) { 4353 foreach my $opt (keys %option_map) {
4369 ${$option_map{$opt}} = set_test_optio 4354 ${$option_map{$opt}} = set_test_option($opt, $i);
4370 } 4355 }
4371 4356
4372 $start_minconfig_defined = 1; 4357 $start_minconfig_defined = 1;
4373 4358
4374 # The first test may override the PRE_KTE 4359 # The first test may override the PRE_KTEST option
4375 if ($i == 1) { 4360 if ($i == 1) {
4376 if (defined($pre_ktest)) { 4361 if (defined($pre_ktest)) {
4377 doprint "\n"; 4362 doprint "\n";
4378 run_command $pre_ktest; 4363 run_command $pre_ktest;
4379 } 4364 }
4380 if ($email_when_started) { 4365 if ($email_when_started) {
4381 my $name = get_test_name; 4366 my $name = get_test_name;
4382 send_email("KTEST: Your [$name] t 4367 send_email("KTEST: Your [$name] test was started",
4383 "Your test was started on $sc 4368 "Your test was started on $script_start_time");
4384 } 4369 }
4385 } 4370 }
4386 4371
4387 # Any test can override the POST_KTEST op 4372 # Any test can override the POST_KTEST option
4388 # The last test takes precedence. 4373 # The last test takes precedence.
4389 if (defined($post_ktest)) { 4374 if (defined($post_ktest)) {
4390 $final_post_ktest = $post_ktest; 4375 $final_post_ktest = $post_ktest;
4391 } 4376 }
4392 4377
4393 if (!defined($start_minconfig)) { 4378 if (!defined($start_minconfig)) {
4394 $start_minconfig_defined = 0; 4379 $start_minconfig_defined = 0;
4395 $start_minconfig = $minconfig; 4380 $start_minconfig = $minconfig;
4396 } 4381 }
4397 4382
4398 if (!-d $tmpdir) { 4383 if (!-d $tmpdir) {
4399 mkpath($tmpdir) or 4384 mkpath($tmpdir) or
4400 dodie "can't create $tmpdir"; 4385 dodie "can't create $tmpdir";
4401 } 4386 }
4402 4387
4403 $ENV{"SSH_USER"} = $ssh_user; 4388 $ENV{"SSH_USER"} = $ssh_user;
4404 $ENV{"MACHINE"} = $machine; 4389 $ENV{"MACHINE"} = $machine;
4405 4390
4406 $buildlog = "$tmpdir/buildlog-$machine"; 4391 $buildlog = "$tmpdir/buildlog-$machine";
4407 $testlog = "$tmpdir/testlog-$machine"; 4392 $testlog = "$tmpdir/testlog-$machine";
4408 $dmesg = "$tmpdir/dmesg-$machine"; 4393 $dmesg = "$tmpdir/dmesg-$machine";
4409 $output_config = "$outputdir/.config"; 4394 $output_config = "$outputdir/.config";
4410 4395
4411 if (!$buildonly) { 4396 if (!$buildonly) {
4412 $target = "$ssh_user\@$machine"; 4397 $target = "$ssh_user\@$machine";
4413 if (($reboot_type eq "grub") or ($reb 4398 if (($reboot_type eq "grub") or ($reboot_type eq "grub2bls")) {
4414 dodie "GRUB_MENU not defined" if 4399 dodie "GRUB_MENU not defined" if (!defined($grub_menu));
4415 } elsif ($reboot_type eq "grub2") { 4400 } elsif ($reboot_type eq "grub2") {
4416 dodie "GRUB_MENU not defined" if 4401 dodie "GRUB_MENU not defined" if (!defined($grub_menu));
4417 dodie "GRUB_FILE not defined" if 4402 dodie "GRUB_FILE not defined" if (!defined($grub_file));
4418 } elsif ($reboot_type eq "syslinux") 4403 } elsif ($reboot_type eq "syslinux") {
4419 dodie "SYSLINUX_LABEL not defined 4404 dodie "SYSLINUX_LABEL not defined" if (!defined($syslinux_label));
4420 } 4405 }
4421 } 4406 }
4422 4407
4423 my $run_type = $build_type; 4408 my $run_type = $build_type;
4424 if ($test_type eq "patchcheck") { 4409 if ($test_type eq "patchcheck") {
4425 $run_type = $patchcheck_type; 4410 $run_type = $patchcheck_type;
4426 } elsif ($test_type eq "bisect") { 4411 } elsif ($test_type eq "bisect") {
4427 $run_type = $bisect_type; 4412 $run_type = $bisect_type;
4428 } elsif ($test_type eq "config_bisect") { 4413 } elsif ($test_type eq "config_bisect") {
4429 $run_type = $config_bisect_type; 4414 $run_type = $config_bisect_type;
4430 } elsif ($test_type eq "make_min_config") 4415 } elsif ($test_type eq "make_min_config") {
4431 $run_type = ""; 4416 $run_type = "";
4432 } elsif ($test_type eq "make_warnings_fil 4417 } elsif ($test_type eq "make_warnings_file") {
4433 $run_type = ""; 4418 $run_type = "";
4434 } 4419 }
4435 4420
4436 # mistake in config file? 4421 # mistake in config file?
4437 if (!defined($run_type)) { 4422 if (!defined($run_type)) {
4438 $run_type = "ERROR"; 4423 $run_type = "ERROR";
4439 } 4424 }
4440 4425
4441 my $installme = ""; 4426 my $installme = "";
4442 $installme = " no_install" if ($no_instal 4427 $installme = " no_install" if ($no_install);
4443 4428
4444 my $name = ""; 4429 my $name = "";
4445 4430
4446 if (defined($test_name)) { 4431 if (defined($test_name)) {
4447 $name = " ($test_name)"; 4432 $name = " ($test_name)";
4448 } 4433 }
4449 4434
4450 doprint "\n\n"; 4435 doprint "\n\n";
4451 4436
4452 if (defined($opt{"LOG_FILE"})) { 4437 if (defined($opt{"LOG_FILE"})) {
4453 $test_log_start = tell(LOG); 4438 $test_log_start = tell(LOG);
4454 } 4439 }
4455 4440
4456 doprint "RUNNING TEST $i of $opt{NUM_TEST 4441 doprint "RUNNING TEST $i of $opt{NUM_TESTS}$name with option $test_type $run_type$installme\n\n";
4457 4442
4458 if (defined($pre_test)) { 4443 if (defined($pre_test)) {
4459 my $ret = run_command $pre_test; 4444 my $ret = run_command $pre_test;
4460 if (!$ret && defined($pre_test_die) & 4445 if (!$ret && defined($pre_test_die) &&
4461 $pre_test_die) { 4446 $pre_test_die) {
4462 dodie "failed to pre_test\n"; 4447 dodie "failed to pre_test\n";
4463 } 4448 }
4464 } 4449 }
4465 4450
4466 unlink $dmesg; 4451 unlink $dmesg;
4467 unlink $buildlog; 4452 unlink $buildlog;
4468 unlink $testlog; 4453 unlink $testlog;
4469 4454
4470 if (defined($addconfig)) { 4455 if (defined($addconfig)) {
4471 my $min = $minconfig; 4456 my $min = $minconfig;
4472 if (!defined($minconfig)) { 4457 if (!defined($minconfig)) {
4473 $min = ""; 4458 $min = "";
4474 } 4459 }
4475 run_command "cat $addconfig $min > $t 4460 run_command "cat $addconfig $min > $tmpdir/add_config" or
4476 dodie "Failed to create temp conf 4461 dodie "Failed to create temp config";
4477 $minconfig = "$tmpdir/add_config"; 4462 $minconfig = "$tmpdir/add_config";
4478 } 4463 }
4479 4464
4480 if (defined($checkout)) { 4465 if (defined($checkout)) {
4481 run_command "git checkout $checkout" 4466 run_command "git checkout $checkout" or
4482 dodie "failed to checkout $checko 4467 dodie "failed to checkout $checkout";
4483 } 4468 }
4484 4469
4485 $no_reboot = 0; 4470 $no_reboot = 0;
4486 4471
4487 # A test may opt to not reboot the box 4472 # A test may opt to not reboot the box
4488 if ($reboot_on_success) { 4473 if ($reboot_on_success) {
4489 $reboot_success = 1; 4474 $reboot_success = 1;
4490 } 4475 }
4491 4476
4492 if ($test_type eq "bisect") { 4477 if ($test_type eq "bisect") {
4493 bisect $i; 4478 bisect $i;
4494 next; 4479 next;
4495 } elsif ($test_type eq "config_bisect") { 4480 } elsif ($test_type eq "config_bisect") {
4496 config_bisect $i; 4481 config_bisect $i;
4497 next; 4482 next;
4498 } elsif ($test_type eq "patchcheck") { 4483 } elsif ($test_type eq "patchcheck") {
4499 patchcheck $i; 4484 patchcheck $i;
4500 next; 4485 next;
4501 } elsif ($test_type eq "make_min_config") 4486 } elsif ($test_type eq "make_min_config") {
4502 make_min_config $i; 4487 make_min_config $i;
4503 next; 4488 next;
4504 } elsif ($test_type eq "make_warnings_fil 4489 } elsif ($test_type eq "make_warnings_file") {
4505 $no_reboot = 1; 4490 $no_reboot = 1;
4506 make_warnings_file $i; 4491 make_warnings_file $i;
4507 next; 4492 next;
4508 } 4493 }
4509 4494
4510 if ($build_type ne "nobuild") { 4495 if ($build_type ne "nobuild") {
4511 build $build_type or next; 4496 build $build_type or next;
4512 check_buildlog or next; 4497 check_buildlog or next;
4513 } 4498 }
4514 4499
4515 if ($test_type eq "install") { 4500 if ($test_type eq "install") {
4516 get_version; 4501 get_version;
4517 install; 4502 install;
4518 success $i; 4503 success $i;
4519 next; 4504 next;
4520 } 4505 }
4521 4506
4522 if ($test_type ne "build") { 4507 if ($test_type ne "build") {
4523 my $failed = 0; 4508 my $failed = 0;
4524 start_monitor_and_install or $failed 4509 start_monitor_and_install or $failed = 1;
4525 4510
4526 if (!$failed && $test_type ne "boot" 4511 if (!$failed && $test_type ne "boot" && defined($run_test)) {
4527 do_run_test or $failed = 1; 4512 do_run_test or $failed = 1;
4528 } 4513 }
4529 end_monitor; 4514 end_monitor;
4530 if ($failed) { 4515 if ($failed) {
4531 print_times; 4516 print_times;
4532 next; 4517 next;
4533 } 4518 }
4534 } 4519 }
4535 4520
4536 print_times; 4521 print_times;
4537 4522
4538 success $i; 4523 success $i;
4539 } 4524 }
4540 4525
4541 if (defined($final_post_ktest)) { 4526 if (defined($final_post_ktest)) {
4542 4527
4543 my $cp_final_post_ktest = eval_kernel_ver 4528 my $cp_final_post_ktest = eval_kernel_version $final_post_ktest;
4544 run_command $cp_final_post_ktest; 4529 run_command $cp_final_post_ktest;
4545 } 4530 }
4546 4531
4547 if ($opt{"POWEROFF_ON_SUCCESS"}) { 4532 if ($opt{"POWEROFF_ON_SUCCESS"}) {
4548 halt; 4533 halt;
4549 } elsif ($opt{"REBOOT_ON_SUCCESS"} && !do_not 4534 } elsif ($opt{"REBOOT_ON_SUCCESS"} && !do_not_reboot && $reboot_success) {
4550 reboot_to_good; 4535 reboot_to_good;
4551 } elsif (defined($switch_to_good)) { 4536 } elsif (defined($switch_to_good)) {
4552 # still need to get to the good kernel 4537 # still need to get to the good kernel
4553 run_command $switch_to_good; 4538 run_command $switch_to_good;
4554 } 4539 }
4555 4540
4556 doprint "\n $successes of $opt{NUM_TESTS} 4541 doprint "\n $successes of $opt{NUM_TESTS} tests were successful\n\n";
4557 4542
4558 if ($email_when_finished) { 4543 if ($email_when_finished) {
4559 send_email("KTEST: Your test has finished 4544 send_email("KTEST: Your test has finished!",
4560 "$successes of $opt{NUM_TESTS} tests 4545 "$successes of $opt{NUM_TESTS} tests started at $script_start_time were successful!");
4561 } 4546 }
4562 4547
4563 if (defined($opt{"LOG_FILE"})) { 4548 if (defined($opt{"LOG_FILE"})) {
4564 print "\n See $opt{LOG_FILE} for the reco 4549 print "\n See $opt{LOG_FILE} for the record of results.\n\n";
4565 close LOG; 4550 close LOG;
4566 } 4551 }
4567 4552
4568 exit 0; 4553 exit 0;
4569 4554
4570 ## 4555 ##
4571 # The following are here to standardize tabs/ 4556 # The following are here to standardize tabs/spaces/etc across the most likely editors
4572 ### 4557 ###
4573 4558
4574 # Local Variables: 4559 # Local Variables:
4575 # mode: perl 4560 # mode: perl
4576 # End: 4561 # End:
4577 # vim: softtabstop=4 4562 # vim: softtabstop=4
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.