diff options
author | unknown <msvensson@pilot.(none)> | 2007-08-03 12:50:36 +0200 |
---|---|---|
committer | unknown <msvensson@pilot.(none)> | 2007-08-03 12:50:36 +0200 |
commit | b301145f14ca67bdbb0001bd48d6a78de1a86cb0 (patch) | |
tree | dc8cad1920e05ee0d9e1caa2330d0fd246e6e8a9 /mysql-test/lib/mtr_report.pl | |
parent | 6f88aa45dbc129751890421b13e8c4e13b8bd888 (diff) | |
parent | 78a3a625cf949eea90141f4d0cc693bc77ce9aef (diff) | |
download | mariadb-git-b301145f14ca67bdbb0001bd48d6a78de1a86cb0.tar.gz |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/show_check.test:
Auto merged
Diffstat (limited to 'mysql-test/lib/mtr_report.pl')
-rw-r--r-- | mysql-test/lib/mtr_report.pl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index fa38e8507f8..293e8f0b925 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -38,6 +38,9 @@ sub mtr_child_error (@); sub mtr_debug (@); sub mtr_verbose (@); +my $tot_real_time= 0; + + ############################################################################## # @@ -127,7 +130,7 @@ sub mtr_report_test_passed ($) { if ( $::opt_timer and -f "$::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; } $tinfo->{'result'}= 'MTR_RES_PASSED'; @@ -228,8 +231,10 @@ sub mtr_report_stats ($) { if ( $::opt_timer ) { - print - "Spent $::glob_tot_real_time seconds actually executing testcases\n" + use English; + + mtr_report("Spent", sprintf("%.3f", $tot_real_time),"of", + time - $BASETIME, "seconds executing testcases"); } # ---------------------------------------------------------------------- |