From 09bc401f9d73293ce0af088d23757c434c706291 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu Date: Fri, 8 Nov 2019 18:56:02 +0000 Subject: [PATCH] Reenable netinet6 and netpfil tests on i386, net/scapy 2.4.3_2 contains the fix PR: 239380 Sponsored by: The FreeBSD Foundation --- tests/sys/netinet6/exthdr.sh | 5 ----- tests/sys/netinet6/scapyi386.sh | 5 ----- tests/sys/netpfil/common/forward.sh | 4 ---- tests/sys/netpfil/common/tos.sh | 4 ---- tests/sys/netpfil/pf/forward.sh | 8 -------- tests/sys/netpfil/pf/set_tos.sh | 4 ---- 6 files changed, 30 deletions(-) diff --git a/tests/sys/netinet6/exthdr.sh b/tests/sys/netinet6/exthdr.sh index 663c89c43b96..9785250742f1 100755 --- a/tests/sys/netinet6/exthdr.sh +++ b/tests/sys/netinet6/exthdr.sh @@ -38,11 +38,6 @@ exthdr_head() { exthdr_body() { - if [ "$(atf_config_get ci false)" = "true" ] && \ - [ "$(uname -p)" = "i386" ]; then - atf_skip "https://bugs.freebsd.org/241493" - fi - ids=65533 id=`printf "%x" ${ids}` if [ $$ -gt 65535 ]; then diff --git a/tests/sys/netinet6/scapyi386.sh b/tests/sys/netinet6/scapyi386.sh index 48a34305917b..2ff2ebbbe340 100755 --- a/tests/sys/netinet6/scapyi386.sh +++ b/tests/sys/netinet6/scapyi386.sh @@ -38,11 +38,6 @@ scapyi386_head() { scapyi386_body() { - if [ "$(atf_config_get ci false)" = "true" ] && \ - [ "$(uname -p)" = "i386" ]; then - atf_skip "https://bugs.freebsd.org/239380" - fi - ids=65533 id=`printf "%x" ${ids}` if [ $$ -gt 65535 ]; then diff --git a/tests/sys/netpfil/common/forward.sh b/tests/sys/netpfil/common/forward.sh index 0b2f7acfb785..9f73bb139598 100755 --- a/tests/sys/netpfil/common/forward.sh +++ b/tests/sys/netpfil/common/forward.sh @@ -40,10 +40,6 @@ v4_head() v4_body() { firewall=$1 - if [ "$(atf_config_get ci false)" = "true" ] && \ - [ "$(uname -p)" = "i386" ] && [ "${firewall}" = "pf" ]; then - atf_skip "https://bugs.freebsd.org/240085" - fi firewall_init $firewall epair_send=$(vnet_mkepair) diff --git a/tests/sys/netpfil/common/tos.sh b/tests/sys/netpfil/common/tos.sh index 0b8bbb7dfc3e..452c6a002bbf 100644 --- a/tests/sys/netpfil/common/tos.sh +++ b/tests/sys/netpfil/common/tos.sh @@ -40,10 +40,6 @@ tos_head() tos_body() { firewall=$1 - if [ "$(atf_config_get ci false)" = "true" ] && \ - [ "$(uname -p)" = "i386" ] && [ "${firewall}" = "pf" ]; then - atf_skip "https://bugs.freebsd.org/240086" - fi firewall_init $firewall epair_send=$(vnet_mkepair) diff --git a/tests/sys/netpfil/pf/forward.sh b/tests/sys/netpfil/pf/forward.sh index e8fa425a307b..7d5bde00d137 100755 --- a/tests/sys/netpfil/pf/forward.sh +++ b/tests/sys/netpfil/pf/forward.sh @@ -41,10 +41,6 @@ v4_head() v4_body() { - if [ `uname -p` = "i386" ]; then - atf_skip "https://bugs.freebsd.org/239380" - fi - pft_init epair_send=$(vnet_mkepair) @@ -104,10 +100,6 @@ v6_head() v6_body() { - if [ `uname -p` = "i386" ]; then - atf_skip "https://bugs.freebsd.org/239380" - fi - pft_init epair_send=$(vnet_mkepair) diff --git a/tests/sys/netpfil/pf/set_tos.sh b/tests/sys/netpfil/pf/set_tos.sh index 4f386b545691..55d0059aa133 100755 --- a/tests/sys/netpfil/pf/set_tos.sh +++ b/tests/sys/netpfil/pf/set_tos.sh @@ -41,10 +41,6 @@ v4_head() v4_body() { - if [ `uname -p` = "i386" ]; then - atf_skip "https://bugs.freebsd.org/239380" - fi - pft_init epair_send=$(vnet_mkepair)