With --disable-ipv6 gone, the IPv6 detection logic in the tests is not needed anymore either.
Signed-off-by: David Lamparter <[email protected]> --- tests/bgpd.tests/testbgpcap.exp | 6 +++--- tests/bgpd.tests/testbgpmpattr.exp | 14 +++++++------- tests/config/unix.exp | 20 -------------------- 3 files changed, 10 insertions(+), 30 deletions(-) diff --git a/tests/bgpd.tests/testbgpcap.exp b/tests/bgpd.tests/testbgpcap.exp index 1bbdfd1..2572623 100644 --- a/tests/bgpd.tests/testbgpcap.exp +++ b/tests/bgpd.tests/testbgpcap.exp @@ -8,10 +8,10 @@ spawn "./testbgpcap" # proc simpletest { start } { simpletest "MP4: MP IP/Uni" -simpletest_nov6 "MPv6: MP IPv6/Uni" +simpletest "MPv6: MP IPv6/Uni" simpletest "MP2: MP IP/Multicast" -simpletest_nov6 "MP3: MP IP6/MPLS-labeled VPN" -simpletest_nov6 "MP5: MP IP6/MPLS-VPN" +simpletest "MP3: MP IP6/MPLS-labeled VPN" +simpletest "MP5: MP IP6/MPLS-VPN" simpletest "MP6: MP IP4/MPLS-laveled VPN" simpletest "MP8: MP unknown AFI/SAFI" simpletest "MP-short: MP IP4/Unicast, length too short (< minimum)" diff --git a/tests/bgpd.tests/testbgpmpattr.exp b/tests/bgpd.tests/testbgpmpattr.exp index 93355ad..646bbe5 100644 --- a/tests/bgpd.tests/testbgpmpattr.exp +++ b/tests/bgpd.tests/testbgpmpattr.exp @@ -7,10 +7,10 @@ spawn "./testbgpmpattr" # proc simpletest { start } { -simpletest_nov6 "IPv6: IPV6 MP Reach, global nexthop, 1 NLRI" -simpletest_nov6 "IPv6-2: IPV6 MP Reach, global nexthop, 2 NLRIs" -simpletest_nov6 "IPv6-default: IPV6 MP Reach, global nexthop, 2 NLRIs + default" -simpletest_nov6 "IPv6-lnh: IPV6 MP Reach, global+local nexthops, 2 NLRIs + default" +simpletest "IPv6: IPV6 MP Reach, global nexthop, 1 NLRI" +simpletest "IPv6-2: IPV6 MP Reach, global nexthop, 2 NLRIs" +simpletest "IPv6-default: IPV6 MP Reach, global nexthop, 2 NLRIs + default" +simpletest "IPv6-lnh: IPV6 MP Reach, global+local nexthops, 2 NLRIs + default" simpletest "IPv6-nhlen: IPV6 MP Reach, inappropriate nexthop length" simpletest "IPv6-nhlen2: IPV6 MP Reach, invalid nexthop length" simpletest "IPv6-nhlen3: IPV6 MP Reach, nexthop length overflow" @@ -21,9 +21,9 @@ simpletest "IPv4-nhlen: IPv4 MP Reach, nexthop lenth overflow" simpletest "IPv4-nlrilen: IPv4 MP Reach, nlri lenth overflow" simpletest "IPv4-MLVPN: IPv4/MPLS-labeled VPN MP Reach, RD, Nexthop, 3 NLRIs" simpletest "IPv6-bug: IPv6, global nexthop, 1 default NLRI" -simpletest_nov6 "IPv6-unreach: IPV6 MP Unreach, 1 NLRI" -simpletest_nov6 "IPv6-unreach2: IPV6 MP Unreach, 2 NLRIs" -simpletest_nov6 "IPv6-unreach-default: IPV6 MP Unreach, 2 NLRIs + default" +simpletest "IPv6-unreach: IPV6 MP Unreach, 1 NLRI" +simpletest "IPv6-unreach2: IPV6 MP Unreach, 2 NLRIs" +simpletest "IPv6-unreach-default: IPV6 MP Unreach, 2 NLRIs + default" simpletest "IPv6-unreach-nlri: IPV6 MP Unreach, NLRI bitlen overflow" simpletest "IPv4-unreach: IPv4 MP Unreach, 2 NLRIs + default" simpletest "IPv4-unreach-nlrilen: IPv4 MP Unreach, nlri length overflow" diff --git a/tests/config/unix.exp b/tests/config/unix.exp index b41f072..2f6bcea 100644 --- a/tests/config/unix.exp +++ b/tests/config/unix.exp @@ -8,16 +8,6 @@ # be part of the output... #set color 1 -set config_h [open "../config.h" "r"] -set config_h_text [read $config_h] -close $config_h -set i [string first "#define HAVE_IPV6" $config_h_text] -if { $i >= 0 } { - set have_ipv6 1 -} else { - set have_ipv6 0 -} -send_user "IPv6 enabled: $have_ipv6\n" set xfail 0 proc onesimple { test_name match } { @@ -110,13 +100,3 @@ proc simpletest { start } { onetest "$start" "" "$start" } -proc simpletest_nov6 { start } { - global have_ipv6 - global xfail - - set xfail [expr 1-$have_ipv6] - onetest "$start" "" "$start" - set xfail 0 -} - - -- 2.0.4 _______________________________________________ Quagga-dev mailing list [email protected] https://lists.quagga.net/mailman/listinfo/quagga-dev
