Update testsuite as the trailing space was eliminated at listings

diff --git a/tests/bitmap:ip.t b/tests/bitmap:ip.t
index 252bde498377e6eb7bb6a2bf80fc1af1e90a2d0e..88d399a9c80370a233dde61ad7ab805ed653cc35 100644 (file)
--- a/tests/bitmap:ip.t
+++ b/tests/bitmap:ip.t
@@ -110,11 +110,11 @@
 1 ipset add test 9.255.255.255
 # Subnets: Try to add element after upper boundary
 1 ipset add test 11.0.0.0
-# Subnets: Try to delete element not added to the set                           
-1 ipset -D test 10.2.0.0                                                        
-# Subnets: Add element to the set                                               
-0 ipset -A test 10.2.0.0                                                        
-# Subnets: Delete the same element from the set                                 
+# Subnets: Try to delete element not added to the set
+1 ipset -D test 10.2.0.0
+# Subnets: Add element to the set
+0 ipset -A test 10.2.0.0
+# Subnets: Delete the same element from the set
 0 ipset -D test 10.2.0.0
 # Subnets: Add a subnet of subnets
 0 ipset -A test 10.8.0.0/16 timeout 4
@@ -210,7 +210,7 @@
 0 ipset x test
 # Counters: require sendip
 skip which sendip
-# Counters: create set 
+# Counters: create set
 0 ipset n test bitmap:ip range 10.255.0.0/16 counters
 # Counters: add elemet with zero counters
 0 ipset a test 10.255.255.64
@@ -220,7 +220,7 @@ skip which sendip
 0 ./check_counters test 10.255.255.64 5 $((5*40))
 # Counters: destroy set
 0 ipset x test
-# Counters and timeout: create set 
+# Counters and timeout: create set
 0 ipset n test bitmap:ip range 10.255.0.0/16 counters timeout 600
 # Counters and timeout: add elemet with zero counters
 0 ipset a test 10.255.255.64

diff --git a/tests/bitmap:ip.t.list0 b/tests/bitmap:ip.t.list0
index e3bbf3b35520407cd7527edcb393542c4e23c9fd..c3166037f31e0533f830530edbc5cbdc1a3b681f 100644 (file)
--- a/tests/bitmap:ip.t.list0
+++ b/tests/bitmap:ip.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:ip
-Header: range 2.0.0.1-2.1.0.0 timeout 5 
+Header: range 2.0.0.1-2.1.0.0 timeout 5
 Size in memory: 524408
 References: 0
 Members:

diff --git a/tests/bitmap:ip.t.list1 b/tests/bitmap:ip.t.list1
index c97f35905ff822f0a76f78e7c2e853b3d7f2f9e9..3c94983d5e9519ac13909d8e64e4a300c5e47c6f 100644 (file)
--- a/tests/bitmap:ip.t.list1
+++ b/tests/bitmap:ip.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:ip
-Header: range 2.0.0.0-2.0.255.255 timeout 5 
+Header: range 2.0.0.0-2.0.255.255 timeout 5
 Size in memory: 524408
 References: 0
 Members:

diff --git a/tests/bitmap:ip.t.list2 b/tests/bitmap:ip.t.list2
index f3db85c5e4fbf10af24b5e8bb798de7a29797641..78bce6c24ae1555ea6c9bfed14d3d829ab53e7e0 100644 (file)
--- a/tests/bitmap:ip.t.list2
+++ b/tests/bitmap:ip.t.list2
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:ip
-Header: range 10.0.0.0-10.255.255.255 netmask 24 timeout 5 
+Header: range 10.0.0.0-10.255.255.255 netmask 24 timeout 5
 Size in memory: 524408
 References: 0
 Members:

diff --git a/tests/bitmap:ip.t.list3 b/tests/bitmap:ip.t.list3
index 8d427b5483ed2faff2ea09a2f1b330316d4fdff0..3f4e06447a3e6c4a7828eb63679e81e85a734180 100644 (file)
--- a/tests/bitmap:ip.t.list3
+++ b/tests/bitmap:ip.t.list3
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:ip
-Header: range 0.0.0.0-255.255.255.255 netmask 16 timeout 5 
+Header: range 0.0.0.0-255.255.255.255 netmask 16 timeout 5
 Size in memory: 524408
 References: 0
 Members:

diff --git a/tests/bitmap:ip.t.list4 b/tests/bitmap:ip.t.list4
index 43418be6977f0a79c57babc85f41e8c54b425af8..e706b67e6d971403256d675881ce1c62927a58a6 100644 (file)
--- a/tests/bitmap:ip.t.list4
+++ b/tests/bitmap:ip.t.list4
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:ip
-Header: range 2.0.0.1-2.1.0.0 timeout x 
+Header: range 2.0.0.1-2.1.0.0 timeout x
 Size in memory: 524408
 References: 0
 Members:

diff --git a/tests/bitmap:ip.t.list5 b/tests/bitmap:ip.t.list5
index 7d4c34dacd3f921c2dab91a9337910aa629a8fec..2d916352e181986d58348769c8305f08fea2ccbc 100644 (file)
--- a/tests/bitmap:ip.t.list5
+++ b/tests/bitmap:ip.t.list5
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:ip
-Header: range 2.0.0.0-2.0.255.255 timeout x 
+Header: range 2.0.0.0-2.0.255.255 timeout x
 Size in memory: 524408
 References: 0
 Members:

diff --git a/tests/bitmap:ip.t.list6 b/tests/bitmap:ip.t.list6
index e5a7c07e941ef40fe3c9be14a877a9fd08565628..68b1b0739ad630ddf8cf08eeb1483af890898f8a 100644 (file)
--- a/tests/bitmap:ip.t.list6
+++ b/tests/bitmap:ip.t.list6
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:ip
-Header: range 10.0.0.0-10.255.255.255 netmask 24 timeout x 
+Header: range 10.0.0.0-10.255.255.255 netmask 24 timeout x
 Size in memory: 524408
 References: 0
 Members:

diff --git a/tests/hash:ip,port,ip.t.list0 b/tests/hash:ip,port,ip.t.list0
index 779649f538114f8106dcca2bce9b44aff2e75e55..7218937c06f2ce0828a654f0b81c7b0c27667bb8 100644 (file)
--- a/tests/hash:ip,port,ip.t.list0
+++ b/tests/hash:ip,port,ip.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port,ip
-Header: family inet hashsize 1024 maxelem 65536 timeout x 
+Header: family inet hashsize 1024 maxelem 65536 timeout x
 Size in memory: 8720
 References: 0
 Members:

