Commit 3b0b4e61 authored by Sergei Golubchik's avatar Sergei Golubchik

cleanup: remove dead code in mtr

parent c4f01334
...@@ -48,9 +48,7 @@ BEGIN { ...@@ -48,9 +48,7 @@ BEGIN {
"Could not find the lib/ directory \n"; "Could not find the lib/ directory \n";
exit(1); exit(1);
} }
}
BEGIN {
# Check backward compatibility support # Check backward compatibility support
# By setting the environment variable MTR_VERSION # By setting the environment variable MTR_VERSION
# it's possible to use a previous version of # it's possible to use a previous version of
...@@ -338,17 +336,7 @@ my %mysqld_logs; ...@@ -338,17 +336,7 @@ my %mysqld_logs;
my $opt_debug_sync_timeout= 300; # Default timeout for WAIT_FOR actions. my $opt_debug_sync_timeout= 300; # Default timeout for WAIT_FOR actions.
my $warn_seconds = 60; my $warn_seconds = 60;
sub testcase_timeout ($) { sub testcase_timeout ($) { return $opt_testcase_timeout * 60; }
my ($tinfo)= @_;
if (exists $tinfo->{'case-timeout'}) {
# Return test specific timeout if *longer* that the general timeout
my $test_to= $tinfo->{'case-timeout'};
$test_to*= 10 if $opt_valgrind;
return $test_to * 60 if $test_to > $opt_testcase_timeout;
}
return $opt_testcase_timeout * 60;
}
sub check_timeout ($) { return testcase_timeout($_[0]); } sub check_timeout ($) { return testcase_timeout($_[0]); }
our $opt_warnings= 1; our $opt_warnings= 1;
......
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