mirror of
https://github.com/MariaDB/server.git
synced 2025-05-28 13:01:41 +03:00
92fc426386
The patch also fixes a race in rpl_stop_slave.test. On machines with lots of CPU and memory, something like `mtr --parallel=10` can speed up the test suite enormously. However, we have a few test cases that run for long (several minutes), and if we are unlucky and happen to schedule those towards the end of the test suite, we end up with most workers idle while waiting for the last slow test to end, significantly delaying the finish of the entire suite. Improve this by marking the offending tests as taking "long", and trying to schedule those tests early. This reduces the time towards the end of the test suite run where some workers are waiting with nothing to do for the remaining workers each to finish their last test. Also, the rpl_stop_slave test had a race which could cause it to take a 300 seconds debug_sync timeout; this is fixed. Testing on a 4-core 8GB machine, this patch speeds up the test suite with around 30% for --parallel=10 (debug build), allowing to run the entire suite in 5 minutes.
1192 lines
31 KiB
Perl
1192 lines
31 KiB
Perl
# -*- cperl -*-
|
|
# Copyright (C) 2005-2006 MySQL AB
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; version 2 of the License.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
# This is a library file used by the Perl version of mysql-test-run,
|
|
# and is part of the translation of the Bourne shell script with the
|
|
# same name.
|
|
|
|
package mtr_cases;
|
|
use strict;
|
|
|
|
use base qw(Exporter);
|
|
our @EXPORT= qw(collect_option collect_test_cases);
|
|
|
|
use mtr_report;
|
|
use mtr_match;
|
|
|
|
# Options used for the collect phase
|
|
our $start_from;
|
|
our $print_testcases;
|
|
our $skip_rpl;
|
|
our $do_test;
|
|
our $skip_test;
|
|
our $skip_combinations;
|
|
our $binlog_format;
|
|
our $enable_disabled;
|
|
our $default_storage_engine;
|
|
our $opt_with_ndbcluster_only;
|
|
our $defaults_file;
|
|
our $quick_collect;
|
|
|
|
sub collect_option {
|
|
my ($opt, $value)= @_;
|
|
|
|
# Evaluate $opt as string to use "Getopt::Long::Callback legacy API"
|
|
my $opt_name = "$opt";
|
|
|
|
# Convert - to _ in option name
|
|
$opt_name =~ s/-/_/g;
|
|
no strict 'refs';
|
|
${$opt_name}= $value;
|
|
}
|
|
|
|
use File::Basename;
|
|
use File::Spec::Functions qw /splitdir/;
|
|
use IO::File();
|
|
use My::Config;
|
|
use My::Platform;
|
|
use My::Test;
|
|
use My::Find;
|
|
|
|
require "mtr_misc.pl";
|
|
|
|
# Precompiled regex's for tests to do or skip
|
|
my $do_test_reg;
|
|
my $skip_test_reg;
|
|
|
|
# If "Quick collect", set to 1 once a test to run has been found.
|
|
my $some_test_found;
|
|
|
|
my $default_suite_object = do 'My/Suite.pm';
|
|
|
|
sub init_pattern {
|
|
my ($from, $what)= @_;
|
|
return undef unless defined $from;
|
|
if ( $from =~ /^[a-z0-9\.]*$/ ) {
|
|
# Does not contain any regex (except . that we allow as
|
|
# separator betwen suite and testname), make the pattern match
|
|
# beginning of string
|
|
$from= "^$from";
|
|
mtr_verbose("$what='$from'");
|
|
}
|
|
# Check that pattern is a valid regex
|
|
eval { "" =~/$from/; 1 } or
|
|
mtr_error("Invalid regex '$from' passed to $what\nPerl says: $@");
|
|
return $from;
|
|
}
|
|
|
|
|
|
sub testcase_sort_order {
|
|
my ($a, $b, $sort_criteria)= @_;
|
|
my $a_sort_criteria= $sort_criteria->{$a->fullname()};
|
|
my $b_sort_criteria= $sort_criteria->{$b->fullname()};
|
|
my $res= $a_sort_criteria cmp $b_sort_criteria;
|
|
return $res if $res;
|
|
# Run slow tests first, trying to avoid getting stuck at the end
|
|
# with a slow test in one worker and the other workers idle.
|
|
return -1 if $a->{'long_test'} && !$b->{'long_test'};
|
|
return 1 if !$a->{'long_test'} && $b->{'long_test'};
|
|
|
|
return $a->fullname() cmp $b->fullname();
|
|
}
|
|
|
|
##############################################################################
|
|
#
|
|
# Collect information about test cases to be run
|
|
#
|
|
##############################################################################
|
|
|
|
sub collect_test_cases ($$$) {
|
|
my $opt_reorder= shift; # True if we're reordering tests
|
|
my $suites= shift; # Semicolon separated list of test suites
|
|
my $opt_cases= shift;
|
|
my $cases= []; # Array of hash(one hash for each testcase)
|
|
|
|
$do_test_reg= init_pattern($do_test, "--do-test");
|
|
$skip_test_reg= init_pattern($skip_test, "--skip-test");
|
|
|
|
# If not reordering, we also shouldn't group by suites, unless
|
|
# no test cases were named.
|
|
# This also effects some logic in the loop following this.
|
|
if ($opt_reorder or !@$opt_cases)
|
|
{
|
|
foreach my $suite (split(",", $suites))
|
|
{
|
|
push(@$cases, collect_one_suite($suite, $opt_cases));
|
|
last if $some_test_found;
|
|
}
|
|
}
|
|
|
|
if ( @$opt_cases )
|
|
{
|
|
# A list of tests was specified on the command line
|
|
# Check that the tests specified was found
|
|
# in at least one suite
|
|
foreach my $test_name_spec ( @$opt_cases )
|
|
{
|
|
my $found= 0;
|
|
my ($sname, $tname, $extension)= split_testname($test_name_spec);
|
|
foreach my $test ( @$cases )
|
|
{
|
|
last unless $opt_reorder;
|
|
# test->{name} is always in suite.name format
|
|
if ( $test->{name} =~ /.*\.$tname/ )
|
|
{
|
|
$found= 1;
|
|
last;
|
|
}
|
|
}
|
|
if ( not $found )
|
|
{
|
|
$sname= "main" if !$opt_reorder and !$sname;
|
|
mtr_error("Could not find '$tname' in '$suites' suite(s)") unless $sname;
|
|
# If suite was part of name, find it there, may come with combinations
|
|
my @this_case = collect_one_suite($sname, [ $tname ]);
|
|
if (@this_case)
|
|
{
|
|
push (@$cases, @this_case);
|
|
}
|
|
else
|
|
{
|
|
mtr_error("Could not find '$tname' in '$sname' suite");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if ( $opt_reorder && !$quick_collect)
|
|
{
|
|
# Reorder the test cases in an order that will make them faster to run
|
|
my %sort_criteria;
|
|
|
|
# Make a mapping of test name to a string that represents how that test
|
|
# should be sorted among the other tests. Put the most important criterion
|
|
# first, then a sub-criterion, then sub-sub-criterion, etc.
|
|
foreach my $tinfo (@$cases)
|
|
{
|
|
my @criteria = ();
|
|
|
|
#
|
|
# Append the criteria for sorting, in order of importance.
|
|
#
|
|
push(@criteria, "ndb=" . ($tinfo->{'ndb_test'} ? "A" : "B"));
|
|
# Group test with equal options together.
|
|
# Ending with "~" makes empty sort later than filled
|
|
my $opts= $tinfo->{'master_opt'} ? $tinfo->{'master_opt'} : [];
|
|
push(@criteria, join("!", sort @{$opts}) . "~");
|
|
|
|
$sort_criteria{$tinfo->fullname()} = join(" ", @criteria);
|
|
}
|
|
|
|
@$cases = sort { testcase_sort_order($a, $b, \%sort_criteria) } @$cases;
|
|
|
|
# For debugging the sort-order
|
|
# foreach my $tinfo (@$cases)
|
|
# {
|
|
# print $sort_criteria{$tinfo->fullname()}," -> \t",$tinfo->fullname(),"\n";
|
|
# }
|
|
|
|
}
|
|
|
|
if (defined $print_testcases){
|
|
print_testcases(@$cases);
|
|
exit(1);
|
|
}
|
|
|
|
return $cases;
|
|
|
|
}
|
|
|
|
|
|
# Returns (suitename, testname, extension)
|
|
sub split_testname {
|
|
my ($test_name)= @_;
|
|
|
|
# Get rid of directory part and split name on .'s
|
|
my @parts= split(/\./, basename($test_name));
|
|
|
|
if (@parts == 1){
|
|
# Only testname given, ex: alias
|
|
return (undef , $parts[0], undef);
|
|
} elsif (@parts == 2) {
|
|
# Either testname.test or suite.testname given
|
|
# Ex. main.alias or alias.test
|
|
|
|
if ($parts[1] eq "test")
|
|
{
|
|
return (undef , $parts[0], $parts[1]);
|
|
}
|
|
else
|
|
{
|
|
return ($parts[0], $parts[1], undef);
|
|
}
|
|
|
|
} elsif (@parts == 3) {
|
|
# Fully specified suitename.testname.test
|
|
# ex main.alias.test
|
|
return ( $parts[0], $parts[1], $parts[2]);
|
|
}
|
|
|
|
mtr_error("Illegal format of test name: $test_name");
|
|
}
|
|
|
|
|
|
sub collect_one_suite
|
|
{
|
|
my $suite= shift; # Test suite name
|
|
my $opt_cases= shift;
|
|
my @cases; # Array of hash
|
|
|
|
mtr_verbose("Collecting: $suite");
|
|
|
|
my $suitedir= "$::glob_mysql_test_dir"; # Default
|
|
if ( $suite ne "main" )
|
|
{
|
|
# Allow suite to be path to "some dir" if $suite has at least
|
|
# one directory part
|
|
if ( -d $suite and splitdir($suite) > 1 ){
|
|
$suitedir= $suite;
|
|
mtr_report(" - from '$suitedir'");
|
|
|
|
}
|
|
else
|
|
{
|
|
$suitedir= my_find_dir($suitedir,
|
|
["suite",
|
|
".",
|
|
# Look in storage engine specific suite dirs
|
|
"../storage/*/mysql-test-suites"
|
|
],
|
|
[$suite]);
|
|
}
|
|
mtr_verbose("suitedir: $suitedir");
|
|
}
|
|
|
|
my $testdir= "$suitedir/t";
|
|
my $resdir= "$suitedir/r";
|
|
|
|
# Check if t/ exists
|
|
if (-d $testdir){
|
|
# t/ exists
|
|
|
|
if ( -d $resdir )
|
|
{
|
|
# r/exists
|
|
}
|
|
else
|
|
{
|
|
# No r/, use t/ as result dir
|
|
$resdir= $testdir;
|
|
}
|
|
|
|
}
|
|
else {
|
|
# No t/ dir => there can' be any r/ dir
|
|
mtr_error("Can't have r/ dir without t/") if -d $resdir;
|
|
|
|
# No t/ or r/ => use suitedir
|
|
$resdir= $testdir= $suitedir;
|
|
}
|
|
|
|
mtr_verbose("testdir: $testdir");
|
|
mtr_verbose("resdir: $resdir");
|
|
|
|
#
|
|
# Load the Suite object
|
|
#
|
|
unless ($::suites{$suite}) {
|
|
if (-f "$suitedir/suite.pm") {
|
|
$::suites{$suite} = do "$suitedir/suite.pm";
|
|
} else {
|
|
$::suites{$suite} = $default_suite_object;
|
|
}
|
|
}
|
|
|
|
# ----------------------------------------------------------------------
|
|
# Build a hash of disabled testcases for this suite
|
|
# ----------------------------------------------------------------------
|
|
my %disabled;
|
|
if ( open(DISABLED, "$testdir/disabled.def" ) )
|
|
{
|
|
while ( <DISABLED> )
|
|
{
|
|
chomp;
|
|
if ( /^\s*(\S+)\s*:\s*(.*?)\s*$/ )
|
|
{
|
|
$disabled{$1}= $2;
|
|
}
|
|
}
|
|
close DISABLED;
|
|
}
|
|
|
|
# Read suite.opt file
|
|
my $suite_opts= [ opts_from_file("$testdir/suite.opt") ];
|
|
$suite_opts = [ opts_from_file("$suitedir/suite.opt") ] unless @$suite_opts;
|
|
|
|
if ( @$opt_cases )
|
|
{
|
|
# Collect in specified order
|
|
foreach my $test_name_spec ( @$opt_cases )
|
|
{
|
|
my ($sname, $tname, $extension)= split_testname($test_name_spec);
|
|
|
|
# The test name parts have now been defined
|
|
#print " suite_name: $sname\n";
|
|
#print " tname: $tname\n";
|
|
#print " extension: $extension\n";
|
|
|
|
# Check cirrect suite if suitename is defined
|
|
next if (defined $sname and $suite ne $sname);
|
|
|
|
if ( defined $extension )
|
|
{
|
|
my $full_name= "$testdir/$tname.$extension";
|
|
# Extension was specified, check if the test exists
|
|
if ( ! -f $full_name)
|
|
{
|
|
# This is only an error if suite was specified, otherwise it
|
|
# could exist in another suite
|
|
mtr_error("Test '$full_name' was not found in suite '$sname'")
|
|
if $sname;
|
|
|
|
next;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
# No extension was specified, use default
|
|
$extension= "test";
|
|
my $full_name= "$testdir/$tname.$extension";
|
|
|
|
# Test not found here, could exist in other suite
|
|
next if ( ! -f $full_name );
|
|
}
|
|
|
|
push(@cases,
|
|
collect_one_test_case($suitedir,
|
|
$testdir,
|
|
$resdir,
|
|
$suite,
|
|
$tname,
|
|
"$tname.$extension",
|
|
\%disabled,
|
|
$suite_opts));
|
|
}
|
|
}
|
|
else
|
|
{
|
|
opendir(TESTDIR, $testdir) or mtr_error("Can't open dir \"$testdir\": $!");
|
|
|
|
foreach my $elem ( sort readdir(TESTDIR) )
|
|
{
|
|
my $tname= mtr_match_extension($elem, 'test');
|
|
|
|
next unless defined $tname;
|
|
|
|
# Skip tests that does not match the --do-test= filter
|
|
next if ($do_test_reg and not $tname =~ /$do_test_reg/o);
|
|
|
|
push(@cases,
|
|
collect_one_test_case($suitedir,
|
|
$testdir,
|
|
$resdir,
|
|
$suite,
|
|
$tname,
|
|
$elem,
|
|
\%disabled,
|
|
$suite_opts));
|
|
}
|
|
closedir TESTDIR;
|
|
}
|
|
|
|
# Return empty list if no testcases found
|
|
return if (@cases == 0);
|
|
|
|
# ----------------------------------------------------------------------
|
|
# Read combinations for this suite and build testcases x combinations
|
|
# if any combinations exists
|
|
# ----------------------------------------------------------------------
|
|
if ( ! $skip_combinations && ! $quick_collect )
|
|
{
|
|
my @combinations;
|
|
my $combination_file= "$suitedir/combinations";
|
|
#print "combination_file: $combination_file\n";
|
|
if (@::opt_combinations)
|
|
{
|
|
# take the combination from command-line
|
|
mtr_verbose("Take the combination from command line");
|
|
foreach my $combination (@::opt_combinations) {
|
|
my $comb= {};
|
|
$comb->{name}= $combination;
|
|
push(@{$comb->{comb_opt}}, $combination);
|
|
push(@combinations, $comb);
|
|
}
|
|
}
|
|
elsif (-f $combination_file )
|
|
{
|
|
# Read combinations file in my.cnf format
|
|
mtr_verbose("Read combinations file");
|
|
my %env_filter = map { $_ => 1 } split /:/, $ENV{"\U${suite}_COMBINATIONS"};
|
|
my $config= My::Config->new($combination_file);
|
|
foreach my $group ($config->groups()) {
|
|
my $comb= {};
|
|
$comb->{name}= $group->name();
|
|
next if %env_filter and not $env_filter{$comb->{name}};
|
|
foreach my $option ( $group->options() ) {
|
|
push(@{$comb->{comb_opt}}, $option->option());
|
|
}
|
|
push(@combinations, $comb) if $comb->{comb_opt};
|
|
}
|
|
}
|
|
|
|
if (@combinations)
|
|
{
|
|
print " - adding combinations for $suite\n";
|
|
#print_testcases(@cases);
|
|
|
|
my @new_cases;
|
|
foreach my $comb (@combinations)
|
|
{
|
|
foreach my $test (@cases)
|
|
{
|
|
|
|
next if ( $test->{'skip'} );
|
|
|
|
# Skip this combination if the values it provides
|
|
# already are set in master_opt or slave_opt
|
|
if (My::Options::is_set($test->{master_opt}, $comb->{comb_opt}) &&
|
|
My::Options::is_set($test->{slave_opt}, $comb->{comb_opt}) ){
|
|
next;
|
|
}
|
|
|
|
# Copy test options
|
|
my $new_test= My::Test->new();
|
|
while (my ($key, $value) = each(%$test)) {
|
|
if (ref $value eq "ARRAY") {
|
|
push(@{$new_test->{$key}}, @$value);
|
|
} else {
|
|
$new_test->{$key}= $value;
|
|
}
|
|
}
|
|
|
|
# Append the combination options to master_opt and slave_opt
|
|
push(@{$new_test->{master_opt}}, @{$comb->{comb_opt}});
|
|
push(@{$new_test->{slave_opt}}, @{$comb->{comb_opt}});
|
|
|
|
# Add combination name short name
|
|
$new_test->{combination}= $comb->{name};
|
|
|
|
# Add the new test to new test cases list
|
|
push(@new_cases, $new_test);
|
|
}
|
|
}
|
|
|
|
# Add the plain test if it was not already added
|
|
# as part of a combination
|
|
my %added;
|
|
foreach my $new_test (@new_cases){
|
|
$added{$new_test->{name}}= 1;
|
|
}
|
|
foreach my $test (@cases){
|
|
push(@new_cases, $test) unless $added{$test->{name}};
|
|
}
|
|
|
|
|
|
#print_testcases(@new_cases);
|
|
@cases= @new_cases;
|
|
#print_testcases(@cases);
|
|
}
|
|
}
|
|
|
|
optimize_cases(\@cases);
|
|
#print_testcases(@cases);
|
|
|
|
return @cases;
|
|
}
|
|
|
|
|
|
|
|
#
|
|
# Loop through all test cases
|
|
# - optimize which test to run by skipping unnecessary ones
|
|
# - update settings if necessary
|
|
#
|
|
sub optimize_cases {
|
|
my ($cases)= @_;
|
|
|
|
my @new_cases= ();
|
|
|
|
foreach my $tinfo ( @$cases )
|
|
{
|
|
push @new_cases, $tinfo;
|
|
|
|
# Skip processing if already marked as skipped
|
|
next if $tinfo->{skip};
|
|
|
|
# =======================================================
|
|
# If a special binlog format was selected with
|
|
# --mysqld=--binlog-format=x, skip all test that does not
|
|
# support it
|
|
# =======================================================
|
|
#print "binlog_format: $binlog_format\n";
|
|
if (not defined $binlog_format )
|
|
{
|
|
# =======================================================
|
|
# Use dynamic switching of binlog format
|
|
# =======================================================
|
|
|
|
# Get binlog-format used by this test from master_opt
|
|
my $test_binlog_format;
|
|
foreach my $opt ( @{$tinfo->{master_opt}} ) {
|
|
$test_binlog_format=
|
|
mtr_match_prefix($opt, "--binlog-format=") || $test_binlog_format;
|
|
}
|
|
|
|
if (defined $test_binlog_format and
|
|
defined $tinfo->{binlog_formats} )
|
|
{
|
|
my $supported=
|
|
grep { $_ eq $test_binlog_format } @{$tinfo->{'binlog_formats'}};
|
|
if ( !$supported )
|
|
{
|
|
$tinfo->{'skip'}= 1;
|
|
$tinfo->{'comment'}=
|
|
"Doesn't support --binlog-format='$test_binlog_format'";
|
|
# This test was added as a replication combination, but it is not
|
|
# actually ever possible to run it, as it is not made for this
|
|
# combination.
|
|
# So delete it from the list, rather than confuse the user with a
|
|
# message that this test is skipped (it is not really, just run
|
|
# with other combinations).
|
|
pop(@new_cases);
|
|
next;
|
|
}
|
|
}
|
|
}
|
|
|
|
# =======================================================
|
|
# Check that engine selected by
|
|
# --default-storage-engine=<engine> is supported
|
|
# =======================================================
|
|
my %builtin_engines = ('myisam' => 1, 'memory' => 1, 'csv' => 1);
|
|
|
|
foreach my $opt ( @{$tinfo->{master_opt}} ) {
|
|
my $default_engine=
|
|
mtr_match_prefix($opt, "--default-storage-engine=");
|
|
|
|
if (defined $default_engine){
|
|
|
|
#print " $tinfo->{name}\n";
|
|
#print " - The test asked to use '$default_engine'\n";
|
|
|
|
#my $engine_value= $::mysqld_variables{$default_engine};
|
|
#print " - The mysqld_variables says '$engine_value'\n";
|
|
|
|
if ( ! exists $::mysqld_variables{$default_engine} and
|
|
! exists $builtin_engines{$default_engine} )
|
|
{
|
|
$tinfo->{'skip'}= 1;
|
|
$tinfo->{'comment'}=
|
|
"'$default_engine' not supported";
|
|
}
|
|
|
|
$tinfo->{'ndb_test'}= 1
|
|
if ( $default_engine =~ /^ndb/i );
|
|
}
|
|
}
|
|
|
|
if ($quick_collect && ! $tinfo->{'skip'})
|
|
{
|
|
$some_test_found= 1;
|
|
return;
|
|
}
|
|
}
|
|
@$cases= @new_cases;
|
|
}
|
|
|
|
|
|
#
|
|
# Read options from the given opt file and append them as an array
|
|
# to $tinfo->{$opt_name}
|
|
#
|
|
sub process_opts {
|
|
my ($tinfo, $opt_name)= @_;
|
|
|
|
my @opts= @{$tinfo->{$opt_name}};
|
|
$tinfo->{$opt_name} = [];
|
|
|
|
my @plugins;
|
|
my %seen;
|
|
|
|
foreach my $opt (@opts)
|
|
{
|
|
my $value;
|
|
|
|
# The opt file is used both to send special options to the mysqld
|
|
# as well as pass special test case specific options to this
|
|
# script
|
|
|
|
$value= mtr_match_prefix($opt, "--timezone=");
|
|
if ( defined $value )
|
|
{
|
|
$tinfo->{'timezone'}= $value;
|
|
next;
|
|
}
|
|
|
|
$value= mtr_match_prefix($opt, "--plugin-load=");
|
|
if (defined $value)
|
|
{
|
|
push @plugins, $value unless $seen{$value};
|
|
$seen{$value}=1;
|
|
next;
|
|
}
|
|
|
|
$value= mtr_match_prefix($opt, "--result-file=");
|
|
if ( defined $value )
|
|
{
|
|
# Specifies the file mysqltest should compare
|
|
# output against
|
|
$tinfo->{'result_file'}= "r/$value.result";
|
|
next;
|
|
}
|
|
|
|
$value= mtr_match_prefix($opt, "--config-file-template=");
|
|
if ( defined $value)
|
|
{
|
|
# Specifies the configuration file to use for this test
|
|
$tinfo->{'template_path'}= dirname($tinfo->{path})."/$value";
|
|
next;
|
|
}
|
|
|
|
# If we set default time zone, remove the one we have
|
|
$value= mtr_match_prefix($opt, "--default-time-zone=");
|
|
if ( defined $value )
|
|
{
|
|
# Set timezone for this test case to something different
|
|
$tinfo->{'timezone'}= "GMT-8";
|
|
# Fallthrough, add the --default-time-zone option
|
|
}
|
|
|
|
# The --restart option forces a restart even if no special
|
|
# option is set. If the options are the same as next testcase
|
|
# there is no need to restart after the testcase
|
|
# has completed
|
|
if ( $opt eq "--force-restart" )
|
|
{
|
|
$tinfo->{'force_restart'}= 1;
|
|
next;
|
|
}
|
|
|
|
$value= mtr_match_prefix($opt, "--testcase-timeout=");
|
|
if ( defined $value ) {
|
|
# Overrides test case timeout for this test
|
|
$tinfo->{'case-timeout'}= $value;
|
|
next;
|
|
}
|
|
|
|
# Ok, this was a real option, add it
|
|
push(@{$tinfo->{$opt_name}}, $opt);
|
|
}
|
|
|
|
if (@plugins) {
|
|
my $sep = (IS_WINDOWS) ? ';' : ':';
|
|
push @{$tinfo->{$opt_name}}, "--plugin-load=" . join($sep, @plugins);
|
|
}
|
|
}
|
|
|
|
|
|
##############################################################################
|
|
#
|
|
# Collect information about a single test case
|
|
#
|
|
##############################################################################
|
|
|
|
sub collect_one_test_case {
|
|
my $suitedir= shift;
|
|
my $testdir= shift;
|
|
my $resdir= shift;
|
|
my $suitename= shift;
|
|
my $tname= shift;
|
|
my $filename= shift;
|
|
my $disabled= shift;
|
|
my $suite_opts= shift;
|
|
|
|
my $local_default_storage_engine= $default_storage_engine;
|
|
|
|
#print "collect_one_test_case\n";
|
|
#print " suitedir: $suitedir\n";
|
|
#print " testdir: $testdir\n";
|
|
#print " resdir: $resdir\n";
|
|
#print " suitename: $suitename\n";
|
|
#print " tname: $tname\n";
|
|
#print " filename: $filename\n";
|
|
|
|
# ----------------------------------------------------------------------
|
|
# Check --start-from
|
|
# ----------------------------------------------------------------------
|
|
if ( $start_from && 0)
|
|
{
|
|
# start_from can be specified as [suite.].testname_prefix
|
|
my ($suite, $test, $ext)= split_testname($start_from);
|
|
|
|
if ( $suite and $suitename lt $suite){
|
|
return; # Skip silently
|
|
}
|
|
if ((!$suite || $suitename == $suite) && $tname lt $test ){
|
|
return; # Skip silently
|
|
}
|
|
}
|
|
|
|
# ----------------------------------------------------------------------
|
|
# Set defaults
|
|
# ----------------------------------------------------------------------
|
|
my $tinfo= My::Test->new
|
|
(
|
|
name => "$suitename.$tname",
|
|
shortname => $tname,
|
|
path => "$testdir/$filename",
|
|
suite => $suitename,
|
|
);
|
|
|
|
my $result_file= "$resdir/$tname.result";
|
|
if (-f $result_file) {
|
|
# Allow nonexistsing result file
|
|
# in that case .test must issue "exit" otherwise test
|
|
# should fail by default
|
|
$tinfo->{result_file}= $result_file;
|
|
}
|
|
else {
|
|
# No .result file exist
|
|
# Remember the path where it should be
|
|
# saved in case of --record
|
|
$tinfo->{record_file}= $result_file;
|
|
}
|
|
|
|
# ----------------------------------------------------------------------
|
|
# Skip some tests but include in list, just mark them as skipped
|
|
# ----------------------------------------------------------------------
|
|
my $name= basename($suitename) . ".$tname";
|
|
if ( $skip_test_reg and ($tname =~ /$skip_test_reg/o ||
|
|
$name =~ /$skip_test/o))
|
|
{
|
|
$tinfo->{'skip'}= 1;
|
|
return $tinfo;
|
|
}
|
|
|
|
# ----------------------------------------------------------------------
|
|
# Check for disabled tests
|
|
# ----------------------------------------------------------------------
|
|
my $marked_as_disabled= 0;
|
|
if ( $disabled->{$tname} or $disabled->{"$suitename.$tname"} )
|
|
{
|
|
# Test was marked as disabled in suites disabled.def file
|
|
$marked_as_disabled= 1;
|
|
# Test name may have been disabled with or without suite name part
|
|
$tinfo->{'comment'}= $disabled->{$tname} ||
|
|
$disabled->{"$suitename.$tname"};
|
|
}
|
|
|
|
my $disabled_file= "$testdir/$tname.disabled";
|
|
if ( -f $disabled_file )
|
|
{
|
|
$marked_as_disabled= 1;
|
|
$tinfo->{'comment'}= mtr_fromfile($disabled_file);
|
|
}
|
|
|
|
if ( $marked_as_disabled )
|
|
{
|
|
if ( $enable_disabled )
|
|
{
|
|
# User has selected to run all disabled tests
|
|
mtr_report(" - $tinfo->{name} wil be run although it's been disabled\n",
|
|
" due to '$tinfo->{comment}'");
|
|
}
|
|
else
|
|
{
|
|
$tinfo->{'skip'}= 1;
|
|
$tinfo->{'disable'}= 1; # Sub type of 'skip'
|
|
return $tinfo;
|
|
}
|
|
}
|
|
|
|
# ----------------------------------------------------------------------
|
|
# Append suite extra options to both master and slave
|
|
# ----------------------------------------------------------------------
|
|
push(@{$tinfo->{'master_opt'}}, @$suite_opts);
|
|
push(@{$tinfo->{'slave_opt'}}, @$suite_opts);
|
|
|
|
# ----------------------------------------------------------------------
|
|
# Check for test specific config file
|
|
# ----------------------------------------------------------------------
|
|
my $test_cnf_file= "$testdir/$tname.cnf";
|
|
if ( -f $test_cnf_file ) {
|
|
# Specifies the configuration file to use for this test
|
|
$tinfo->{'template_path'}= $test_cnf_file;
|
|
}
|
|
|
|
# ----------------------------------------------------------------------
|
|
# master sh
|
|
# ----------------------------------------------------------------------
|
|
my $master_sh= "$testdir/$tname-master.sh";
|
|
if ( -f $master_sh )
|
|
{
|
|
if ( IS_WIN32PERL )
|
|
{
|
|
$tinfo->{'skip'}= 1;
|
|
$tinfo->{'comment'}= "No tests with sh scripts on Windows";
|
|
return $tinfo;
|
|
}
|
|
else
|
|
{
|
|
$tinfo->{'master_sh'}= $master_sh;
|
|
}
|
|
}
|
|
|
|
# ----------------------------------------------------------------------
|
|
# slave sh
|
|
# ----------------------------------------------------------------------
|
|
my $slave_sh= "$testdir/$tname-slave.sh";
|
|
if ( -f $slave_sh )
|
|
{
|
|
if ( IS_WIN32PERL )
|
|
{
|
|
$tinfo->{'skip'}= 1;
|
|
$tinfo->{'comment'}= "No tests with sh scripts on Windows";
|
|
return $tinfo;
|
|
}
|
|
else
|
|
{
|
|
$tinfo->{'slave_sh'}= $slave_sh;
|
|
}
|
|
}
|
|
|
|
# ----------------------------------------------------------------------
|
|
# <tname>.slave-mi
|
|
# ----------------------------------------------------------------------
|
|
mtr_error("$tname: slave-mi not supported anymore")
|
|
if ( -f "$testdir/$tname.slave-mi");
|
|
|
|
|
|
my @source_files = tags_from_test_file($tinfo,"$testdir/${tname}.test");
|
|
|
|
# Get default storage engine from suite.opt file
|
|
|
|
if (defined $suite_opts &&
|
|
"@$suite_opts" =~ "default-storage-engine=\s*([^\s]*)")
|
|
{
|
|
$local_default_storage_engine= $1;
|
|
}
|
|
|
|
if ( defined $local_default_storage_engine )
|
|
{
|
|
# Different default engine is used
|
|
# tag test to require that engine
|
|
$tinfo->{'ndb_test'}= 1
|
|
if ( $local_default_storage_engine =~ /^ndb/i );
|
|
|
|
}
|
|
|
|
if ( $tinfo->{'big_test'} and ! $::opt_big_test )
|
|
{
|
|
$tinfo->{'skip'}= 1;
|
|
$tinfo->{'comment'}= "Test needs 'big-test' option";
|
|
return $tinfo
|
|
}
|
|
|
|
if ( $tinfo->{'need_debug'} && ! $::debug_compiled_binaries )
|
|
{
|
|
$tinfo->{'skip'}= 1;
|
|
$tinfo->{'comment'}= "Test needs debug binaries";
|
|
return $tinfo
|
|
}
|
|
|
|
if ( $tinfo->{'ndb_test'} )
|
|
{
|
|
# This is a NDB test
|
|
if ( $::opt_skip_ndbcluster == 2 )
|
|
{
|
|
# Ndb is not supported, skip it
|
|
$tinfo->{'skip'}= 1;
|
|
$tinfo->{'comment'}= "No ndbcluster support or ndb tests not enabled";
|
|
return $tinfo;
|
|
}
|
|
elsif ( $::opt_skip_ndbcluster )
|
|
{
|
|
# All ndb test's should be skipped
|
|
$tinfo->{'skip'}= 1;
|
|
$tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)";
|
|
return $tinfo;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
# This is not a ndb test
|
|
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";
|
|
return $tinfo;
|
|
}
|
|
}
|
|
|
|
if ( $tinfo->{'rpl_test'} )
|
|
{
|
|
if ( $skip_rpl )
|
|
{
|
|
$tinfo->{'skip'}= 1;
|
|
$tinfo->{'comment'}= "No replication tests(--skip-rpl)";
|
|
return $tinfo;
|
|
}
|
|
}
|
|
|
|
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
|
|
# ----------------------------------------------------------------------
|
|
if (defined $defaults_file) {
|
|
# Using same config file for all tests
|
|
$tinfo->{template_path}= $defaults_file;
|
|
}
|
|
elsif (! $tinfo->{template_path} )
|
|
{
|
|
my $config= "$suitedir/my.cnf";
|
|
if (! -f $config )
|
|
{
|
|
# assume default.cnf will be used
|
|
$config= "include/default_my.cnf";
|
|
|
|
# Suite has no config, autodetect which one to use
|
|
if ( $tinfo->{rpl_test} ){
|
|
$config= "suite/rpl/my.cnf";
|
|
if ( $tinfo->{ndb_test} ){
|
|
$config= "suite/rpl_ndb/my.cnf";
|
|
}
|
|
}
|
|
elsif ( $tinfo->{ndb_test} ){
|
|
$config= "suite/ndb/my.cnf";
|
|
}
|
|
}
|
|
$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;
|
|
$tinfo->{'comment'}= $::suites{$tinfo->{suite}};
|
|
return $tinfo;
|
|
}
|
|
|
|
# ----------------------------------------------------------------------
|
|
# Append mysqld extra options to master and slave, as appropriate
|
|
# ----------------------------------------------------------------------
|
|
for (@source_files) {
|
|
s/\.\w+$//;
|
|
push @{$tinfo->{master_opt}}, opts_from_file("$_.opt");
|
|
push @{$tinfo->{slave_opt}}, opts_from_file("$_.opt");
|
|
push @{$tinfo->{master_opt}}, opts_from_file("$_-master.opt");
|
|
push @{$tinfo->{slave_opt}}, opts_from_file("$_-slave.opt");
|
|
}
|
|
|
|
push(@{$tinfo->{'master_opt'}}, @::opt_extra_mysqld_opt);
|
|
push(@{$tinfo->{'slave_opt'}}, @::opt_extra_mysqld_opt);
|
|
|
|
process_opts($tinfo, 'master_opt');
|
|
process_opts($tinfo, 'slave_opt');
|
|
|
|
return $tinfo;
|
|
}
|
|
|
|
|
|
# List of tags in the .test files that if found should set
|
|
# the specified value in "tinfo"
|
|
my @tags=
|
|
(
|
|
["include/big_test.inc", "big_test", 1],
|
|
["include/have_debug.inc", "need_debug", 1],
|
|
["include/have_ndb.inc", "ndb_test", 1],
|
|
["include/have_multi_ndb.inc", "ndb_test", 1],
|
|
["include/master-slave.inc", "rpl_test", 1],
|
|
["include/ndb_master-slave.inc", "rpl_test", 1],
|
|
["include/ndb_master-slave.inc", "ndb_test", 1],
|
|
["include/not_embedded.inc", "not_embedded", 1],
|
|
["include/not_valgrind.inc", "not_valgrind", 1],
|
|
["include/have_example_plugin.inc", "example_plugin_test", 1],
|
|
["include/have_ssl.inc", "need_ssl", 1],
|
|
["include/long_test.inc", "long_test", 1],
|
|
);
|
|
|
|
|
|
sub tags_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\": $!");
|
|
my @all_files=($file);
|
|
|
|
while ( my $line= <$F> )
|
|
{
|
|
|
|
# Skip line if it start's with #
|
|
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(.*)$/ or
|
|
$line =~ /^([[:space:]]*)source(.*);$/ )
|
|
{
|
|
my $value= $2;
|
|
$value =~ s/^\s+//; # Remove leading space
|
|
$value =~ s/[[:space:]]+$//; # Remove ending space
|
|
|
|
# Sourced file may exist relative to test or
|
|
# in global location
|
|
foreach my $sourced_file (dirname($file). "/$value",
|
|
"$::glob_mysql_test_dir/$value")
|
|
{
|
|
if ( -f $sourced_file )
|
|
{
|
|
# Only source the file if it exists, we may get
|
|
# false positives in the regexes above if someone
|
|
# writes "source nnnn;" in a test case(such as mysqltest.test)
|
|
unshift @all_files, tags_from_test_file($tinfo, $sourced_file);
|
|
last;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@all_files;
|
|
}
|
|
|
|
sub unspace {
|
|
my $string= shift;
|
|
my $quote= shift;
|
|
$string =~ s/[ \t]/\x11/g;
|
|
return "$quote$string$quote";
|
|
}
|
|
|
|
|
|
sub opts_from_file ($) {
|
|
my $file= shift;
|
|
local $_;
|
|
|
|
return () unless -f $file;
|
|
|
|
open(FILE,"<",$file) or mtr_error("can't open file \"$file\": $!");
|
|
my @args;
|
|
while ( <FILE> )
|
|
{
|
|
chomp;
|
|
|
|
# --set-variable=init_connect=set @a='a\\0c'
|
|
s/^\s+//; # Remove leading space
|
|
s/\s+$//; # Remove ending space
|
|
|
|
# This is strange, but we need to fill whitespace inside
|
|
# quotes with something, to remove later. We do this to
|
|
# be able to split on space. Else, we have trouble with
|
|
# options like
|
|
#
|
|
# --someopt="--insideopt1 --insideopt2"
|
|
#
|
|
# But still with this, we are not 100% sure it is right,
|
|
# we need a shell to do it right.
|
|
|
|
s/\'([^\'\"]*)\'/unspace($1,"\x0a")/ge;
|
|
s/\"([^\'\"]*)\"/unspace($1,"\x0b")/ge;
|
|
s/\'([^\'\"]*)\'/unspace($1,"\x0a")/ge;
|
|
s/\"([^\'\"]*)\"/unspace($1,"\x0b")/ge;
|
|
|
|
foreach my $arg (split(/[ \t]+/))
|
|
{
|
|
$arg =~ tr/\x11\x0a\x0b/ \'\"/; # Put back real chars
|
|
# The outermost quotes has to go
|
|
$arg =~ s/^([^\'\"]*)\'(.*)\'([^\'\"]*)$/$1$2$3/
|
|
or $arg =~ s/^([^\'\"]*)\"(.*)\"([^\'\"]*)$/$1$2$3/;
|
|
$arg =~ s/\\\\/\\/g;
|
|
|
|
# Do not pass empty string since my_getopt is not capable to handle it.
|
|
if (length($arg)) {
|
|
push(@args, $arg);
|
|
}
|
|
}
|
|
}
|
|
close FILE;
|
|
return @args;
|
|
}
|
|
|
|
sub print_testcases {
|
|
my (@cases)= @_;
|
|
|
|
print "=" x 60, "\n";
|
|
foreach my $test (@cases){
|
|
$test->print_test();
|
|
}
|
|
print "=" x 60, "\n";
|
|
}
|
|
|
|
|
|
1;
|