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