mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge branch '10.4' into 10.5
This commit is contained in:
@ -263,6 +263,7 @@ sub using_extern { return (keys %opts_extern > 0);};
|
||||
|
||||
our $opt_fast= 0;
|
||||
our $opt_force= 0;
|
||||
our $opt_skip_not_found= 0;
|
||||
our $opt_mem= $ENV{'MTR_MEM'};
|
||||
our $opt_clean_vardir= $ENV{'MTR_CLEAN_VARDIR'};
|
||||
|
||||
@ -1069,13 +1070,6 @@ sub run_worker ($) {
|
||||
}
|
||||
|
||||
|
||||
sub ignore_option {
|
||||
my ($opt, $value)= @_;
|
||||
mtr_report("Ignoring option '$opt'");
|
||||
}
|
||||
|
||||
|
||||
|
||||
# Setup any paths that are $opt_vardir related
|
||||
sub set_vardir {
|
||||
($opt_vardir)= @_;
|
||||
@ -1165,6 +1159,7 @@ sub command_line_setup {
|
||||
|
||||
# Control what test suites or cases to run
|
||||
'force+' => \$opt_force,
|
||||
'skip-not-found' => \$opt_skip_not_found,
|
||||
'suite|suites=s' => \$opt_suites,
|
||||
'skip-rpl' => \&collect_option,
|
||||
'skip-test=s' => \&collect_option,
|
||||
@ -1173,8 +1168,6 @@ sub command_line_setup {
|
||||
'big-test+' => \$opt_big_test,
|
||||
'combination=s' => \@opt_combinations,
|
||||
'experimental=s' => \@opt_experimentals,
|
||||
# skip-im is deprecated and silently ignored
|
||||
'skip-im' => \&ignore_option,
|
||||
'staging-run' => \$opt_staging_run,
|
||||
|
||||
# Specify ports
|
||||
@ -5839,6 +5832,8 @@ Options to control what test suites or cases to run
|
||||
the execution will continue from the next test file.
|
||||
When specified twice, execution will continue executing
|
||||
the failed test file from the next command.
|
||||
skip-not-found It is not an error if a test was not found in a
|
||||
specified test suite. Test will be marked as skipped.
|
||||
do-test=PREFIX or REGEX
|
||||
Run test cases which name are prefixed with PREFIX
|
||||
or fulfills REGEX
|
||||
|
Reference in New Issue
Block a user