mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
Automatic merge with main tree
Fixed that mysql-test-run --skip-from starts from the given test mysql-test/lib/mtr_cases.pl: Moved testing of $opt_start_from to mysql-test-run.pl because tests are now run per suite and the old way would rerun not wanted tests mysql-test/mysql-test-run.pl: Fixed that mysql-test-run --skip-from starts from the given test
This commit is contained in:
@@ -3391,6 +3391,24 @@ sub run_testcase_check_skip_test($)
|
||||
{
|
||||
my ($tinfo)= @_;
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Skip some tests silently
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
if ( $::opt_start_from )
|
||||
{
|
||||
if ($tinfo->{'name'} eq $::opt_start_from )
|
||||
{
|
||||
## Found parting test. Run this test and all tests after this one
|
||||
$::opt_start_from= "";
|
||||
}
|
||||
else
|
||||
{
|
||||
$tinfo->{'result'}= 'MTR_RES_SKIPPED';
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# If marked to skip, just print out and return.
|
||||
# Note that a test case not marked as 'skip' can still be
|
||||
|
Reference in New Issue
Block a user