mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug #45256 Enable 'auto' for mtr --parallel

Browse source 
Let the user specify 'auto' for parallel value
Also set --parallel=auto in default.push so we can get this tested.
This commit is contained in:
Bjorn Munch 2009-06-03 12:46:04 +02:00
parent ad365a5c07
commit 92773bfc11
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mysql-test/collections/default.push
View file

@ -1,5 +1,5 @@
perl mysql-test-run.pl --timer --force --parallel=2 --comment=n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental
perl mysql-test-run.pl --timer --force --parallel=2 --comment=ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental
perl mysql-test-run.pl --timer --force --parallel=2 --comment=embedded --embedded --experimental=collections/default.experimental perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded --embedded --experimental=collections/default.experimental
perl mysql-test-run.pl --timer --force --parallel=2 --comment=rpl_binlog_row --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_row --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental
perl mysql-test-run.pl --timer --force --parallel=2 --comment=funcs_1 --suite=funcs_1 --experimental=collections/default.experimental perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1 --suite=funcs_1 --experimental=collections/default.experimental

9
mysql-test/mysql-test-run.pl
View file

@ -313,7 +313,7 @@ sub main {
####################################################################### #######################################################################
my $num_tests= @$tests; my $num_tests= @$tests;
if ( not defined $opt_parallel ) { if ( $opt_parallel eq "auto" ) {
# Try to find a suitable value for number of workers # Try to find a suitable value for number of workers
my $sys_info= My::SysInfo->new(); my $sys_info= My::SysInfo->new();
@ -795,7 +795,7 @@ sub command_line_setup {
'vs-config' => \$opt_vs_config, 'vs-config' => \$opt_vs_config,
# Max number of parallel threads to use # Max number of parallel threads to use
'parallel=i' => \$opt_parallel, 'parallel=s' => \$opt_parallel,
# Config file to use as template for all tests # Config file to use as template for all tests
'defaults-file=s' => \&collect_option, 'defaults-file=s' => \&collect_option,
@ -1135,9 +1135,9 @@ sub command_line_setup {
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Check parallel value # Check parallel value
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
if ($opt_parallel < 1) if ($opt_parallel ne "auto" && $opt_parallel < 1)
{ {
mtr_error("0 or negative parallel value makes no sense, use positive number"); mtr_error("0 or negative parallel value makes no sense, use 'auto' or positive number");
} }
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
@ -5202,6 +5202,7 @@ Misc options
fast Run as fast as possible, dont't wait for servers fast Run as fast as possible, dont't wait for servers
to shutdown etc. to shutdown etc.
parallel=N Run tests in N parallel threads (default=1) parallel=N Run tests in N parallel threads (default=1)
Use parallel=auto for auto-setting of N
repeat=N Run each test N number of times repeat=N Run each test N number of times
retry=N Retry tests that fail N times, limit number of failures retry=N Retry tests that fail N times, limit number of failures
to $opt_retry_failure to $opt_retry_failure