1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mtr: move collect_default_suites() after collect_mysqld_features(),

Browse Source 
because some suites may be disabled unless a plugin is available,
and compiled-in plugins are only known after collect_mysqld_features().

Additionally move mysql_install_db() after everything else it's collected -
it's a slow process, better do it after all the information is gathered
(and reported to the user).
This commit is contained in:
Sergei Golubchik 2013-12-22 17:11:31 +01:00
parent 3b7b79a9d1
commit d596ce67c1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -395,11 +395,6 @@ sub main {
executable_setup(); executable_setup();
if (!$opt_suites) {
$opt_suites= join ',', collect_default_suites(@DEFAULT_SUITES);
}
mtr_report("Using suites: $opt_suites") unless @opt_cases;
# --debug[-common] implies we run debug server # --debug[-common] implies we run debug server
$opt_debug_server= 1 if $opt_debug || $opt_debug_common; $opt_debug_server= 1 if $opt_debug || $opt_debug_common;
@ -412,16 +407,22 @@ sub main {
{ {
# Run the mysqld to find out what features are available # Run the mysqld to find out what features are available
collect_mysqld_features(); collect_mysqld_features();
mysql_install_db(default_mysqld(), "$opt_vardir/install.db");
} }
check_ndbcluster_support(); check_ndbcluster_support();
check_ssl_support(); check_ssl_support();
check_debug_support(); check_debug_support();
if (!$opt_suites) {
$opt_suites= join ',', collect_default_suites(@DEFAULT_SUITES);
}
mtr_report("Using suites: $opt_suites") unless @opt_cases;
mtr_report("Collecting tests..."); mtr_report("Collecting tests...");
my $tests= collect_test_cases($opt_reorder, $opt_suites, \@opt_cases, \@opt_skip_test_list); my $tests= collect_test_cases($opt_reorder, $opt_suites, \@opt_cases, \@opt_skip_test_list);
mark_time_used('collect'); mark_time_used('collect');
mysql_install_db(default_mysqld(), "$opt_vardir/install.db") unless using_extern();
if ($opt_dry_run) if ($opt_dry_run)
{ {
for (@$tests) { for (@$tests) {