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