MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:October 19 2009 1:53pm
Subject:bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2849) Bug#48149
View as plain text  
#At file:///home/bm136801/my/46007-51/ based on revid:bjorn.munch@stripped

 2849 Bjorn Munch	2009-10-19
      Bug #48149 MTR should automatically skip SSL tests if SSL not supported
      Knowledge of no SSL support is not used
      Skip tests the same way e.g. innodb tests are
      Does not refer to have_ssl_communication.inc, 
           will add this when merging to 6.0-codebase

    modified:
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2009-10-08 09:14:42 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2009-10-19 13:51:47 +0000
@@ -1036,6 +1036,17 @@ sub collect_one_test_case {
     }
   }
 
+  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
   # ----------------------------------------------------------------------
@@ -1116,6 +1127,7 @@ my @tags=
  ["include/ndb_master-slave.inc", "ndb_test", 1],
  ["federated.inc", "federated_test", 1],
  ["include/not_embedded.inc", "not_embedded", 1],
+ ["include/have_ssl.inc", "need_ssl", 1],
 );
 
 

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-10-18 11:01:46 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-10-19 13:51:47 +0000
@@ -144,7 +144,7 @@ our @opt_extra_mysqld_opt;
 my $opt_compress;
 my $opt_ssl;
 my $opt_skip_ssl;
-my $opt_ssl_supported;
+our $opt_ssl_supported;
 my $opt_ps_protocol;
 my $opt_sp_protocol;
 my $opt_cursor_protocol;


Attachment: [text/bzr-bundle] bzr/bjorn.munch@sun.com-20091019135147-ymnften5wr98tang.bundle
Thread
bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2849) Bug#48149Bjorn Munch19 Oct
  • Re: bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2849) Bug#48149Libing Song20 Oct
    • Re: bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2849) Bug#48149Bjorn Munch20 Oct