diff --git a/Testvars.pm b/Testvars.pm index 2a1cac8..a7fd8bb 100644 --- a/Testvars.pm +++ b/Testvars.pm @@ -711,9 +711,9 @@ my @netlinkdesc = ( 'netbench.pl_-v_-B1000000000_-b1000000_-d1_-f0_-i0_-N10_-croot@lt{left}_-sroot@lt{right}_-Afdd7:e83e:66bd:10{line}1::20_-afdd7:e83e:66bd:10{line}2::40_-t10_udpsplice' => { ipv => "IPv6", proto => "UDP", op => "Splice", len => "Empty", streams => "parallel-10", name => "linux-openbsd-linux-udp6splice-empty" }, 'netbench.pl_-v_-B1000000000_-b1000000_-d1_-f1_-i0_-N10_-croot@lt{left}_-sroot@lt{right}_-A10.10.{line}1.20_-a10.10.{line}2.40_-t10_udpsplice' => { ipv => "IPv4", proto => "UDP", op => "Splice", len => "MTU", streams => "parallel-10", name => "linux-openbsd-linux-udp4splice-full" }, 'netbench.pl_-v_-B1000000000_-b1000000_-d1_-f1_-i0_-N10_-croot@lt{left}_-sroot@lt{right}_-Afdd7:e83e:66bd:10{line}1::20_-afdd7:e83e:66bd:10{line}2::40_-t10_udpsplice' => { ipv => "IPv6", proto => "UDP", op => "Splice", len => "MTU", streams => "parallel-10", name => "linux-openbsd-linux-udp6splice-full" }, - 'netbench.pl_-v_-B1000000000_-b1000000_-d1_-f1_-i0_-N10_-R10.10.{line}1.2_-S10.10.{line}1.1_-croot@lt{left}_-a234.10.{line}1.10_-t10_udpbench' => { ipv => "IPv4", proto => "MCast", op => "Receive", len => "MTU", streams => "parallel-10", name => "linux-openbsd-mcast4bench-parallel-mtu" }, + 'netbench.pl_-v_-B1000000000_-b1000000_-d1_-f1_-i0_-N10_-R{ifaddr}_-S{ifaddr}_-croot@lt{left}_-a234.10.{line}1.10_-t10_udpbench' => { ipv => "IPv4", proto => "MCast", op => "Receive", len => "MTU", streams => "parallel-10", name => "linux-openbsd-mcast4bench-parallel-mtu" }, 'netbench.pl_-v_-B1000000000_-b1000000_-d1_-f1_-i0_-N10_-R{ifname}_-S{ifname}_-croot@lt{left}_-aff34:40:fdd7:e83e:66bd:10{line}1::10_-t10_udpbench' => { ipv => "IPv6", proto => "MCast", op => "Receive", len => "MTU", streams => "parallel-10", name => "linux-openbsd-mcast6bench-parallel-mtu" }, - 'netbench.pl_-v_-B1000000000_-b1000000_-d1_-f1_-i0_-N10_-R10.10.{line}2.4_-S10.10.{line}2.3_-sroot@lt{right}_-a234.10.{line}2.10_-t10_udpbench' => { ipv => "IPv4", proto => "MCast", op => "Send", len => "MTU", streams => "parallel-10", name => "openbsd-linux-mcast4bench-parallel-mtu" }, + 'netbench.pl_-v_-B1000000000_-b1000000_-d1_-f1_-i0_-N10_-R{ifaddr}_-S{ifaddr}_-sroot@lt{right}_-a234.10.{line}2.10_-t10_udpbench' => { ipv => "IPv4", proto => "MCast", op => "Send", len => "MTU", streams => "parallel-10", name => "openbsd-linux-mcast4bench-parallel-mtu" }, 'netbench.pl_-v_-B1000000000_-b1000000_-d1_-f1_-i0_-N10_-R{ifname}_-S{ifname}_-sroot@lt{right}_-aff34:40:fdd7:e83e:66bd:10{line}2::10_-t10_udpbench' => { ipv => "IPv6", proto => "MCast", op => "Send", len => "MTU", streams => "parallel-10", name => "openbsd-linux-mcast6bench-parallel-mtu" }, ); diff --git a/netlink-html.pl b/netlink-html.pl index 1619aa8..d8ddfc1 100755 --- a/netlink-html.pl +++ b/netlink-html.pl @@ -642,6 +642,8 @@ sub parse_result_files { my $logfile = "$file->{dir}/logs/$test.log"; my $stats = "$file->{dir}/logs/$test.stats-netstat-diff.txt"; if ($test =~ /^netbench\.pl_/) { + # multicast interfaces depend on test and hardware + $test =~ s/(?<=_-[RS])[1-9][0-9.]+_/{ifaddr}_/g; $test =~ s/(?<=_-[RS])[a-z][a-z0-9.]+_/{ifname}_/g; } my $tv = $T{$test}{$date}{$hk} ||= {};