From ec03ad0591a5849279ac020574ccdac6cbb00e86 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Sun, 4 May 2008 21:40:40 +0200
Subject: [PATCH] Move opt_timer to mtr_report.pm

---
 mysql-test/lib/mtr_report.pm | 28 ++++++++++++++--------------
 mysql-test/mysql-test-run.pl | 11 +++--------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm
index 026d5e9776e..aa7d763629e 100644
--- a/mysql-test/lib/mtr_report.pm
+++ b/mysql-test/lib/mtr_report.pm
@@ -39,7 +39,7 @@ our $timediff= 1;
 our $name;
 our $verbose;
 our $verbose_restart= 0;
-
+our $timer= 1;
 
 sub report_option {
   my ($opt, $value)= @_;
@@ -99,23 +99,22 @@ sub mtr_report_test_skipped ($) {
 }
 
 
-sub mtr_report_test_passed ($$) {
-  my ($tinfo, $use_timer)= @_;
+sub mtr_report_test_passed ($) {
+  my ($tinfo)= @_;
   _mtr_report_test_name($tinfo);
 
-  my $timer=  "";
-  if ( $use_timer and -f "$::opt_vardir/log/timer" )
+  my $timer_str=  "";
+  if ( $timer and -f "$::opt_vardir/log/timer" )
   {
-    $timer= mtr_fromfile("$::opt_vardir/log/timer");
-    $tot_real_time += ($timer/1000);
-    $timer= sprintf "%12s", $timer;
-    $tinfo->{timer}= $timer;
+    $timer_str= mtr_fromfile("$::opt_vardir/log/timer");
+    $tinfo->{timer}= $timer_str;
   }
   # Set as passed unless already set
   if ( not defined $tinfo->{'result'} ){
     $tinfo->{'result'}= 'MTR_RES_PASSED';
   }
-  mtr_report("[ pass ]   $timer");
+
+  mtr_report("[ pass ]   ", sprintf("%12s", $timer_str));
 
   # Show any problems check-testcase found
   if ( defined $tinfo->{'check'} )
@@ -193,8 +192,9 @@ sub mtr_report_test ($) {
   }
   elsif ($tinfo->{'result'} eq 'MTR_RES_PASSED')
   {
-    my $timer=  $tinfo->{timer} || "";
-    mtr_report("[ pass ]   $timer");
+    my $timer_str= $tinfo->{timer} || "";
+    $tot_real_time += ($timer_str/1000);
+    mtr_report("[ pass ]   ", sprintf("%12s", $timer_str));
 
     # Show any problems check-testcase found
     if ( defined $tinfo->{'check'} )
@@ -262,7 +262,7 @@ sub mtr_report_stats ($) {
   # ----------------------------------------------------------------------
   print "The servers were restarted $tot_restarts times\n";
 
-  if ( $::opt_timer )
+  if ( $timer )
   {
     use English;
 
@@ -343,7 +343,7 @@ sub mtr_report_stats ($) {
    }
   else
   {
-    print "All $tot_tests tests were successful.\n";
+    print "All $tot_tests tests were successful.\n\n";
   }
 
   if ( $tot_failed != 0 || $found_problems)
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index e4e51a5bcf0..0fc5ed6aeee 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -168,8 +168,6 @@ my $opt_parallel;
 
 my $opt_strace_client;
 
-our $opt_timer= 1;
-
 our $opt_user;
 
 my $opt_valgrind= 0;
@@ -784,7 +782,7 @@ sub command_line_setup {
 	     'repeat=i'                 => \$opt_repeat,
 	     'retry=i'                  => \$opt_retry,
 	     'retry-failure=i'          => \$opt_retry_failure,
-             'timer!'                   => \$opt_timer,
+             'timer!'                   => \&report_option,
              'user=s'                   => \$opt_user,
              'testcase-timeout=i'       => \$opt_testcase_timeout,
              'suite-timeout=i'          => \$opt_suite_timeout,
@@ -2886,7 +2884,7 @@ sub run_testcase ($) {
 	}
 	else
 	{
-	  mtr_report_test_passed($tinfo, $opt_timer);
+	  mtr_report_test_passed($tinfo);
 	}
 
 	my $check_res;
@@ -3948,10 +3946,7 @@ sub start_mysqltest ($) {
     mtr_add_arg($args, "$exe_mysqltest");
   }
 
-  if ( $opt_timer )
-  {
-    mtr_add_arg($args, "--timer-file=%s/log/timer", $opt_vardir);
-  }
+  mtr_add_arg($args, "--timer-file=%s/log/timer", $opt_vardir);
 
   if ( $opt_compress )
   {