database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-13 02:22:51 +03:00
Code Activity

Increase start timeout when running parallell

Browse Source 
Fix comments
This commit is contained in:
msvensson@pilot.mysql.com
2008-04-27 16:16:50 +02:00
parent 80f0db9f9e
commit 1715884752
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,10 +151,10 @@ my $opt_mark_progress;
my $opt_sleep; my $opt_sleep;
my $opt_testcase_timeout= 15; # 15 minutes my $opt_testcase_timeout= 15; # minutes
my $opt_suite_timeout = 180; # 3 hours my $opt_suite_timeout = 180; # minutes
my $opt_shutdown_timeout= 10; # 10 seconds my $opt_shutdown_timeout= 10; # seconds
my $opt_start_timeout = 30; # 30 seconds my $opt_start_timeout = 30; # seconds
my $opt_start; my $opt_start;
my $opt_start_dirty; my $opt_start_dirty;
@ -162,7 +162,7 @@ my $opt_repeat= 1;
my $opt_retry= 3; my $opt_retry= 3;
my $opt_retry_failure= 2; my $opt_retry_failure= 2;
my $opt_parallel= 4; my $opt_parallel;
my $opt_strace_client; my $opt_strace_client;
@ -217,6 +217,10 @@ sub main {
Getopt::Long::Configure("pass_through"); Getopt::Long::Configure("pass_through");
GetOptions('parallel=i' => \$opt_parallel) or usage("Can't read options"); GetOptions('parallel=i' => \$opt_parallel) or usage("Can't read options");
if ( not defined $opt_parallel ){
$opt_parallel= 4; # Default
}
# Create server socket on any free port # Create server socket on any free port
my $server = new IO::Socket::INET my $server = new IO::Socket::INET
( (
@ -985,6 +989,11 @@ sub command_line_setup {
} }
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Set timeout values
# --------------------------------------------------------------------------
$opt_start_timeout*= $opt_parallel;
#
# Check valgrind arguments # Check valgrind arguments
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
if ( $opt_valgrind or $opt_valgrind_path or @valgrind_args) if ( $opt_valgrind or $opt_valgrind_path or @valgrind_args)