database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Move opt_timer to mtr_report.pm

Browse Source
This commit is contained in:
msvensson@pilot.mysql.com
2008-05-04 21:40:40 +02:00
parent b9a810dd25
commit ec03ad0591
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mysql-test/lib/mtr_report.pm
View File

@ -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)

11
mysql-test/mysql-test-run.pl
View File

@ -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 )
{