Commit ad771f00 authored by Bjorn Munch's avatar Bjorn Munch

Bug #45698 MTR_VERSION=1 ./mtr --force does not work

Small amendment to original fix, as it did not work in azalea
Need to handle combinations, would eventually break in 5.1 too
parent 2399987a
......@@ -540,7 +540,11 @@ sub collect_one_test_case($$$$$$$$$) {
$tinfo->{'component_id'} = $component_id;
push(@$cases, $tinfo);
if (exists ($incompatible{$tinfo->{'name'}}))
# Remove "combinations" part of test name
my $test_base_name= $tinfo->{'name'};
$test_base_name=~ s/\s.*\n//;
if (exists ($incompatible{$test_base_name}))
{
$tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "Test cannot run in mtr v1";
......
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