diff options
| -rwxr-xr-x | tools/testing/ktest/ktest.pl | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index f94ed2e98887..66fd98b6b04b 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -227,6 +227,7 @@ my $build_time; my $install_time; my $reboot_time; my $test_time; +my $start_run_time; my $warning_found = 0; @@ -1609,6 +1610,14 @@ sub run_post_ktest { $post_ktest_done = 1; } +sub show_run_time { + return if (!$start_run_time); + my $end_run_time = time; + doprint "\n Total run time: "; + show_time($end_run_time - $start_run_time); + doprint "\n"; +} + sub dodie { # avoid recursion return if ($in_die); @@ -1631,6 +1640,8 @@ sub dodie { `$power_off`; } + show_run_time(); + if (defined($opt{"LOG_FILE"})) { print " See $opt{LOG_FILE} for more info.\n"; } @@ -2652,7 +2663,7 @@ sub apply_min_config { } close IN; } - foreach my $config (keys %force_config) { + foreach my $config (sort keys %force_config) { print OUT "$force_config{$config}\n"; } close OUT; @@ -3019,7 +3030,7 @@ sub run_git_bisect { doprint "SUCCESS\n"; if ($output =~ m/^(Bisecting: .*\(roughly \d+ steps?\))\s+\[([[:xdigit:]]+)\]/) { doprint "$1 [$2]\n"; - } elsif ($output =~ m/^([[:xdigit:]]+) is the first bad commit/) { + } elsif ($output =~ m/^([[:xdigit:]]+) is the first (bad|'bad') commit/) { $bisect_bad_commit = $1; doprint "Found bad commit... $1\n"; return 0; @@ -3325,7 +3336,7 @@ sub save_config { open(OUT, ">$file") or dodie "Can not write to $file"; - foreach my $config (keys %configs) { + foreach my $config (sort keys %configs) { print OUT "$configs{$config}\n"; } close(OUT); @@ -4137,7 +4148,7 @@ sub make_min_config { if (defined($ignore_config)) { open (OUT, ">$temp_config") or dodie "Can't write to $temp_config"; - foreach my $config (keys %save_configs) { + foreach my $config (sort keys %save_configs) { print OUT "$save_configs{$config}\n"; } close OUT; @@ -4165,10 +4176,10 @@ sub make_min_config { # Save off all the current mandatory configs open (OUT, ">$temp_config") or dodie "Can't write to $temp_config"; - foreach my $config (keys %keep_configs) { + foreach my $config (sort keys %keep_configs) { print OUT "$keep_configs{$config}\n"; } - foreach my $config (keys %min_configs) { + foreach my $config (sort keys %min_configs) { print OUT "$min_configs{$config}\n"; } close OUT; @@ -4534,6 +4545,8 @@ print_test_preamble 0; $SIG{INT} = qw(cancel_test); +$start_run_time = time; + # First we need to do is the builds for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) { @@ -4766,6 +4779,8 @@ if ($email_when_finished) { "$successes of $opt{NUM_TESTS} tests started at $script_start_time were successful!"); } +show_run_time(); + if (defined($opt{"LOG_FILE"})) { print "\n See $opt{LOG_FILE} for the record of results.\n\n"; close LOG; |