1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #54364 Allow multiple --experimental command line options for MTR

Browse Source 
Convert --experimental into a multi option
Size of diff is caused by intenting code put into a for loop
This commit is contained in:
Bjorn Munch 2010-06-10 10:34:16 +02:00
parent d5f2972628
commit c9d57b0c0f
2 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/lib/mtr_report.pm
View File

@ -124,7 +124,7 @@ sub mtr_report_test ($) {
my $timest = format_time();
my $fail = "fail";
if ( $::opt_experimental )
if ( @$::experimental_test_cases )
{
# Find out if this test case is an experimental one, so we can treat
# the failure as an expected failure instead of a regression.

16
mysql-test/mysql-test-run.pl
View File

@ -187,7 +187,7 @@ our $opt_client_debugger;
my $config; # The currently running config
my $current_config_name; # The currently running config file template
our $opt_experimental;
our @opt_experimentals;
our $experimental_test_cases;
my $baseport;
@ -846,7 +846,7 @@ sub command_line_setup {
'big-test' => \$opt_big_test,
'combination=s' => \@opt_combinations,
'skip-combinations' => \&collect_option,
'experimental=s' => \$opt_experimental,
'experimental=s' => \@opt_experimentals,
'skip-im' => \&ignore_option,
# Specify ports
@ -1028,16 +1028,19 @@ sub command_line_setup {
mtr_print_thick_line('#');
}
if ( $opt_experimental )
if ( @opt_experimentals )
{
# $^O on Windows considered not generic enough
my $plat= (IS_WINDOWS) ? 'windows' : $^O;
# read the list of experimental test cases from the file specified on
# read the list of experimental test cases from the files specified on
# the command line
open(FILE, "<", $opt_experimental) or mtr_error("Can't read experimental file: $opt_experimental");
mtr_report("Using experimental file: $opt_experimental");
$experimental_test_cases = [];
foreach my $exp_file (@opt_experimentals)
{
open(FILE, "<", $exp_file)
or mtr_error("Can't read experimental file: $exp_file");
mtr_report("Using experimental file: $exp_file");
while(<FILE>) {
chomp;
# remove comments (# foo) at the beginning of the line, or after a
@ -1066,6 +1069,7 @@ sub command_line_setup {
}
close FILE;
}
}
foreach my $arg ( @ARGV )
{