5.5 merge

mysql-test/mysql-test-run.pl

@@ -162,32 +162,32 @@ 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
-    multi_source
-    optimizer_unfixed_bugs
-    oqgraph
-    parts
-    percona
-    perfschema
-    plugins
-    roles
-    rpl
-    sphinx
-    sys_vars
-    unit
-    vcol
-  ));
+my @DEFAULT_SUITES= qw(
+    main-
+    archive-
+    binlog-
+    csv-
+    federated-
+    funcs_1-
+    funcs_2-
+    handler-
+    heap-
+    innodb-
+    maria-
+    multi_source-
+    optimizer_unfixed_bugs-
+    oqgraph-
+    parts-
+    percona-
+    perfschema-
+    plugins-
+    roles-
+    rpl-
+    sphinx-
+    sys_vars-
+    unit-
+    vcol-
+  );
 my $opt_suites;
 
 our $opt_verbose= 0;  # Verbose output, enable with --verbose
@@ -378,8 +378,6 @@ sub main {
   # directly before it executes them, like "make test-force-pl" in RPM builds.
   mtr_report("Logging: $0 ", join(" ", @ARGV));
 
-  $DEFAULT_SUITES.=",sequence,sql_discovery,query_response_time" if $source_dist;
-
   command_line_setup();
 
   # --help will not reach here, so now it's safe to assume we have binaries
@@ -390,11 +388,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();
@@ -403,6 +396,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;
 
@@ -2950,7 +2948,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;
 }
 
@@ -6319,6 +6317,8 @@ sub usage ($) {
     exit;      
   }
 
+  local $"= ','; # for @DEFAULT_SUITES below
+
   print <<HERE;
 
 $0 [ OPTIONS ] [ TESTCASE ]
@@ -6386,7 +6386,7 @@ Options to control what test suites or cases to run
   suite[s]=NAME1,..,NAMEN
                         Collect tests in suites from the comma separated
                         list of suite names.
-                        The default is: "$DEFAULT_SUITES"
+                        The default is: "@DEFAULT_SUITES"
   skip-rpl              Skip the replication test cases.
   big-test              Also run tests marked as "big". Repeat this option
                         twice to run only "big" tests.