diff --git a/tests/hash:ip,port,ip.t.list1 b/tests/hash:ip,port,ip.t.list1
index 2e42e5a6ed486702be5702ebca5e3b81cc7fa264..78ad1fd14b09fec72d9a8cdaa3afa4557acd5b02 100644 (file)
--- a/tests/hash:ip,port,ip.t.list1
+++ b/tests/hash:ip,port,ip.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port,ip
-Header: family inet hashsize 1024 maxelem 65536 timeout 5 
+Header: family inet hashsize 1024 maxelem 65536 timeout 5
 Size in memory: 8304
 References: 0
 Members:

diff --git a/tests/hash:ip,port,net.t b/tests/hash:ip,port,net.t
index 22c2b131a527f967c190684d1f852e38195adc41..cb68cb80cdd591e0ec6429164b83ff1738a072c6 100644 (file)
--- a/tests/hash:ip,port,net.t
+++ b/tests/hash:ip,port,net.t
@@ -59,7 +59,7 @@
 # Add a non-matching IP address entry
 0 ipset -A test 2.2.2.2,80,1.1.1.1 nomatch
 # Add an overlapping matching small net
-0 ipset -A test 2.2.2.2,80,1.1.1.0/30 
+0 ipset -A test 2.2.2.2,80,1.1.1.0/30
 # Add an overlapping non-matching larger net
 0 ipset -A test 2.2.2.2,80,1.1.1.0/28 nomatch
 # Add an even larger matching net

diff --git a/tests/hash:ip,port,net.t.list0 b/tests/hash:ip,port,net.t.list0
index 3ce6e1f6385c0715342d7d0d0623fa56166fed44..c214eadb13df552828750e36ed06909128082040 100644 (file)
--- a/tests/hash:ip,port,net.t.list0
+++ b/tests/hash:ip,port,net.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port,net
-Header: family inet hashsize 1024 maxelem 65536 timeout x 
+Header: family inet hashsize 1024 maxelem 65536 timeout x
 Size in memory: 8720
 References: 0
 Members:

diff --git a/tests/hash:ip,port.t.list0 b/tests/hash:ip,port.t.list0
index 7896f573c82da37505277aa6c5c704cd7ffc3784..fb9c57b8031e4291550c617aa7fd4210cdbec11c 100644 (file)
--- a/tests/hash:ip,port.t.list0
+++ b/tests/hash:ip,port.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port
-Header: family inet hashsize 1024 maxelem 65536 timeout x 
+Header: family inet hashsize 1024 maxelem 65536 timeout x
 Size in memory: 8592
 References: 0
 Members:

diff --git a/tests/hash:ip,port.t.list1 b/tests/hash:ip,port.t.list1
index 0b71466f250dc771ad4d49eb500f7ebf6bcbfa71..eab115cc32abee4dbfabc1026cac10b66ea5539c 100644 (file)
--- a/tests/hash:ip,port.t.list1
+++ b/tests/hash:ip,port.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port
-Header: family inet hashsize 1024 maxelem 65536 timeout 5 
+Header: family inet hashsize 1024 maxelem 65536 timeout 5
 Size in memory: 8304
 References: 0
 Members:

diff --git a/tests/hash:ip,port.t.list2 b/tests/hash:ip,port.t.list2
index bb6e9e43c8a1bacb0d13ce50500b600693bdcafe..7e7f3adbbf6a5ceb176d79f226f8e0888369de2d 100644 (file)
--- a/tests/hash:ip,port.t.list2
+++ b/tests/hash:ip,port.t.list2
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port
-Header: family inet hashsize 1024 maxelem 65536 
+Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 8432
 References: 0
 Members:

diff --git a/tests/hash:ip.t b/tests/hash:ip.t
index 56b3004b46bb82d561313a84161eac9eaa586d39..2ad683150992e5716c5defa45af5f6cd9c2b476b 100644 (file)
--- a/tests/hash:ip.t
+++ b/tests/hash:ip.t
@@ -186,7 +186,7 @@
 0 ipset x test
 # Counters: require sendip
 skip which sendip
-# Counters: create set 
+# Counters: create set
 0 ipset n test hash:ip counters
 # Counters: add elemet with zero counters
 0 ipset a test 10.255.255.64
@@ -196,7 +196,7 @@ skip which sendip
 0 ./check_counters test 10.255.255.64 5 $((5*40))
 # Counters: destroy set
 0 ipset x test
-# Counters and timeout: create set 
+# Counters and timeout: create set
 0 ipset n test hash:ip counters timeout 600
 # Counters and timeout: add elemet with zero counters
 0 ipset a test 10.255.255.64

diff --git a/tests/hash:ip.t.list0 b/tests/hash:ip.t.list0
index 09a18507ce44ea980ee23d52fc0a9bc4634eb715..3d13afcf14b534be4313342e5b8aa7d514ddb0da 100644 (file)
--- a/tests/hash:ip.t.list0
+++ b/tests/hash:ip.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip
-Header: family inet hashsize 128 maxelem 65536 timeout 5 
+Header: family inet hashsize 128 maxelem 65536 timeout 5
 Size in memory: 1208
 References: 0
 Members:

diff --git a/tests/hash:ip.t.list1 b/tests/hash:ip.t.list1
index cb21bc41f4454c7ffd55bef4e5e94667e315ee99..ffd4f728e1eec15292cc2bdda67b3d52532ba26f 100644 (file)
--- a/tests/hash:ip.t.list1
+++ b/tests/hash:ip.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip
-Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout 5 
+Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout 5
 Size in memory: 1352
 References: 0
 Members:

diff --git a/tests/hash:ip.t.list2 b/tests/hash:ip.t.list2
index ec085bf412ecb19d3434d83b17927948f649da89..274cf47a46b599a2cde52b9265546fdb320521f3 100644 (file)
--- a/tests/hash:ip.t.list2
+++ b/tests/hash:ip.t.list2
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip
-Header: family inet hashsize 128 maxelem 65536 timeout x 
+Header: family inet hashsize 128 maxelem 65536 timeout x
 Size in memory: 1280
 References: 0
 Members:

diff --git a/tests/hash:ip.t.list3 b/tests/hash:ip.t.list3
index 7bdf31a56e7db3acb59d2dbb972c9cc319b587f2..50777103b777b3834a88235aa2102226bc1e3a10 100644 (file)
--- a/tests/hash:ip.t.list3
+++ b/tests/hash:ip.t.list3
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip
-Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout x 
+Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout x
 Size in memory: 1352
 References: 0
 Members:

diff --git a/tests/hash:ip6,port,ip6.t.list0 b/tests/hash:ip6,port,ip6.t.list0
index 061ea94cfbd01ff32aa3b96f455ccb0d2c2830ec..41ac1c0d00a1aa63b3fec90e3b4ce36fc6fbcb07 100644 (file)
--- a/tests/hash:ip6,port,ip6.t.list0
+++ b/tests/hash:ip6,port,ip6.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port,ip
-Header: family inet6 hashsize 1024 maxelem 65536 timeout x 
+Header: family inet6 hashsize 1024 maxelem 65536 timeout x
 Size in memory: 9104
 References: 0
 Members:

