From 99632dd169d7db6c66abc06df017de83feec2d38 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sun, 31 May 2015 18:20:02 +0200 Subject: tests: regression: fix warnings related to range listing Fix lots of warnings, mostly related to the listing of ranges in many of the tests that we have, eg. any/meta.t: WARNING: line: 30: 'nft add rule ip test-ip4 input meta l4proto 33-45': 'meta l4proto 33-45' mismatches 'meta l4proto 33-45' any/meta.t: WARNING: line: 31: 'nft add rule ip test-ip4 input meta l4proto != 33-45': 'meta l4proto != 33-45' mismatches 'meta l4proto != 33-45' any/meta.t: WARNING: line: 99: 'nft add rule ip test-ip4 input meta skuid 3001-3005 accept': 'meta skuid 3001-3005 accept' mismatches 'skuid 3001-3005 accept' any/meta.t: WARNING: line: 100: 'nft add rule ip test-ip4 input meta skuid != 2001-2005 accept': 'meta skuid != 2001-2005 accept' mismatches 'skuid != 2001-2005 accept' any/meta.t: WARNING: line: 111: 'nft add rule ip test-ip4 input meta skgid 2001-2005 accept': 'meta skgid 2001-2005 accept' mismatches 'skgid 2001-2005 accept' any/meta.t: WARNING: line: 112: 'nft add rule ip test-ip4 input meta skgid != 2001-2005 accept': 'meta skgid != 2001-2005 accept' mismatches 'skgid != 2001-2005 accept' any/meta.t: WARNING: line: 156: 'nft add rule ip test-ip4 input meta cpu 1-3': 'meta cpu 1-3' mismatches 'cpu 1-3' any/meta.t: WARNING: line: 158: 'nft add rule ip test-ip4 input meta cpu != 1-2': 'meta cpu != 1-2' mismatches 'cpu != 1-2' any/meta.t: WARNING: line: 187: 'nft add rule ip test-ip4 input meta cgroup 0x100001 - 0x100003': 'meta cgroup 0x100001 - 0x100003' mismatches 'cgroup 1048577-1048579' ... Signed-off-by: Pablo Neira Ayuso --- tests/regression/inet/tcp.t | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'tests/regression/inet/tcp.t') diff --git a/tests/regression/inet/tcp.t b/tests/regression/inet/tcp.t index f72ec52b..5eb3882c 100644 --- a/tests/regression/inet/tcp.t +++ b/tests/regression/inet/tcp.t @@ -5,8 +5,8 @@ tcp dport 22;ok tcp dport != 233;ok -tcp dport 33-45;ok;tcp dport >= 33 tcp dport <= 45 -tcp dport != 33-45;ok;tcp dport < 33 tcp dport > 45 +tcp dport 33-45;ok +tcp dport != 33-45;ok tcp dport { 33, 55, 67, 88};ok - tcp dport != { 33, 55, 67, 88};ok tcp dport { 33-55};ok @@ -21,8 +21,8 @@ tcp dport { 22, 53, 80, 110 };ok tcp sport 22;ok tcp sport != 233;ok -tcp sport 33-45;ok;tcp sport >= 33 tcp sport <= 45 -tcp sport != 33-45;ok;tcp sport < 33 tcp sport > 45 +tcp sport 33-45;ok +tcp sport != 33-45;ok tcp sport { 33, 55, 67, 88};ok - tcp sport != { 33, 55, 67, 88};ok tcp sport { 33-55};ok @@ -33,13 +33,13 @@ tcp sport 8080 drop;ok tcp sport 1024 tcp dport 22;ok tcp sport 1024 tcp dport 22 tcp sequence 0;ok -tcp sequence 0 tcp sport 1024 tcp dport 22;ok;tcp sport 1024 tcp dport 22 tcp sequence 0 +tcp sequence 0 tcp sport 1024 tcp dport 22;ok tcp sequence 0 tcp sport { 1024, 1022} tcp dport 22;ok tcp sequence 22;ok tcp sequence != 233;ok -tcp sequence 33-45;ok;tcp sequence >= 33 tcp sequence <= 45 -tcp sequence != 33-45;ok;tcp sequence < 33 tcp sequence > 45 +tcp sequence 33-45;ok +tcp sequence != 33-45;ok tcp sequence { 33, 55, 67, 88};ok - tcp sequence != { 33, 55, 67, 88};ok tcp sequence { 33-55};ok @@ -48,8 +48,8 @@ tcp sequence { 33-55};ok tcp ackseq 42949672 drop;ok tcp ackseq 22;ok tcp ackseq != 233;ok -tcp ackseq 33-45;ok;tcp ackseq >= 33 tcp ackseq <= 45 -tcp ackseq != 33-45;ok;tcp ackseq < 33 tcp ackseq > 45 +tcp ackseq 33-45;ok +tcp ackseq != 33-45;ok tcp ackseq { 33, 55, 67, 88};ok - tcp ackseq != { 33, 55, 67, 88};ok tcp ackseq { 33-55};ok @@ -75,8 +75,8 @@ tcp flags != cwr;ok tcp window 22222;ok tcp window 22;ok tcp window != 233;ok -tcp window 33-45;ok;tcp window >= 33 tcp window <= 45 -tcp window != 33-45;ok;tcp window < 33 tcp window > 45 +tcp window 33-45;ok +tcp window != 33-45;ok tcp window { 33, 55, 67, 88};ok - tcp window != { 33, 55, 67, 88};ok tcp window { 33-55};ok @@ -85,8 +85,8 @@ tcp window { 33-55};ok tcp checksum 23456 log drop;ok tcp checksum 22;ok tcp checksum != 233;ok -tcp checksum 33-45;ok;tcp checksum >= 33 tcp checksum <= 45 -tcp checksum != 33-45;ok;tcp checksum < 33 tcp checksum > 45 +tcp checksum 33-45;ok +tcp checksum != 33-45;ok tcp checksum { 33, 55, 67, 88};ok - tcp checksum != { 33, 55, 67, 88};ok tcp checksum { 33-55};ok @@ -95,8 +95,8 @@ tcp checksum { 33-55};ok tcp urgptr 1234 accept;ok tcp urgptr 22;ok tcp urgptr != 233;ok -tcp urgptr 33-45;ok;tcp urgptr >= 33 tcp urgptr <= 45 -tcp urgptr != 33-45;ok;tcp urgptr < 33 tcp urgptr > 45 +tcp urgptr 33-45;ok +tcp urgptr != 33-45;ok tcp urgptr { 33, 55, 67, 88};ok - tcp urgptr != { 33, 55, 67, 88};ok tcp urgptr { 33-55};ok -- cgit v1.2.3