diff options
| author | Jozsef Kadlecsik <kadlec@netfilter.org> | 2020-09-21 20:12:23 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@netfilter.org> | 2020-09-21 20:12:23 +0200 |
| commit | 00e8bd9bb72eb1357aab486e314b83f93dad0d2c (patch) | |
| tree | 2222d756d82d88a0872688ca61cdadd147a84ddb /tests/hash:net,iface.t | |
| parent | de340a7f1a9cf21931d94ea8814545c4b2d172b0 (diff) | |
Handle all variable header parts in helper scripts instead ot test tasks
Thus the tests tasks can be simplified and all exceptions can be handled in
the helper scripts.
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Diffstat (limited to 'tests/hash:net,iface.t')
| -rw-r--r-- | tests/hash:net,iface.t | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/hash:net,iface.t b/tests/hash:net,iface.t index a847357..e594cca 100644 --- a/tests/hash:net,iface.t +++ b/tests/hash:net,iface.t @@ -41,9 +41,9 @@ # Try to add IP address 0 ipset add test 2.0.0.1,eth0 # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net,iface.t.list0 +0 ./diff.sh .foo hash:net,iface.t.list0 # Flush test set 0 ipset flush test # Delete test set @@ -53,9 +53,9 @@ # Add networks in range notation 0 ipset add test 10.2.0.0-10.2.1.12,eth0 # List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net,iface.t.list2 +0 ./diff.sh .foo hash:net,iface.t.list2 # Flush test set 0 ipset flush test # Add 0/0,eth0 @@ -117,9 +117,9 @@ # Add overlapping networks from /4 to /30 0 (set -e; for x in `seq 4 30`; do ipset add test 192.0.0.0/$x,eth$x; done) # List test set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net,iface.t.list1 +0 ./diff.sh .foo hash:net,iface.t.list1 # Test matching elements in all added networks from /30 to /24 0 (set -e; y=2; for x in `seq 24 30 | tac`; do ipset test test 192.0.0.$y,eth$x; y=$((y*2)); done) # Test non-matching elements in all added networks from /30 to /24 |