mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with trunk

Browse source
This commit is contained in:
Michael Widenius 2009-10-06 09:15:12 +03:00
commit 0e9e201d03
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mysql-test/lib/mtr_cases.pm
View file

@ -560,8 +560,12 @@ sub collect_one_suite($)
sub optimize_cases { sub optimize_cases {
my ($cases)= @_; my ($cases)= @_;
my @new_cases= ();
foreach my $tinfo ( @$cases ) foreach my $tinfo ( @$cases )
{ {
push @new_cases, $tinfo;
# Skip processing if already marked as skipped # Skip processing if already marked as skipped
next if $tinfo->{skip}; next if $tinfo->{skip};
@ -615,6 +619,13 @@ sub optimize_cases {
$tinfo->{'skip'}= 1; $tinfo->{'skip'}= 1;
$tinfo->{'comment'}= $tinfo->{'comment'}=
"Doesn't support --binlog-format='$test_binlog_format'"; "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; next;
} }
} }
@ -683,6 +694,7 @@ sub optimize_cases {
} }
} }
} }
@$cases= @new_cases;
} }

4
mysql-test/mysql-test-run.pl
View file

@ -126,13 +126,13 @@ my $path_config_file; # The generated config file, var/my.cnf
# executables will be used by the test suite. # executables will be used by the test suite.
our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
my $DEFAULT_SUITES= "binlog,federated,main,maria,ndb,rpl,rpl_ndb,innodb"; my $DEFAULT_SUITES= "binlog,federated,main,maria,rpl,innodb";
my $opt_suites; my $opt_suites;
our $opt_usage; our $opt_usage;
our $opt_list_options; our $opt_list_options;
our $opt_suites; our $opt_suites;
our $opt_suites_default= "main,backup,backup_engines,binlog,rpl,rpl_ndb,ndb"; # Default suites to run our $opt_suites_default= "main,backup,backup_engines,binlog,rpl"; # Default suites to run
our $opt_script_debug= 0; # Script debugging, enable with --script-debug our $opt_script_debug= 0; # Script debugging, enable with --script-debug
our $opt_verbose= 0; # Verbose output, enable with --verbose our $opt_verbose= 0; # Verbose output, enable with --verbose
our $exe_mysql; our $exe_mysql;