Browse Source

Bug #49166 mtr --combination is broken after restrictions of combination names

Combinations beginning with -- not allowed
Allow them...
pull/47/merge
Bjorn Munch 16 years ago
parent
commit
eec8deed8b
  1. 6
      mysql-test/mysql-test-run.pl

6
mysql-test/mysql-test-run.pl

@ -3251,9 +3251,11 @@ sub run_testcase ($) {
mtr_verbose("Running test:", $tinfo->{name});
# Allow only alpanumerics pluss _ - + . in combination names
# Allow only alpanumerics pluss _ - + . in combination names,
# or anything beginning with -- (the latter comes from --combination)
my $combination= $tinfo->{combination};
if ($combination && $combination !~ /^\w[-\w\.\+]+$/)
if ($combination && $combination !~ /^\w[-\w\.\+]+$/
&& $combination !~ /^--/)
{
mtr_error("Combination '$combination' contains illegal characters");
}

Loading…
Cancel
Save