diff --git a/tests/hash:ip6,port,ip6.t.list1 b/tests/hash:ip6,port,ip6.t.list1
index b05e3ffa182f3e50da765e70f438d4cd0f819861..7a3a4adc3cd3fccf975f4d309d410a574b555639 100644 (file)
--- a/tests/hash:ip6,port,ip6.t.list1
+++ b/tests/hash:ip6,port,ip6.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port,ip
-Header: family inet6 hashsize 1024 maxelem 65536 timeout 5 
+Header: family inet6 hashsize 1024 maxelem 65536 timeout 5
 Size in memory: 8304
 References: 0
 Members:

diff --git a/tests/hash:ip6,port,net6.t b/tests/hash:ip6,port,net6.t
index d4f9f26675c849cff326f70668a1381391d78c4c..23a5da0422c6129c9bde81b38ee35f9df64a078d 100644 (file)
--- a/tests/hash:ip6,port,net6.t
+++ b/tests/hash:ip6,port,net6.t
@@ -55,7 +55,7 @@
 # Add a non-matching IP address entry
 0 ipset -A test 2:2:2::2,80,1:1:1::1 nomatch
 # Add an overlapping matching small net
-0 ipset -A test 2:2:2::2,80,1:1:1::/124 
+0 ipset -A test 2:2:2::2,80,1:1:1::/124
 # Add an overlapping non-matching larger net
 0 ipset -A test 2:2:2::2,80,1:1:1::/120 nomatch
 # Add an even larger matching net

diff --git a/tests/hash:ip6,port,net6.t.list0 b/tests/hash:ip6,port,net6.t.list0
index 0b0fabd4ae7df765764d4c380c9cd92b87b28243..78472ffdf4214e876c026f0dda94b64962cbd0fe 100644 (file)
--- a/tests/hash:ip6,port,net6.t.list0
+++ b/tests/hash:ip6,port,net6.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port,net
-Header: family inet6 hashsize 1024 maxelem 65536 
+Header: family inet6 hashsize 1024 maxelem 65536
 Size in memory: 9928
 References: 0
 Members:

diff --git a/tests/hash:ip6,port.t.list0 b/tests/hash:ip6,port.t.list0
index d64f0db46da473a2d079456ecc5e3cfd33ef9538..5edbaac6affb120d6a2f41e9cc278cba0d651a94 100644 (file)
--- a/tests/hash:ip6,port.t.list0
+++ b/tests/hash:ip6,port.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port
-Header: family inet6 hashsize 1024 maxelem 65536 timeout x 
+Header: family inet6 hashsize 1024 maxelem 65536 timeout x
 Size in memory: 8848
 References: 0
 Members:

diff --git a/tests/hash:ip6,port.t.list1 b/tests/hash:ip6,port.t.list1
index 31c2fd50959e5188ef0423b8243f7d2d7977d2cd..bf31179285db3e83f24a0c2d3e48b0607ed3fa18 100644 (file)
--- a/tests/hash:ip6,port.t.list1
+++ b/tests/hash:ip6,port.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port
-Header: family inet6 hashsize 1024 maxelem 65536 timeout 5 
+Header: family inet6 hashsize 1024 maxelem 65536 timeout 5
 Size in memory: 8304
 References: 0
 Members:

diff --git a/tests/hash:ip6.t.list0 b/tests/hash:ip6.t.list0
index 25df7d9739c390cd1f9c59224731ecf934a3d799..df81e38274098e2f21a4565f6413dbbcab63e18b 100644 (file)
--- a/tests/hash:ip6.t.list0
+++ b/tests/hash:ip6.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip
-Header: family inet6 hashsize 128 maxelem 65536 timeout 5 
+Header: family inet6 hashsize 128 maxelem 65536 timeout 5
 Size in memory: 1240
 References: 0
 Members:

diff --git a/tests/hash:ip6.t.list1 b/tests/hash:ip6.t.list1
index 215677d21988e78d5f7e727688e9f0423af48ea6..c3b1c303f718bb19820497689a00a4af3e4db16e 100644 (file)
--- a/tests/hash:ip6.t.list1
+++ b/tests/hash:ip6.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip
-Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout 5 
+Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout 5
 Size in memory: 1448
 References: 0
 Members:

diff --git a/tests/hash:ip6.t.list2 b/tests/hash:ip6.t.list2
index 339bf3f3d3e60e5ad41c7e97988f0c56287b5a0d..1989efd911487edae1b6257095d68df0134d5979 100644 (file)
--- a/tests/hash:ip6.t.list2
+++ b/tests/hash:ip6.t.list2
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip
-Header: family inet6 hashsize 128 maxelem 65536 timeout x 
+Header: family inet6 hashsize 128 maxelem 65536 timeout x
 Size in memory: 1344
 References: 0
 Members:

diff --git a/tests/hash:ip6.t.list3 b/tests/hash:ip6.t.list3
index b7f7d12f87a79608dfe2f3e79fce1ea8738e1231..ece96d64e369df7f27ca26dc4433bef0c24f5142 100644 (file)
--- a/tests/hash:ip6.t.list3
+++ b/tests/hash:ip6.t.list3
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip
-Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout x 
+Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout x
 Size in memory: 1448
 References: 0
 Members:

diff --git a/tests/hash:net,iface.t.list0 b/tests/hash:net,iface.t.list0
index 1771fcae282fb68ef476e4617b10e5ed88418861..4bf10fe97e769a7cfb9c0b59a54d8e8e24531e1b 100644 (file)
--- a/tests/hash:net,iface.t.list0
+++ b/tests/hash:net,iface.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:net,iface
-Header: family inet hashsize 128 maxelem 65536 
+Header: family inet hashsize 128 maxelem 65536
 Size in memory: 2928
 References: 0
 Members:

diff --git a/tests/hash:net,iface.t.list1 b/tests/hash:net,iface.t.list1
index 4a298e2713955d6fa0e2833cb8876832237038c3..de561299d6356a5d21ab8ffda753308eb73b3ffd 100644 (file)
--- a/tests/hash:net,iface.t.list1
+++ b/tests/hash:net,iface.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:net,iface
-Header: family inet hashsize 1024 maxelem 65536 
+Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 18512
 References: 0
 Members:

diff --git a/tests/hash:net,iface.t.list2 b/tests/hash:net,iface.t.list2
index 89aa033bd6bee2874c5b612de37a5a570563f911..fbd502c95040e4ce170243f8cee7374d8771e793 100644 (file)
--- a/tests/hash:net,iface.t.list2
+++ b/tests/hash:net,iface.t.list2
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:net,iface
-Header: family inet hashsize 1024 maxelem 65536 
+Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 17168
 References: 0
 Members:

