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

WL#4189 Use only one worker for --record

Browse Source
This commit is contained in:
Magnus Svensson
2008-11-10 16:10:49 +01:00
parent 4b739dcf45
commit 5fd1c9768a
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,6 +196,8 @@ my $opt_max_save_core= $ENV{MTR_MAX_SAVE_CORE} || 5;
my $opt_max_save_datadir= $ENV{MTR_MAX_SAVE_DATADIR} || 20; my $opt_max_save_datadir= $ENV{MTR_MAX_SAVE_DATADIR} || 20;
my $opt_max_test_fail= $ENV{MTR_MAX_TEST_FAIL} || 10; my $opt_max_test_fail= $ENV{MTR_MAX_TEST_FAIL} || 10;
my $opt_parallel= $ENV{MTR_PARALLEL};
select(STDOUT); select(STDOUT);
$| = 1; # Automatically flush STDOUT $| = 1; # Automatically flush STDOUT
@ -211,10 +213,6 @@ sub main {
# directly before it executes them, like "make test-force-pl" in RPM builds. # directly before it executes them, like "make test-force-pl" in RPM builds.
mtr_report("Logging: $0 ", join(" ", @ARGV)); mtr_report("Logging: $0 ", join(" ", @ARGV));
my $opt_parallel= $ENV{MTR_PARALLEL};
Getopt::Long::Configure("pass_through");
GetOptions('parallel=i' => \$opt_parallel) or usage(0, "Can't read options");
command_line_setup(); command_line_setup();
if ( $opt_gcov ) { if ( $opt_gcov ) {
@ -712,6 +710,7 @@ sub set_vardir {
} }
sub command_line_setup { sub command_line_setup {
my $opt_comment; my $opt_comment;
my $opt_usage; my $opt_usage;
@ -731,6 +730,9 @@ sub command_line_setup {
'compress' => \$opt_compress, 'compress' => \$opt_compress,
'vs-config' => \$opt_vs_config, 'vs-config' => \$opt_vs_config,
# Max number of parallel threads to use
'parallel=i' => \$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,
# Extra config file to append to all generated configs # Extra config file to append to all generated configs
@ -1043,6 +1045,11 @@ sub command_line_setup {
mtr_error("Will not run in record mode without a specific test case"); mtr_error("Will not run in record mode without a specific test case");
} }
if ( $opt_record ) {
# Use only one worker with --record
$opt_parallel= 1;
}
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Embedded server flag # Embedded server flag
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------