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