From c2839e2cf2617005d06d9bb14b98d70e2d905225 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 27 Nov 2013 21:58:36 +0100 Subject: [PATCH] mysql-test: allow suite.pm add its suite to the default list. run tokudb suites by default. mark big and slow tests tokudb.change_column_all_1000_1 and tokudb.change_column_all_1000_10 test as --big --- mysql-test/lib/My/Suite.pm | 1 + mysql-test/lib/mtr_cases.pm | 26 +++++++- mysql-test/mysql-test-run.pl | 64 ++++++++++--------- storage/tokudb/mysql-test/tokudb/suite.pm | 3 + .../tokudb/t/change_column_all_1000_1.test | 1 + .../tokudb/t/change_column_all_1000_10.test | 1 + .../mysql-test/tokudb_add_index/suite.pm | 3 + .../mysql-test/tokudb_alter_table/suite.pm | 3 + .../tokudb/mysql-test/tokudb_bugs/suite.pm | 3 + .../tokudb/mysql-test/tokudb_mariadb/suite.pm | 3 + 10 files changed, 75 insertions(+), 33 deletions(-) diff --git a/mysql-test/lib/My/Suite.pm b/mysql-test/lib/My/Suite.pm index b5870ea1e16..a603008fabe 100644 --- a/mysql-test/lib/My/Suite.pm +++ b/mysql-test/lib/My/Suite.pm @@ -3,6 +3,7 @@ package My::Suite; +sub is_default { 0 } sub config_files { () } sub servers { () } sub skip_combinations { () } diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 1327afdb426..f1960f6d9de 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -23,7 +23,7 @@ package mtr_cases; use strict; use base qw(Exporter); -our @EXPORT= qw(collect_option collect_test_cases); +our @EXPORT= qw(collect_option collect_test_cases collect_default_suites); use Carp; @@ -315,11 +315,33 @@ sub parse_disabled { } } +# +# load suite.pm files from plugin suites +# collect the list of default plugin suites. +# +sub collect_default_suites(@) +{ + my @dirs = my_find_dir(dirname($::glob_mysql_test_dir), + ['storage/*/mysql-test/*', 'plugin/*/mysql-test/*'], + [], NOT_REQUIRED); + for my $d (@dirs) { + next unless -f "$d/suite.pm"; + my $sname= basename($d); + # ignore overlays here, otherwise we'd need accurate + # duplicate detection with overlay support for the default suite list + next if $sname eq 'main' or -d "$::glob_mysql_test_dir/suite/$sname"; + my $s = load_suite_object($sname, $d); + push @_, $sname if $s->is_default(); + } + return @_; +} + + # # processes one user-specified suite name. # it could contain wildcards, e.g engines/* # -sub collect_suite_name +sub collect_suite_name($$) { my $suitename= shift; # Test suite name my $opt_cases= shift; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index a2c0ce8fb49..d909391f033 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -162,30 +162,30 @@ my $path_config_file; # The generated config file, var/my.cnf # executables will be used by the test suite. our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; -my $DEFAULT_SUITES= join(',', map { "$_-" } qw( - main - archive - binlog - csv - federated - funcs_1 - funcs_2 - handler - heap - innodb - maria - optimizer_unfixed_bugs - oqgraph - parts - percona - perfschema - plugins - rpl - sphinx - sys_vars - unit - vcol - )); +my @DEFAULT_SUITES= qw( + main- + archive- + binlog- + csv- + federated- + funcs_1- + funcs_2- + handler- + heap- + innodb- + maria- + optimizer_unfixed_bugs- + oqgraph- + parts- + percona- + perfschema- + plugins- + rpl- + sphinx- + sys_vars- + unit- + vcol- + ); my $opt_suites; our $opt_verbose= 0; # Verbose output, enable with --verbose @@ -384,11 +384,6 @@ sub main { } - if (!$opt_suites) { - $opt_suites= $DEFAULT_SUITES; - } - mtr_report("Using suites: $opt_suites") unless @opt_cases; - print "vardir: $opt_vardir\n"; initialize_servers(); init_timers(); @@ -397,6 +392,11 @@ sub main { 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 $opt_debug_server= 1 if $opt_debug || $opt_debug_common; @@ -2940,7 +2940,7 @@ sub check_ndbcluster_support { mtr_report(" - enabling ndbcluster"); $ndbcluster_enabled= 1; # Add MySQL Cluster test suites - $DEFAULT_SUITES.=",ndb,ndb_binlog,rpl_ndb,ndb_rpl,ndb_memcache"; + push @DEFAULT_SUITES, qw(ndb ndb_binlog rpl_ndb ndb_rpl ndb_memcache); return; } @@ -6307,6 +6307,8 @@ sub usage ($) { exit; } + local $"= ','; # for @DEFAULT_SUITES below + print <