netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ana Rey Botello <anarey@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: Ana Rey <anarey@gmail.com>
Subject: [PATCH] tests: regression: any/meta: revisit meta tests
Date: Fri, 20 Feb 2015 12:28:54 +0100	[thread overview]
Message-ID: <1424431734-2305-1-git-send-email-anarey@gmail.com> (raw)

From: Ana Rey <anarey@gmail.com>

Add, delete and rewrite some default outputs depending on the case.

Signed-off-by: Ana Rey <anarey@gmail.com>
---
 tests/regression/any/meta.t |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/regression/any/meta.t b/tests/regression/any/meta.t
index f11fd00..4b3d3fa 100644
--- a/tests/regression/any/meta.t
+++ b/tests/regression/any/meta.t
@@ -9,8 +9,8 @@
 meta length 1000;ok
 meta length 22;ok
 meta length != 233;ok
-meta length 33-45;ok
-meta length != 33-45;ok
+meta length 33-45;ok;meta length >= 33 meta length <= 45
+meta length != 33-45;ok;meta length < 33 meta length > 45
 meta length { 33, 55, 67, 88};ok
 - meta length != { 33, 55, 67, 88};ok
 meta length { 33-55};ok
@@ -96,8 +96,8 @@ meta skuid != man;ok;skuid != 6
 meta skuid lt 3000 accept;ok;skuid < 3000 accept
 meta skuid gt 3000 accept;ok;skuid > 3000 accept
 meta skuid eq 3000 accept;ok;skuid 3000 accept
-meta skuid 3001-3005 accept;ok
-meta skuid != 2001-2005 accept;ok
+meta skuid 3001-3005 accept;ok;skuid >= 3001 skuid <= 3005 accept
+meta skuid != 2001-2005 accept;ok;skuid < 2001 skuid > 2005 accept
 meta skuid { 2001-2005} accept;ok
 - meta skuid != { 2001-2005} accept;ok
 
@@ -108,8 +108,8 @@ meta skgid != man;ok;skgid != 12
 meta skgid lt 3000 accept;ok;skgid < 3000 accept
 meta skgid gt 3000 accept;ok;skgid > 3000 accept
 meta skgid eq 3000 accept;ok;skgid 3000 accept
-meta skgid 2001-2005 accept;ok
-meta skgid != 2001-2005 accept;ok
+meta skgid 2001-2005 accept;ok;skgid >= 2001 skgid <= 2005 accept
+meta skgid != 2001-2005 accept;ok;skgid < 2001 skgid > 2005 accept
 meta skgid { 2001-2005} accept;ok
 - meta skgid != { 2001-2005} accept;ok
 
@@ -123,14 +123,14 @@ meta skgid { 2001-2005} accept;ok
 # add rule ip test input meta nftrace 1
 # -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-meta mark set 0xffffffc8 xor 0x16;ok;meta mark set 0xffffffde
-meta mark set 0x16 and 0x16;ok;meta mark set 0x00000016
-meta mark set 0xffffffe9 or 0x16;ok;meta mark set 0xffffffff
-meta mark set 0xffffffde and 0x16;ok;meta mark set 0x00000016
-meta mark set 0xf045ffde or 0x10;ok;meta mark set 0xf045ffde
-meta mark set 0xffffffde or 0x16;ok;meta mark set 0xffffffde
-meta mark set 0x32 or 0xfffff;ok;meta mark set 0x000fffff
-meta mark set 0xfffe xor 0x16;ok;meta mark set 0x0000ffe8
+meta mark set 0xffffffc8 xor 0x16;ok;mark set 0xffffffde
+meta mark set 0x16 and 0x16;ok;mark set 0x00000016
+meta mark set 0xffffffe9 or 0x16;ok;mark set 0xffffffff
+meta mark set 0xffffffde and 0x16;ok;mark set 0x00000016
+meta mark set 0xf045ffde or 0x10;ok;mark set 0xf045ffde
+meta mark set 0xffffffde or 0x16;ok;mark set 0xffffffde
+meta mark set 0x32 or 0xfffff;ok;mark set 0x000fffff
+meta mark set 0xfffe xor 0x16;ok;mark set 0x0000ffe8
 
 meta iif lo;ok;iif lo
 meta oif lo;ok;oif lo
-- 
1.7.10.4


             reply	other threads:[~2015-02-20 11:28 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-20 11:28 Ana Rey Botello [this message]
2015-02-20 15:58 ` [PATCH] tests: regression: any/meta: revisit meta tests Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1424431734-2305-1-git-send-email-anarey@gmail.com \
    --to=anarey@gmail.com \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).