Commit 04c39b19 authored by Bjorn Munch's avatar Bjorn Munch

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

Combinations beginning with -- not allowed
Allow them...
parent 50ab925e
...@@ -3251,9 +3251,11 @@ sub run_testcase ($) { ...@@ -3251,9 +3251,11 @@ sub run_testcase ($) {
mtr_verbose("Running test:", $tinfo->{name}); 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}; my $combination= $tinfo->{combination};
if ($combination && $combination !~ /^\w[-\w\.\+]+$/) if ($combination && $combination !~ /^\w[-\w\.\+]+$/
&& $combination !~ /^--/)
{ {
mtr_error("Combination '$combination' contains illegal characters"); mtr_error("Combination '$combination' contains illegal characters");
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment