[Commits] Rev 3129: remove few hard-coded checks from mtr in http://bazaar.launchpad.net/~maria-captains/maria/5.1/

serg at askmonty.org serg at askmonty.org
Tue Jan 24 16:08:47 EET 2012


At http://bazaar.launchpad.net/~maria-captains/maria/5.1/

------------------------------------------------------------
revno: 3129
revision-id: sergii at pisem.net-20120124140839-iziwgt30gaalsiw9
parent: sergii at pisem.net-20120124125357-b3o68crdtg2w3fzj
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.1
timestamp: Tue 2012-01-24 15:08:39 +0100
message:
  remove few hard-coded checks from mtr
-------------- next part --------------
=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2012-01-24 12:53:57 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2012-01-24 14:08:39 +0000
@@ -979,37 +979,6 @@ 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;
-    }
-  }
-
-  if ( $tinfo->{'not_valgrind'} )
-  {
-    if ( $::opt_valgrind_mysqld )
-    {
-      $tinfo->{'skip'}= 1;
-      $tinfo->{'comment'}= "Not compatible with Valgrind testing";
-      return $tinfo;
-    }
-  }
-
-  if ( $tinfo->{'need_ssl'} )
-  {
-    # This is a test that needs ssl
-    if ( ! $::opt_ssl_supported ) {
-      # SSL is not supported, skip it
-      $tinfo->{'skip'}= 1;
-      $tinfo->{'comment'}= "No SSL support";
-      return $tinfo;
-    }
-  }
-
   # ----------------------------------------------------------------------
   # Find config file to use if not already selected in <testname>.opt file
   # ----------------------------------------------------------------------
@@ -1039,16 +1008,6 @@ sub collect_one_test_case {
     $tinfo->{template_path}= $config;
   }
 
-  if ( $tinfo->{'example_plugin_test'} )
-  {
-    if ( !$ENV{'HA_EXAMPLE_SO'} )
-    {
-      $tinfo->{'skip'}= 1;
-      $tinfo->{'comment'}= "Test requires the 'example' plugin";
-      return $tinfo;
-    }
-  }
-
   if (not ref $::suites{$tinfo->{suite}})
   {
     $tinfo->{'skip'}= 1;
@@ -1070,16 +1029,10 @@ sub collect_one_test_case {
 
 
 my $tags_map= {'big_test' => ['big_test', 1],
-               'have_debug' => ['need_debug', 1],
                'have_ndb' => ['ndb_test', 1],
                'have_multi_ndb' => ['ndb_test', 1],
                'master-slave' => ['rpl_test', 1],
                'ndb_master-slave' => ['rpl_test', 1, 'ndb_test', 1],
-               'not_embedded' => ['not_embedded', 1],
-               'not_valgrind' => ['not_valgrind', 1],
-               'have_example_plugin' => ['example_plugin_test', 1],
-               'have_oqgraph_engine' => ['oqgraph_test', 1],
-               'have_ssl' => ['need_ssl', 1],
                'long_test' => ['long_test', 1],
 };
 my $tags_regex_string= join('|', keys %$tags_map);

=== modified file 'mysql-test/suite/rpl/t/rpl_killed_ddl-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_killed_ddl-master.opt	2009-04-08 23:42:51 +0000
+++ b/mysql-test/suite/rpl/t/rpl_killed_ddl-master.opt	2012-01-24 14:08:39 +0000
@@ -1 +1 @@
---debug=d,debug_lock_before_query_log_event
+--loose-debug=d,debug_lock_before_query_log_event

=== modified file 'mysql-test/t/ssl_cipher-master.opt'
--- a/mysql-test/t/ssl_cipher-master.opt	2011-03-11 10:46:34 +0000
+++ b/mysql-test/t/ssl_cipher-master.opt	2012-01-24 14:08:39 +0000
@@ -1 +1 @@
---ssl-cipher=AES128-SHA
+--loose-ssl-cipher=AES128-SHA



More information about the commits mailing list