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

Combinations beginning with -- not allowed
Allow them...
This commit is contained in:
Bjorn Munch 2010-01-05 13:05:00 +01:00
parent 50ab925e04
commit 04c39b1939

View file

@ -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");
}