Commit 78a3a625 authored by unknown's avatar unknown

Improve report on test execution time

Define tot_real_tim locally in mtr_report.pl


mysql-test/mysql-test-run.pl:
  Move global variable to local scope in the file it's being used
parent 9687988e
...@@ -38,6 +38,9 @@ sub mtr_child_error (@); ...@@ -38,6 +38,9 @@ sub mtr_child_error (@);
sub mtr_debug (@); sub mtr_debug (@);
sub mtr_verbose (@); sub mtr_verbose (@);
my $tot_real_time= 0;
############################################################################## ##############################################################################
# #
...@@ -142,7 +145,7 @@ sub mtr_report_test_passed ($) { ...@@ -142,7 +145,7 @@ sub mtr_report_test_passed ($) {
if ( $::opt_timer and -f "$::opt_vardir/log/timer" ) if ( $::opt_timer and -f "$::opt_vardir/log/timer" )
{ {
$timer= mtr_fromfile("$::opt_vardir/log/timer"); $timer= mtr_fromfile("$::opt_vardir/log/timer");
$::glob_tot_real_time += ($timer/1000); $tot_real_time += ($timer/1000);
$timer= sprintf "%12s", $timer; $timer= sprintf "%12s", $timer;
} }
$tinfo->{'result'}= 'MTR_RES_PASSED'; $tinfo->{'result'}= 'MTR_RES_PASSED';
...@@ -243,8 +246,10 @@ sub mtr_report_stats ($) { ...@@ -243,8 +246,10 @@ sub mtr_report_stats ($) {
if ( $::opt_timer ) if ( $::opt_timer )
{ {
print use English;
"Spent $::glob_tot_real_time seconds actually executing testcases\n"
mtr_report("Spent", sprintf("%.3f", $tot_real_time),"of",
time - $BASETIME, "seconds executing testcases");
} }
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
......
...@@ -307,7 +307,6 @@ our @data_dir_lst; ...@@ -307,7 +307,6 @@ our @data_dir_lst;
our $used_binlog_format; our $used_binlog_format;
our $used_default_engine; our $used_default_engine;
our $debug_compiled_binaries; our $debug_compiled_binaries;
our $glob_tot_real_time= 0;
our %mysqld_variables; our %mysqld_variables;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment