mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Only uise one file for current test
Don't retry by default Fixes for --embedded mysql-test/lib/My/ConfigFactory.pm: Don't copy log-error to [embedded] section mysql-test/lib/mtr_cases.pm: Auto skip all not_embedded when running with embedded mysql-test/mysql-test-run.pl: Only uise one file for current test Don't retry by default mysql-test/t/csv.test: Change master-data -> mysqld.1/data mysql-test/t/innodb.test: Change master-data -> mysqld.1/data mysql-test/t/ps_1general.test: Change master-data -> mysqld.1/data mysql-test/t/trigger.test: Change master-data -> mysqld.1/data
This commit is contained in:
@ -891,6 +891,16 @@ sub collect_one_test_case {
|
||||
}
|
||||
}
|
||||
|
||||
if ( $::opt_embedded_server )
|
||||
{
|
||||
if ( $tinfo->{'not_embedded'} )
|
||||
{
|
||||
$tinfo->{'skip'}= 1;
|
||||
$tinfo->{'comment'}= "Not run for embedded server";
|
||||
return $tinfo;
|
||||
}
|
||||
}
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Find config file to use if not already selected in <testname>.opt file
|
||||
# ----------------------------------------------------------------------
|
||||
@ -960,6 +970,7 @@ my @tags=
|
||||
["include/master-slave.inc", "rpl_test", 1],
|
||||
["include/ndb_master-slave.inc", "rpl_test", 1],
|
||||
["include/federated.inc", "federated_test", 1],
|
||||
["include/not_embedded.inc", "not_embedded", 1],
|
||||
);
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user