In the test files, some lines defining tables was commented out with a
minus "-" sign, also used to mark broken rules. This commit replaces
these signs with actual comments "#" and removes the code that handled
the situation.
Signed-off-by: Pablo M. Bermudo Garay <pablombg@xxxxxxxxx>
---
tests/regression/any/ct.t | 4 ++--
tests/regression/ip/icmp.t | 2 +-
tests/regression/ip6/icmpv6.t | 2 +-
tests/regression/ip6/snat.t | 2 +-
tests/regression/nft-test.py | 2 --
5 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/tests/regression/any/ct.t b/tests/regression/any/ct.t
index ab4b167..0f5394a 100644
--- a/tests/regression/any/ct.t
+++ b/tests/regression/any/ct.t
@@ -2,8 +2,8 @@
*ip6;test-ip6
*inet;test-inet
# ct expresion is not supported in arp and bridge family yet.
-- *arp;test-arp
-- *bridge;test-bridge
+# *arp;test-arp
+# *bridge;test-bridge
:output;type filter hook output priority 0
diff --git a/tests/regression/ip/icmp.t b/tests/regression/ip/icmp.t
index 9c2aba7..bd00f5c 100644
--- a/tests/regression/ip/icmp.t
+++ b/tests/regression/ip/icmp.t
@@ -1,6 +1,6 @@
*ip;test-ip4
# BUG: There is a bug with icmp protocol and inet family.
-- *inet;test-inet
+# *inet;test-inet
:input;type filter hook input priority 0
icmp type echo-reply accept;ok
diff --git a/tests/regression/ip6/icmpv6.t b/tests/regression/ip6/icmpv6.t
index c86c825..fca903f 100644
--- a/tests/regression/ip6/icmpv6.t
+++ b/tests/regression/ip6/icmpv6.t
@@ -1,6 +1,6 @@
*ip6;test-ip6
# BUG: There is a bug with icmpv6 and inet tables
-- *inet;test-inet
+# *inet;test-inet
:input;type filter hook input priority 0
icmpv6 type destination-unreachable accept;ok
diff --git a/tests/regression/ip6/snat.t b/tests/regression/ip6/snat.t
index 44ca9e4..8f841da 100644
--- a/tests/regression/ip6/snat.t
+++ b/tests/regression/ip6/snat.t
@@ -1,5 +1,5 @@
*ip6;test-ip6
-- *inet;test-inet
+# *inet;test-inet
:postrouting;type nat hook postrouting priority 0
tcp dport 80-90 snat 2001:838:35f:1::-2001:838:35f:2:: :80-100;ok;tcp dport 80-90 snat 2001:838:35f:1::-2001:838:35f:2:::80-100
diff --git a/tests/regression/nft-test.py b/tests/regression/nft-test.py
index 0b0be5d..9d623b7 100755
--- a/tests/regression/nft-test.py
+++ b/tests/regression/nft-test.py
@@ -809,8 +809,6 @@ def run_test_file(filename, force_all_family_option, specific_file):
# Rule
rule = line.split(';') # rule[1] Ok or FAIL
if line[0] == "-": # Run omitted lines
- if line[1:].find("*") != -1:
- continue
if need_fix_option:
rule[0] = rule[0].rstrip()[1:].strip()
else:
--
2.6.2
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