diff --git a/tests/hash:net,port.t b/tests/hash:net,port.t
index 3d1586b99593462891f90ff17b525a2c261caa46..abe565f8752b03899dc22ac286adb9b60bb55859 100644 (file)
--- a/tests/hash:net,port.t
+++ b/tests/hash:net,port.t
@@ -81,7 +81,7 @@
 # Add a non-matching IP address entry
 0 ipset -A test 1.1.1.1,80 nomatch
 # Add an overlapping matching small net
-0 ipset -A test 1.1.1.0/30,80 
+0 ipset -A test 1.1.1.0/30,80
 # Add an overlapping non-matching larger net
 0 ipset -A test 1.1.1.0/28,80 nomatch
 # Add an even larger matching net

diff --git a/tests/hash:net,port.t.list0 b/tests/hash:net,port.t.list0
index 60244a01aacf2010a870ac2fc0d6d4c4a03a555d..e28b4a38436006ade6026a3854f690d85031b9b0 100644 (file)
--- a/tests/hash:net,port.t.list0
+++ b/tests/hash:net,port.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:net,port
-Header: family inet hashsize 128 maxelem 65536 timeout x 
+Header: family inet hashsize 128 maxelem 65536 timeout x
 Size in memory: 2072
 References: 0
 Members:

diff --git a/tests/hash:net,port.t.list1 b/tests/hash:net,port.t.list1
index 753c5753d533105a788ccf8b3ea69710b2a2ceff..10031e4b356a73dadca68b7f99b680272911eb83 100644 (file)
--- a/tests/hash:net,port.t.list1
+++ b/tests/hash:net,port.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:net,port
-Header: family inet hashsize 128 maxelem 65536 timeout 5 
+Header: family inet hashsize 128 maxelem 65536 timeout 5
 Size in memory: 2000
 References: 0
 Members:

diff --git a/tests/hash:net.t b/tests/hash:net.t
index ef82a6e1f8419d54cb470d33864d869ddedf4096..0c997dd80f0cc362460d420c19fa4474984223fc 100644 (file)
--- a/tests/hash:net.t
+++ b/tests/hash:net.t
@@ -67,7 +67,7 @@
 # Add a non-matching IP address entry
 0 ipset -A test 1.1.1.1 nomatch
 # Add an overlapping matching small net
-0 ipset -A test 1.1.1.0/30 
+0 ipset -A test 1.1.1.0/30
 # Add an overlapping non-matching larger net
 0 ipset -A test 1.1.1.0/28 nomatch
 # Add an even larger matching net

diff --git a/tests/hash:net.t.list0 b/tests/hash:net.t.list0
index 7e4d92bbd12639acd97e27285f2eb47cbd553394..a71fa740c8f48b2de556cb22d504fb38b744cd8c 100644 (file)
--- a/tests/hash:net.t.list0
+++ b/tests/hash:net.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:net
-Header: family inet hashsize 128 maxelem 65536 timeout x 
+Header: family inet hashsize 128 maxelem 65536 timeout x
 Size in memory: 1672
 References: 0
 Members:

diff --git a/tests/hash:net.t.list1 b/tests/hash:net.t.list1
index fb8dc80deffa941374da940a79be7c3063387f6f..7ea6afc527c79bbcaa6e2fef7450967a900c85d4 100644 (file)
--- a/tests/hash:net.t.list1
+++ b/tests/hash:net.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:net
-Header: family inet hashsize 128 maxelem 65536 timeout 5 
+Header: family inet hashsize 128 maxelem 65536 timeout 5
 Size in memory: 1672
 References: 0
 Members:

diff --git a/tests/hash:net.t.list2 b/tests/hash:net.t.list2
index dad3f22b4eab681b1d12596f36785e2aa5d234b8..bc81b5e6f18aceda5e3f5527c9301416efdc8d4a 100644 (file)
--- a/tests/hash:net.t.list2
+++ b/tests/hash:net.t.list2
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:net
-Header: family inet hashsize 1024 maxelem 65536 
+Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 17016
 References: 0
 Members:

diff --git a/tests/hash:net6,port.t b/tests/hash:net6,port.t
index 06f82b7419b060109449f5abc6d697a05ffaed98..a47ece73a205a7ef2ed6c9f44d36102fb2b7a85d 100644 (file)
--- a/tests/hash:net6,port.t
+++ b/tests/hash:net6,port.t
@@ -83,7 +83,7 @@
 # Add a non-matching IP address entry
 0 ipset -A test 1:1:1::1,80 nomatch
 # Add an overlapping matching small net
-0 ipset -A test 1:1:1::/124,80 
+0 ipset -A test 1:1:1::/124,80
 # Add an overlapping non-matching larger net
 0 ipset -A test 1:1:1::/120,80 nomatch
 # Add an even larger matching net

diff --git a/tests/hash:net6,port.t.list0 b/tests/hash:net6,port.t.list0
index f574d2c6f4c95d22e4a5bb4e551b77f6feaa0521..f0a27b44b4944299fc63d88b973bfe16ccaa9499 100644 (file)
--- a/tests/hash:net6,port.t.list0
+++ b/tests/hash:net6,port.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:net,port
-Header: family inet6 hashsize 128 maxelem 65536 timeout x 
+Header: family inet6 hashsize 128 maxelem 65536 timeout x
 Size in memory: 2328
 References: 0
 Members:

diff --git a/tests/hash:net6,port.t.list1 b/tests/hash:net6,port.t.list1
index f3b23cbfe3740e22c78d445a92fb09b9c785c9bb..e5e90a46ff6a91617c84ab0cb4b43c520830efd3 100644 (file)
--- a/tests/hash:net6,port.t.list1
+++ b/tests/hash:net6,port.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:net,port
-Header: family inet6 hashsize 128 maxelem 65536 timeout 5 
+Header: family inet6 hashsize 128 maxelem 65536 timeout 5
 Size in memory: 2328
 References: 0
 Members:

diff --git a/tests/hash:net6.t b/tests/hash:net6.t
index 981dfdbcf3a75a68a77afcbf9489b87d80d9fe24..fc377f49ab9915f3e56a340e0ee98cc10a18b5cd 100644 (file)
--- a/tests/hash:net6.t
+++ b/tests/hash:net6.t
@@ -51,7 +51,7 @@
 # Add a non-matching IP address entry
 0 ipset -A test 1:1:1::1 nomatch
 # Add an overlapping matching small net
