Commit 5a39b93e authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools 

into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
BitKeeper/deleted/.del-mtr_stress.pl:
  Delete: mysql-test/lib/mtr_stress.pl
mysql-test/include/have_ndb.inc:
  SCCS merged
parents 9cf998e6 e5d14529

client/mysqltest.c

+1 −1
Original line number Diff line number Diff line
@@ -802,7 +802,7 @@ void abort_not_supported_test(const char *fmt, ...) 


void abort_not_in_this_version()

{

  die("Not available in mysqltest for MySQL %s", VERSION);

  die("Not available in this version of mysqltest");

}

mysql-test/lib/mtr_cases.pl

+160 −47
Original line number Diff line number Diff line
@@ -5,11 +5,14 @@ 
# same name.



use File::Basename;

use IO::File();

use strict;



sub collect_test_cases ($);

sub collect_one_test_case ($$$$$$$);



sub mtr_options_from_test_file($$);



##############################################################################

#

#  Collect information about test cases we are to run
@@ -37,6 +40,23 @@ sub collect_test_cases ($) { 


  opendir(TESTDIR, $testdir) or mtr_error("Can't open dir \"$testdir\": $!");



  # ----------------------------------------------------------------------

  # Disable some tests listed in disabled.def

  # ----------------------------------------------------------------------

  my %disabled;

  if ( open(DISABLED, "$testdir/disabled.def" ) )

  {

    while ( <DISABLED> )

      {

        chomp;

        if ( /^\s*(\S+)\s*:\s*(.*?)\s*$/ )

          {

            $disabled{$1}= $2;

          }

      }

    close DISABLED;

  }



  if ( @::opt_cases )

  {

    foreach my $tname ( @::opt_cases ) { # Run in specified order, no sort
@@ -100,30 +120,13 @@ sub collect_test_cases ($) { 
        }

      }



      collect_one_test_case($testdir,$resdir,$tname,$elem,$cases,{},

      collect_one_test_case($testdir,$resdir,$tname,$elem,$cases,\%disabled,

        $component_id);

    }

    closedir TESTDIR;

  }

  else

  {

    # ----------------------------------------------------------------------

    # Disable some tests listed in disabled.def

    # ----------------------------------------------------------------------

    my %disabled;

    if ( ! $::opt_ignore_disabled_def and open(DISABLED, "$testdir/disabled.def" ) )

    {

      while ( <DISABLED> )

      {

        chomp;

        if ( /^\s*([^\s:]+)\s*:\s*(.*?)\s*$/ )

        {

          $disabled{$1}= $2;

        }

      }

      close DISABLED;

    }



    foreach my $elem ( sort readdir(TESTDIR) ) {

      my $component_id= undef;

      my $tname= undef;
@@ -247,14 +250,12 @@ sub collect_one_test_case($$$$$$$) { 
    if ( $::opt_skip_rpl )

    {

      $tinfo->{'skip'}= 1;

      $tinfo->{'comment'}= "No replication tests(--skip-rpl)";

      return;

    }



    $tinfo->{'slave_num'}= 1;           # Default, use one slave



    # FIXME currently we always restart slaves

    $tinfo->{'slave_restart'}= 1;



    if ( $tname eq 'rpl_failsafe' or $tname eq 'rpl_chain_temp_table' )

    {

      # $tinfo->{'slave_num'}= 3;         # Not 3 ? Check old code, strange
@@ -263,32 +264,40 @@ sub collect_one_test_case($$$$$$$) { 


  if ( defined mtr_match_prefix($tname,"federated") )

  {

    $tinfo->{'slave_num'}= 1;           # Default, use one slave



    # FIXME currently we always restart slaves

    $tinfo->{'slave_restart'}= 1;

    # Default, federated uses the first slave as it's federated database

    $tinfo->{'slave_num'}= 1;

  }



  # Cluster is needed by test case if testname contains ndb

  if ( defined mtr_match_substring($tname,"ndb") )

  if ( $::opt_with_ndbcluster or defined mtr_match_substring($tname,"ndb") )

  {

    # This is an ndb test or all tests should be run with ndb cluster started

    $tinfo->{'ndb_test'}= 1;

    if ( $::opt_skip_ndbcluster )

    {

      # Skip all ndb tests

      # All ndb test's should be skipped

      $tinfo->{'skip'}= 1;

      $tinfo->{'comment'}= "No ndbcluster test(--skip-ndbcluster)";

      return;

    }

    if ( ! $::opt_with_ndbcluster )

    if ( ! $::opt_ndbcluster_supported )

    {

      # Ndb is not supported, skip them

      $tinfo->{'skip'}= 1;

      $tinfo->{'comment'}= "No ndbcluster support";

      return;

    }

  }

  else

  {

    # This is not a ndb test

    $tinfo->{'ndb_test'}= 0;

    if ( $::opt_with_ndbcluster_only )

    {

      # Only the ndb test should be run, all other should be skipped

      $tinfo->{'skip'}= 1;

      $tinfo->{'comment'}= "Only ndbcluster tests(--with-ndbcluster-only)";

      return;

    }

  }



  # FIXME what about embedded_server + ndbcluster, skip ?!
@@ -380,6 +389,8 @@ sub collect_one_test_case($$$$$$$) { 
    if ( $::glob_win32_perl )

    {

      $tinfo->{'skip'}= 1;

      $tinfo->{'comment'}= "No tests with sh scripts on Windows";

      return;

    }

    else

    {
@@ -393,6 +404,8 @@ sub collect_one_test_case($$$$$$$) { 
    if ( $::glob_win32_perl )

    {

      $tinfo->{'skip'}= 1;

      $tinfo->{'comment'}= "No tests with sh scripts on Windows";

      return;

    }

    else

    {
@@ -411,18 +424,34 @@ sub collect_one_test_case($$$$$$$) { 
  }



  # FIXME why this late?

  my $marked_as_disabled= 0;

  if ( $disabled->{$tname} )

  {

    $tinfo->{'skip'}= 1;

    $tinfo->{'disable'}= 1;   # Sub type of 'skip'

    $tinfo->{'comment'}= $disabled->{$tname} if $disabled->{$tname};

    $marked_as_disabled= 1;

    $tinfo->{'comment'}= $disabled->{$tname};

  }



  if ( -f $disabled_file )

  {

    $marked_as_disabled= 1;

    $tinfo->{'comment'}= mtr_fromfile($disabled_file);

  }



  # If test was marked as disabled, either opt_enable_disabled is off and then

  # we skip this test, or it is on and then we run this test but warn



  if ( $marked_as_disabled )

  {

    if ( $::opt_enable_disabled )

    {

      $tinfo->{'dont_skip_though_disabled'}= 1;

    }

    else

    {

      $tinfo->{'skip'}= 1;

      $tinfo->{'disable'}= 1;   # Sub type of 'skip'

    $tinfo->{'comment'}= mtr_fromfile($disabled_file);

      return;

    }

  }



  if ( $component_id eq 'im' )
@@ -430,26 +459,60 @@ sub collect_one_test_case($$$$$$$) { 
    if ( $::glob_use_embedded_server )

    {

      $tinfo->{'skip'}= 1;

      

      mtr_report(

        "Instance Manager tests are not available in embedded mode. " .

        "Test case '$tname' is skipped.");

      $tinfo->{'comment'}= "No IM with embedded server";

      return;

    }

    elsif ( $::opt_ps_protocol )

    {

      $tinfo->{'skip'}= 1;

      

      mtr_report(

        "Instance Manager tests are not run with --ps-protocol. " .

        "Test case '$tname' is skipped.");

      $tinfo->{'comment'}= "No IM with --ps-protocol";

      return;

    }

    elsif ( $::opt_skip_im )

    {

      $tinfo->{'skip'}= 1;

      $tinfo->{'comment'}= "No IM tests(--skip-im)";

      return;

    }

  }

  else

  {

    mtr_options_from_test_file($tinfo,"$testdir/${tname}.test");



      mtr_report(

        "Instance Manager executable is unavailable." .

        "Test case '$tname' is skipped.");

    if ( $tinfo->{'big_test'} and ! $::opt_big_test )

    {

      $tinfo->{'skip'}= 1;

      $tinfo->{'comment'}= "Test need 'big-test' option";

      return;

    }



    if ( $tinfo->{'ndb_extra'} and ! $::opt_ndb_extra_test )

    {

      $tinfo->{'skip'}= 1;

      $tinfo->{'comment'}= "Test need 'ndb_extra' option";

      return;

    }



    if ( $tinfo->{'require_manager'} )

    {

      $tinfo->{'skip'}= 1;

      $tinfo->{'comment'}= "Test need the _old_ manager(to be removed)";

      return;

    }



    if ( defined $tinfo->{'binlog_format'} and

	 ! ( $tinfo->{'binlog_format'} eq $::used_binlog_format ) )

    {

      $tinfo->{'skip'}= 1;

      $tinfo->{'comment'}= "Not running with binlog format '$tinfo->{'binlog_format'}'";

      return;

    }



    if ( $tinfo->{'need_debug'} && ! $::debug_compiled_binaries )

    {

      $tinfo->{'skip'}= 1;

      $tinfo->{'comment'}= "Test need debug binaries";

      return;

    }

  }
@@ -459,8 +522,58 @@ sub collect_one_test_case($$$$$$$) { 
       ( $tinfo->{'master_restart'} or $tinfo->{'slave_restart'} ) )

  {

    $tinfo->{'skip'}= 1;

    $tinfo->{'comment'}= "Can't restart a running server";

    return;

  }



}





# List of tags in the .test files that if found should set

# the specified value in "tinfo"

our @tags=

(

 ["include/have_innodb.inc", "innodb_test", 1],

 ["include/have_binlog_format_row.inc", "binlog_format", "row"],

 ["include/have_binlog_format_statement.inc", "binlog_format", "stmt"],

 ["include/big_test.inc", "big_test", 1],

 ["include/have_debug.inc", "need_debug", 1],

 ["include/have_ndb_extra.inc", "ndb_extra", 1],

 ["require_manager", "require_manager", 1],

);



sub mtr_options_from_test_file($$) {

  my $tinfo= shift;

  my $file= shift;

  #mtr_verbose("$file");

  my $F= IO::File->new($file) or mtr_error("can't open file \"$file\": $!");



  while ( my $line= <$F> )

  {

    next if ( $line !~ /^--/ );



    # Match this line against tag in "tags" array

    foreach my $tag (@tags)

    {

      if ( index($line, $tag->[0]) >= 0 )

      {

	# Tag matched, assign value to "tinfo"

	$tinfo->{"$tag->[1]"}= $tag->[2];

      }

    }



    # If test sources another file, open it as well

    if ( $line =~ /^\-\-([[:space:]]*)source(.*)$/ )

    {

      my $value= $2;

      $value =~ s/^\s+//;  # Remove leading space

      $value =~ s/[[:space:]]+$//;  # Remove ending space



      my $sourced_file= "$::glob_mysql_test_dir/$value";

      mtr_options_from_test_file($tinfo, $sourced_file);

    }



  }

}



1;

mysql-test/lib/mtr_im.pl

0 → 100644
+761 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/lib/mtr_io.pl

+28 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ sub mtr_get_opts_from_file ($); 
sub mtr_fromfile ($);

sub mtr_tofile ($@);

sub mtr_tonewfile($@);

sub mtr_lastlinefromfile($);

sub mtr_appendfile_to_file ($$);



##############################################################################

#
@@ -139,6 +141,20 @@ sub mtr_fromfile ($) { 
  return $text;

}



sub mtr_lastlinefromfile ($) {

  my $file=  shift;

  my $text;



  open(FILE,"<",$file) or mtr_error("can't open file \"$file\": $!");

  while (my $line= <FILE>)

  {

    $text= $line;

  }

  close FILE;

  return $text;

}





sub mtr_tofile ($@) {

  my $file=  shift;
@@ -155,5 +171,17 @@ sub mtr_tonewfile ($@) { 
  close FILE;

}



sub mtr_appendfile_to_file ($$) {

  my $from_file=  shift;

  my $to_file=  shift;



  open(TOFILE,">>",$to_file) or mtr_error("can't open file \"$to_file\": $!");

  open(FROMFILE,">>",$from_file)

    or mtr_error("can't open file \"$from_file\": $!");

  print TOFILE while (<FROMFILE>);

  close FROMFILE;

  close TOFILE;

}





1;

mysql-test/lib/mtr_misc.pl

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ sub mtr_copy_dir($$) { 
  my $from_dir= shift;

  my $to_dir= shift;



#  mtr_verbose("Copying from $from_dir to $to_dir");



  mkpath("$to_dir");

  opendir(DIR, "$from_dir")

    or mtr_error("Can't find $from_dir$!");