tests: *.t: Fix for hexadecimal output

Use hex input to avoid having to specify an expected output in trivial
cases.

Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/extensions/libxt_DSCP.t b/extensions/libxt_DSCP.t
index fcc55986dbcd7a3f0e7100b181e16a0aa95b5e0d..762fcd31d4d2870442a0c9a848eb7bc6aa05376c 100644 (file)
--- a/extensions/libxt_DSCP.t
+++ b/extensions/libxt_DSCP.t
@@ -1,6 +1,6 @@
 :PREROUTING,INPUT,FORWARD,OUTPUT,POSTROUTING
 *mangle
--j DSCP --set-dscp 0;=;OK
+-j DSCP --set-dscp 0x00;=;OK
 -j DSCP --set-dscp 0x3f;=;OK
 -j DSCP --set-dscp -1;;FAIL
 -j DSCP --set-dscp 0x40;;FAIL

diff --git a/extensions/libxt_MARK.t b/extensions/libxt_MARK.t
index 9d1aa7d7d58a4ed1dae9c4ffe6c03bd77771295a..2902a14f0674246ffadb24d8420c47b98a35e254 100644 (file)
--- a/extensions/libxt_MARK.t
+++ b/extensions/libxt_MARK.t
@@ -1,6 +1,6 @@
 :INPUT,FORWARD,OUTPUT
 -j MARK --set-xmark 0xfeedcafe/0xfeedcafe;=;OK
--j MARK --set-xmark 0;=;OK
+-j MARK --set-xmark 0x0;=;OK
 -j MARK --set-xmark 4294967295;-j MARK --set-xmark 0xffffffff;OK
 -j MARK --set-xmark 4294967296;;FAIL
 -j MARK --set-xmark -1;;FAIL

diff --git a/extensions/libxt_connmark.t b/extensions/libxt_connmark.t
index 4dd7d9af265a5c6e2dcbad77fc7fef762a3eb550..353970a8995f6e6a7cfc9371bbed9a721348f9f6 100644 (file)
--- a/extensions/libxt_connmark.t
+++ b/extensions/libxt_connmark.t
@@ -2,8 +2,8 @@
 *mangle
 -m connmark --mark 0xffffffff;=;OK
 -m connmark --mark 0xffffffff/0xffffffff;-m connmark --mark 0xffffffff;OK
--m connmark --mark 0xffffffff/0;=;OK
--m connmark --mark 0/0xffffffff;-m connmark --mark 0;OK
+-m connmark --mark 0xffffffff/0x0;=;OK
+-m connmark --mark 0/0xffffffff;-m connmark --mark 0x0;OK
 -m connmark --mark -1;;FAIL
 -m connmark --mark 0xfffffffff;;FAIL
 -m connmark;;FAIL

diff --git a/extensions/libxt_dscp.t b/extensions/libxt_dscp.t
index 38d7f04e18698d6ce188ccb822dfc86f0c4cdf84..e010190661ae8ff05bd7927fa33801906b33b0c3 100644 (file)
--- a/extensions/libxt_dscp.t
+++ b/extensions/libxt_dscp.t
@@ -1,5 +1,5 @@
 :INPUT,FORWARD,OUTPUT
--m dscp --dscp 0;=;OK
+-m dscp --dscp 0x00;=;OK
 -m dscp --dscp 0x3f;=;OK
 -m dscp --dscp -1;;FAIL
 -m dscp --dscp 0x40;;FAIL

diff --git a/extensions/libxt_mark.t b/extensions/libxt_mark.t
index 7c005379f6d64e2d3ad4d141b9b37d2e8f8dc7c6..7aeb871588ca69cc34691d4fc1dbd9e44d0e0954 100644 (file)
--- a/extensions/libxt_mark.t
+++ b/extensions/libxt_mark.t
@@ -1,6 +1,6 @@
 :INPUT,FORWARD,OUTPUT
 -m mark --mark 0xfeedcafe/0xfeedcafe;=;OK
--m mark --mark 0;=;OK
+-m mark --mark 0x0;=;OK
 -m mark --mark 4294967295;-m mark --mark 0xffffffff;OK
 -m mark --mark 4294967296;;FAIL
 -m mark --mark -1;;FAIL