-0 ipset -A test 1:1:1::/124 
+0 ipset -A test 1:1:1::/124
 # Add an overlapping non-matching larger net
 0 ipset -A test 1:1:1::/120 nomatch
 # Add an even larger matching net

diff --git a/tests/hash:net6.t.list0 b/tests/hash:net6.t.list0
index 4b06c8cc05b051040e0b78caba1433cbe54391ec..52b0ce532d5d78b23a70848a85f08dff6e8a0f29 100644 (file)
--- a/tests/hash:net6.t.list0
+++ b/tests/hash:net6.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:net
-Header: family inet6 hashsize 128 maxelem 65536 timeout x 
+Header: family inet6 hashsize 128 maxelem 65536 timeout x
 Size in memory: 2696
 References: 0
 Members:

diff --git a/tests/hash:net6.t.list1 b/tests/hash:net6.t.list1
index 891c0ce27bd29d62fba08e2ef768d18c7860702a..e92da5298978201491e35fd3a475328c3d880246 100644 (file)
--- a/tests/hash:net6.t.list1
+++ b/tests/hash:net6.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:net
-Header: family inet6 hashsize 128 maxelem 65536 timeout 5 
+Header: family inet6 hashsize 128 maxelem 65536 timeout 5
 Size in memory: 2696
 References: 0
 Members:

diff --git a/tests/iphash.t b/tests/iphash.t
index 8fd0836c0832cb0b1d621b3cc7a95e3d3f3922fa..f7fdab39b97f9428aaf7728ab1e7efe592209b53 100644 (file)
--- a/tests/iphash.t
+++ b/tests/iphash.t
@@ -1,5 +1,5 @@
-# IP: Create a set 
-0 ipset -N test iphash --hashsize 128 
+# IP: Create a set
+0 ipset -N test iphash --hashsize 128
 # Range: Add zero valued element
 1 ipset -A test 0.0.0.0
 # Range: Test zero valued element
@@ -52,7 +52,7 @@
 0 (sort iphash.t.large > .foo.2) && (cmp .foo.1 .foo.2)
 # IP: Delete test set
 0 ipset x test
-# Network: Create a set 
+# Network: Create a set
 0 ipset -N test iphash --hashsize 128 --netmask 24
 # Network: Add zero valued element
 1 ipset -A test 0.0.0.0

diff --git a/tests/iphash.t.large b/tests/iphash.t.large
index a6506923c6ba93e480e479a8018a7e6087cf9276..24cc1258c88d680ec21059d2d1becf8593aa529a 100644 (file)
--- a/tests/iphash.t.large
+++ b/tests/iphash.t.large
@@ -1,4 +1,4 @@
-create test hash:ip family inet hashsize 1024 maxelem 65536 
+create test hash:ip family inet hashsize 1024 maxelem 65536
 add test 10.10.0.0
 add test 10.10.0.1
 add test 10.10.0.2

diff --git a/tests/iphash.t.list0 b/tests/iphash.t.list0
index b871248cf489c33e64be58791fb8de87888ab69f..2302485af8c331dccf919e3b8c966c0e70a89e2e 100644 (file)
--- a/tests/iphash.t.list0
+++ b/tests/iphash.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip
-Header: family inet hashsize 128 maxelem 65536 
+Header: family inet hashsize 128 maxelem 65536
 Size in memory: 1184
 References: 0
 Members:

diff --git a/tests/iphash.t.list1 b/tests/iphash.t.list1
index 652c366576995330da12cd9ef85e1341dd73dfeb..ea5d2a19cfefd095b0728fe3487c15d255a90521 100644 (file)
--- a/tests/iphash.t.list1
+++ b/tests/iphash.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip
-Header: family inet hashsize 128 maxelem 65536 netmask 24 
+Header: family inet hashsize 128 maxelem 65536 netmask 24
 Size in memory: 1184
 References: 0
 Members:

diff --git a/tests/ipmap.t b/tests/ipmap.t
index 684fb7d957ec3ca7e1ed30754cb6f72306166a73..7ae141c040f90dca6bf7b7336d0228887b669a99 100644 (file)
--- a/tests/ipmap.t
+++ b/tests/ipmap.t
@@ -43,7 +43,7 @@
 # Range: Restore set and catch error
 1 sed 's/2.0.0.131/222.0.0.131/' < ipmap.t.restore | ipset -R
 # Range: Check returned error line number
-0 num=`grep 'in line' < .foo.err | sed 's/.* in line //' | cut -d : -f 1` && test $num -eq 6 
+0 num=`grep 'in line' < .foo.err | sed 's/.* in line //' | cut -d : -f 1` && test $num -eq 6
 # Range: Destroy set
 0 ipset -X test
 # Range: Restore set

diff --git a/tests/ipmap.t.list0 b/tests/ipmap.t.list0
index c97caef3ffa48887e938b8dd65f59721918a108a..c1c4360e7c0f13668f0e31a3b20761927bd4dfac 100644 (file)
--- a/tests/ipmap.t.list0
+++ b/tests/ipmap.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:ip
-Header: range 2.0.0.1-2.1.0.0 
+Header: range 2.0.0.1-2.1.0.0
 Size in memory: 8232
 References: 0
 Members:

diff --git a/tests/ipmap.t.list1 b/tests/ipmap.t.list1
index d971782b1a5861c969d568c230c4cea61449ebf2..abfc98d4a75c064624b5ddf22badf5417bc07cc4 100644 (file)
--- a/tests/ipmap.t.list1
+++ b/tests/ipmap.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:ip
-Header: range 2.0.0.1-2.1.0.0 
+Header: range 2.0.0.1-2.1.0.0
 Size in memory: 8232
 References: 0
 Members:

diff --git a/tests/ipmap.t.list2 b/tests/ipmap.t.list2
index 09a305c21b25d721ddc7e4ebae4dfb41a33d2bd9..932cad28f6dcefe83bf017ff357e2e7dd98aab96 100644 (file)
--- a/tests/ipmap.t.list2
+++ b/tests/ipmap.t.list2
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:ip
-Header: range 2.0.0.0-2.0.255.255 
+Header: range 2.0.0.0-2.0.255.255
 Size in memory: 8232
 References: 0
 Members:

diff --git a/tests/ipmap.t.list3 b/tests/ipmap.t.list3
index 037051b7e65666be10cffec1dfb12feb6460e9b1..ab391d01a3ac5104a1544d547c3c67c4b0a4ff20 100644 (file)
--- a/tests/ipmap.t.list3
+++ b/tests/ipmap.t.list3
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:ip
-Header: range 10.0.0.0-10.255.255.255 netmask 24 
+Header: range 10.0.0.0-10.255.255.255 netmask 24
 Size in memory: 8232
 References: 0
 Members:

diff --git a/tests/ipmap.t.list4 b/tests/ipmap.t.list4
index 7135ff49712b51c989700bf07a3f31200eb863fa..eaff22091f55aff53d14f3319fd2330e8ec4e3b4 100644 (file)
--- a/tests/ipmap.t.list4
+++ b/tests/ipmap.t.list4
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:ip
-Header: range 0.0.0.0-255.255.255.255 netmask 16 
+Header: range 0.0.0.0-255.255.255.255 netmask 16
 Size in memory: 8232
 References: 0
 Members:

diff --git a/tests/ipporthash.t.list0 b/tests/ipporthash.t.list0
index c31e15102430ad1e94cd5dd7df1e4957f1e551c6..20c805dd77418136aca3f5de888e1636a39ef671 100644 (file)
--- a/tests/ipporthash.t.list0
+++ b/tests/ipporthash.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port
-Header: family inet hashsize 1024 maxelem 65536 
+Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 8464
 References: 0
 Members:

diff --git a/tests/ipporthash.t.list1 b/tests/ipporthash.t.list1
index a99b8dbd73a68f5a7b1518fa2f249875d2df40c6..0834a00170a3de2d12efd044a898550aa264a4a8 100644 (file)
--- a/tests/ipporthash.t.list1
+++ b/tests/ipporthash.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port
-Header: family inet hashsize 1024 maxelem 65536 
+Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 8464
 References: 0
 Members:

diff --git a/tests/ipportiphash.t.list0 b/tests/ipportiphash.t.list0
index 055aaf29ec0366436e18019d23ee518767ea2b4a..fc881ada3de9428d536479b0738570f9b2eb9414 100644 (file)
--- a/tests/ipportiphash.t.list0
+++ b/tests/ipportiphash.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port,ip
-Header: family inet hashsize 1024 maxelem 65536 
+Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 8528
 References: 0
 Members:

diff --git a/tests/ipportiphash.t.list1 b/tests/ipportiphash.t.list1
index 22784b7fe622d49f2a91792dc3966175248d166b..9a7d1f0f90912e35ca452fdc3b06cdd618afb1b3 100644 (file)
--- a/tests/ipportiphash.t.list1
+++ b/tests/ipportiphash.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port,ip
-Header: family inet hashsize 1024 maxelem 65536 
+Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 8416
 References: 0
 Members:

diff --git a/tests/ipportnethash.t b/tests/ipportnethash.t
index f5be27f5560bfd7a7ea2c375c6ab64a2c1dc7312..b34d46d88ccd7981a0ad5ee0f6fee993973f414b 100644 (file)
--- a/tests/ipportnethash.t
+++ b/tests/ipportnethash.t
@@ -73,7 +73,7 @@
 # Add a non-matching IP address entry
 0 ipset -A test 2.1.0.0,80,1.1.1.1 nomatch
 # Add an overlapping matching small net
-0 ipset -A test 2.1.0.0,80,1.1.1.0/30 
+0 ipset -A test 2.1.0.0,80,1.1.1.0/30
 # Add an overlapping non-matching larger net
 0 ipset -A test 2.1.0.0,80,1.1.1.0/28 nomatch
 # Add an even larger matching net

diff --git a/tests/ipportnethash.t.list0 b/tests/ipportnethash.t.list0
index 96fa73f182b6b15318a5c21f9372eef6d3f2ef59..27470321c5d80fe83a47e34e864b78217ece0128 100644 (file)
--- a/tests/ipportnethash.t.list0
+++ b/tests/ipportnethash.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port,net
-Header: family inet hashsize 1024 maxelem 65536 
+Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 8776
 References: 0
 Members:

diff --git a/tests/ipportnethash.t.list1 b/tests/ipportnethash.t.list1
index 2d287e45406adf23366ee3a91237928299ab0700..76becdb401df3a9c6fb5593f44143412b90e2852 100644 (file)
--- a/tests/ipportnethash.t.list1
+++ b/tests/ipportnethash.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip,port,net
-Header: family inet hashsize 1024 maxelem 65536 
+Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 8776
 References: 0
 Members:

diff --git a/tests/iptree.t.list0 b/tests/iptree.t.list0
index 73beb61c88078350058554eeeae4ef10150a316c..c5f1527fa8ae98446f326c8b00ae0313c901e702 100644 (file)
--- a/tests/iptree.t.list0
+++ b/tests/iptree.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip
-Header: family inet hashsize 1024 maxelem 65536 
+Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 8352
 References: 0
 Members:

diff --git a/tests/iptreemap.t.list0 b/tests/iptreemap.t.list0
index a1c7435493497298d7fc1bdaa688922831993006..4c664723581123bef5a257cbf1a42ba650ff7a7d 100644 (file)
--- a/tests/iptreemap.t.list0
+++ b/tests/iptreemap.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:ip
-Header: family inet hashsize 1024 maxelem 65536 
+Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 9048
 References: 0
 Members:

diff --git a/tests/macipmap.t.list0 b/tests/macipmap.t.list0
index 7239eb01ae9e29de9359cb3c8bd00ac45a2058ef..d37e5601c7a61d54d9bc5a2e29c09c3344c6628a 100644 (file)
--- a/tests/macipmap.t.list0
+++ b/tests/macipmap.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:ip,mac
-Header: range 2.0.0.1-2.1.0.0 
+Header: range 2.0.0.1-2.1.0.0
 Size in memory: 458864
 References: 0
 Members:

diff --git a/tests/macipmap.t.list1 b/tests/macipmap.t.list1
index 2c4a80003967c1938b108e06aa3182ca770589ea..0447c41d6f79ced07437ef5c615614a84ff0842f 100644 (file)
--- a/tests/macipmap.t.list1
+++ b/tests/macipmap.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:ip,mac
-Header: range 2.0.0.0-2.0.255.255 
+Header: range 2.0.0.0-2.0.255.255
 Size in memory: 458864
 References: 0
 Members:

diff --git a/tests/macipmap.t.list2 b/tests/macipmap.t.list2
index b4d943ba437a7fb86cdd52a7e57ef9c7abbde4dc..0c8bf6f692d49c4b43e1f8b7c54227f12e945fb4 100644 (file)
--- a/tests/macipmap.t.list2
+++ b/tests/macipmap.t.list2
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:ip,mac
-Header: range 2.0.0.1-2.1.0.0 timeout x 
+Header: range 2.0.0.1-2.1.0.0 timeout x
 Size in memory: 1048688
 References: 0
 Members:

diff --git a/tests/macipmap.t.list3 b/tests/macipmap.t.list3
index 93a0db3967a572426e9c96a1aad71cbf8c652448..bf78821447158787b04a8197d1d35679ebb446f9 100644 (file)
--- a/tests/macipmap.t.list3
+++ b/tests/macipmap.t.list3
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:ip,mac
-Header: range 2.0.0.1-2.1.0.0 timeout x 
+Header: range 2.0.0.1-2.1.0.0 timeout x
 Size in memory: 1048688
 References: 0
 Members:

diff --git a/tests/match_target.t b/tests/match_target.t
index 4a2b9be508301af3b9745ab788cf15ba7c745f3b..cab818426a5dd95f98f2b6dd93fa0268972c9433 100644 (file)
--- a/tests/match_target.t
+++ b/tests/match_target.t
@@ -22,7 +22,7 @@
 0 ipset test ipport 10.255.255.64,tcp:1025
 # Check that 10.255.255.64,udp:1025 is not in ipport set
 1 ipset test ipport 10.255.255.64,udp:1025
-# Send probe packet from 10.255.255.64,udp:1025 
+# Send probe packet from 10.255.255.64,udp:1025
 0 sendip -p ipv4 -id 127.0.0.1 -is 10.255.255.64 -p udp -ud 80 -us 1025 127.0.0.1
 # Check that proper sets matched and target worked
 0 ./check_klog.sh 10.255.255.64 udp 1025 ipport list
@@ -61,7 +61,7 @@
 # Create set and rules to check --exist and --timeout flags of SET target
 0 ./iptables.sh inet timeout
 # Add 10.255.255.64,icmp:host-prohibited to the set
-0 ipset add test 10.255.255.64,icmp:host-prohibited 
+0 ipset add test 10.255.255.64,icmp:host-prohibited
 # Check that 10.255.255.64,icmp:3/10 is in ipport set
 0 ipset test test 10.255.255.64,icmp:host-prohibited
 # Sleep 3s so that entry can time out

diff --git a/tests/match_target6.t b/tests/match_target6.t
index 15a3b9e802d1abb120832913ca024318cf21ddeb..86197c0e2d1504ffbe0484752ef827db3396b39f 100644 (file)
--- a/tests/match_target6.t
+++ b/tests/match_target6.t
@@ -22,7 +22,7 @@
 0 ipset test ipport 1002:1002:1002:1002::64,tcp:1025
 # Check that 1002:1002:1002:1002::64,udp:1025 is not in ipport set
 1 ipset test ipport 1002:1002:1002:1002::64,udp:1025
-# Send probe packet from 1002:1002:1002:1002::64,udp:1025 
+# Send probe packet from 1002:1002:1002:1002::64,udp:1025
 0 sendip -p ipv6 -6d ::1 -6s 1002:1002:1002:1002::64 -p udp -ud 80 -us 1025 ::1
 # Check that proper sets matched and target worked
 0 ./check_klog.sh 1002:1002:1002:1002::64 udp 1025 ipport list

diff --git a/tests/nethash.t b/tests/nethash.t
index 273ceeba8da80cbe641aac461d55cd7180c4a425..05e64c38b878137c3ec6c3aec9217ab58bc583dc 100644 (file)
--- a/tests/nethash.t
+++ b/tests/nethash.t
@@ -1,5 +1,5 @@
-# Create a set 
-0 ipset -N test nethash --hashsize 128 
+# Create a set
+0 ipset -N test nethash --hashsize 128
 # Add zero valued element
 1 ipset -A test 0.0.0.0/0
 # Test zero valued element
@@ -41,7 +41,7 @@
 # Add a non-matching IP address entry
 0 ipset -A test 1.1.1.1 nomatch
 # Add an overlapping matching small net
-0 ipset -A test 1.1.1.0/30 
+0 ipset -A test 1.1.1.0/30
 # Add an overlapping non-matching larger net
 0 ipset -A test 1.1.1.0/28 nomatch
 # Add an even larger matching net

diff --git a/tests/nethash.t.list0 b/tests/nethash.t.list0
index 4c73c564f0df7b794752e4efc391148a5a9868ba..1a157e985532105671adc566297b0ac89d52c8e5 100644 (file)
--- a/tests/nethash.t.list0
+++ b/tests/nethash.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: hash:net
-Header: family inet hashsize 128 maxelem 65536 
+Header: family inet hashsize 128 maxelem 65536
 Size in memory: 1544
 References: 0
 Members:

diff --git a/tests/portmap.t.list0 b/tests/portmap.t.list0
index 88636c18f52a5d051389eba83ba0f627381b72bd..4ff6b1faaeb8d0ebf2309c03f7fee45670a9815e 100644 (file)
--- a/tests/portmap.t.list0
+++ b/tests/portmap.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:port
-Header: range 1-1024 
+Header: range 1-1024
 Size in memory: 152
 References: 0
 Members:

diff --git a/tests/portmap.t.list1 b/tests/portmap.t.list1
index 1dff3130def93a9e8595301b2d48f8b4b4fd0bbc..a34caba622b175c8fb8349e4c7f3676670fdb9e7 100644 (file)
--- a/tests/portmap.t.list1
+++ b/tests/portmap.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:port
-Header: range 0-65535 
+Header: range 0-65535
 Size in memory: 8216
 References: 0
 Members:

diff --git a/tests/portmap.t.list2 b/tests/portmap.t.list2
index f2e511f0c79b1904c46a7934c8020e148f157515..6afaf023b0f313d1bbeec368f11bc935fe8ba48a 100644 (file)
--- a/tests/portmap.t.list2
+++ b/tests/portmap.t.list2
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:port
-Header: range 0-65535 timeout 8 
+Header: range 0-65535 timeout 8
 Elements: 1
 Size in memory: 524288
 References: 0

diff --git a/tests/portmap.t.list3 b/tests/portmap.t.list3
index 1af93d6d19e278b4b2f6225d9e0e1e4b90a44217..441da01fcf35b7e1cabb38b3f416cadfc4b902c4 100644 (file)
--- a/tests/portmap.t.list3
+++ b/tests/portmap.t.list3
@@ -1,6 +1,6 @@
 Name: test
 Type: bitmap:port
-Header: range 0-65535 timeout x 
+Header: range 0-65535 timeout x
 Size in memory: 524400
 References: 0
 Members:

diff --git a/tests/restore.t.list0 b/tests/restore.t.list0
index 6c5688581837603e947d8bef4453a5a032f5c297..65aa8b84f47da94ed01f07d80dc69780b6d852ff 100644 (file)
--- a/tests/restore.t.list0
+++ b/tests/restore.t.list0
@@ -1,6 +1,6 @@
 Name: a
 Type: hash:ip
-Header: family inet6 hashsize 1024 maxelem 65536 
+Header: family inet6 hashsize 1024 maxelem 65536
 Size in memory: 16704
 References: 0
 Members:

diff --git a/tests/restore.t.list1 b/tests/restore.t.list1
index 146748d5d8d2d6676f6a724b43d8451cb10cf587..0602ab6a948bc6038391c61806a63d6455b2e98d 100644 (file)
--- a/tests/restore.t.list1
+++ b/tests/restore.t.list1
@@ -1,6 +1,6 @@
 Name: b
 Type: hash:ip
-Header: family inet6 hashsize 1024 maxelem 65536 
+Header: family inet6 hashsize 1024 maxelem 65536
 Size in memory: 16704
 References: 0
 Members:

diff --git a/tests/restore.t.multi.saved b/tests/restore.t.multi.saved
index cbbf7cc04a3c265b9abd100bfddb4e15cd159717..5a569bad7057850aed64512f66866352f1201e6a 100644 (file)
--- a/tests/restore.t.multi.saved
+++ b/tests/restore.t.multi.saved
@@ -1,4 +1,4 @@
-create priviledged-ports bitmap:port range 1-1023 timeout 0 
+create priviledged-ports bitmap:port range 1-1023 timeout 0
 add priviledged-ports 1 timeout 0
 add priviledged-ports 2 timeout 0
 add priviledged-ports 3 timeout 0
@@ -1022,7 +1022,7 @@ add priviledged-ports 1020 timeout 0
 add priviledged-ports 1021 timeout 0
 add priviledged-ports 1022 timeout 0
 add priviledged-ports 1023 timeout 0
-create test-net bitmap:ip range 10.1.1.168-10.1.1.175 timeout 0 
+create test-net bitmap:ip range 10.1.1.168-10.1.1.175 timeout 0
 add test-net 10.1.1.168 timeout 0
 add test-net 10.1.1.169 timeout 0
 add test-net 10.1.1.170 timeout 0
@@ -1031,7 +1031,7 @@ add test-net 10.1.1.172 timeout 0
 add test-net 10.1.1.173 timeout 0
 add test-net 10.1.1.174 timeout 0
 add test-net 10.1.1.175 timeout 0
-create test-ports bitmap:port range 12770-19999 timeout 0 
+create test-ports bitmap:port range 12770-19999 timeout 0
 add test-ports 12770 timeout 0
 add test-ports 12771 timeout 0
 add test-ports 12772 timeout 0
@@ -1048,5 +1048,5 @@ add test-ports 12782 timeout 0
 add test-ports 12783 timeout 0
 add test-ports 12784 timeout 0
 add test-ports 19999 timeout 0
-create test-port bitmap:port range 29950-29950 timeout 0 
+create test-port bitmap:port range 29950-29950 timeout 0
 add test-port 29950 timeout 0

diff --git a/tests/setlist.t b/tests/setlist.t
index d505f61cdbf0b9ad7a3050ae850d395e6d30fa39..78fe32359f521aeda4c3759360c45fc64708b0c5 100644 (file)
--- a/tests/setlist.t
+++ b/tests/setlist.t
@@ -177,9 +177,9 @@
 0 ipset x
 # Counters: require sendip
 skip which sendip >/dev/null
-# Counters: create set 
+# Counters: create set
 0 ipset n a hash:ip counters
-# Counters: create list set 
+# Counters: create list set
 0 ipset n test list:set counters
 # Counters: add elemet with zero counters
 0 ipset a a 10.255.255.64
@@ -195,9 +195,9 @@ skip which sendip >/dev/null
 0 ipset f
 # Counters: destroy sets
 0 ipset x
-# Counters and timeout: create set 
+# Counters and timeout: create set
 0 ipset n a hash:ip counters timeout 600
-# Counters and timeout: create list set 
+# Counters and timeout: create list set
 0 ipset n test list:set counters timeout 600
 # Counters and timeout: add elemet with zero counters
 0 ipset a a 10.255.255.64

diff --git a/tests/setlist.t.list0 b/tests/setlist.t.list0
index ab0ddee5fdedb53d70a8cedf20c73bb61ef30bf1..c413c26a2262b96a455ccec176895ec4e262eed6 100644 (file)
--- a/tests/setlist.t.list0
+++ b/tests/setlist.t.list0
@@ -1,6 +1,6 @@
 Name: test
 Type: list:set
-Header: size 8 
+Header: size 8
 Size in memory: 112
 References: 0
 Members:

diff --git a/tests/setlist.t.list1 b/tests/setlist.t.list1
index 419a03fe35c2e11bc4eda43d60d8ab7ab173fbaf..47ba1752fcaa3b8d87c59b70aa552127ee5b9e23 100644 (file)
--- a/tests/setlist.t.list1
+++ b/tests/setlist.t.list1
@@ -1,6 +1,6 @@
 Name: test
 Type: list:set
-Header: size 8 
+Header: size 8
 Size in memory: 120
 References: 0
 Members:

diff --git a/tests/setlist.t.list2 b/tests/setlist.t.list2
index dff031420b5f59d20d4118b032ea37d81a99bfa6..d1bb378e1e72bd5967e5eb0736fd7c40a5a0fed6 100644 (file)
--- a/tests/setlist.t.list2
+++ b/tests/setlist.t.list2
@@ -1,6 +1,6 @@
 Name: test
 Type: list:set
-Header: size 8 
+Header: size 8
 Size in memory: 120
 References: 0
 Members:

diff --git a/tests/setlist.t.list3 b/tests/setlist.t.list3
index 1fdb7e5340316147d077c26e1f30c50618cac906..0a9e0b4a55dfc20a0276976c5a5a2699d050b22e 100644 (file)
--- a/tests/setlist.t.list3
+++ b/tests/setlist.t.list3
@@ -1,6 +1,6 @@
 Name: test
 Type: list:set
-Header: size 8 
+Header: size 8
 Size in memory: 120
 References: 0
 Members:

diff --git a/tests/setlist.t.list4 b/tests/setlist.t.list4
index 956d59e2d80857531bb0b325690a012f9044b639..bce582489a5dae4b7ab060dab3fdcece686161e5 100644 (file)
--- a/tests/setlist.t.list4
+++ b/tests/setlist.t.list4
@@ -1,34 +1,34 @@
 Name: a
 Type: hash:ip
-Header: family inet hashsize 1024 maxelem 65536 
+Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 16504
 References: 1
 Members:
 
 Name: b
 Type: hash:ip
-Header: family inet hashsize 1024 maxelem 65536 
+Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 16504
 References: 0
 Members:
 
 Name: c
 Type: hash:ip
-Header: family inet hashsize 1024 maxelem 65536 
+Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 16504
 References: 0
 Members:
 
 Name: d
 Type: hash:ip
-Header: family inet hashsize 1024 maxelem 65536 
+Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 16504
 References: 0
 Members:
 
 Name: test
 Type: list:set
-Header: size 8 
+Header: size 8
 Size in memory: 112
 References: 0
 Members: