From 00e8bd9bb72eb1357aab486e314b83f93dad0d2c Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Mon, 21 Sep 2020 20:12:23 +0200 Subject: 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 --- tests/hash:mac.t | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/hash:mac.t') diff --git a/tests/hash:mac.t b/tests/hash:mac.t index 361bf58..9192af0 100644 --- a/tests/hash:mac.t +++ b/tests/hash:mac.t @@ -19,15 +19,15 @@ # MAC: Delete the same value 0 ipset -D test 1:2:3:4:a:b # MAC: List set -0 ipset -L test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # MAC: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:mac.t.list2 +0 ./diff.sh .foo hash:mac.t.list2 # Sleep 5s so that element can time out 0 sleep 5 # MAC: List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # MAC: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:mac.t.list0 +0 ./diff.sh .foo hash:mac.t.list0 # MAC: Destroy test set 0 ipset -X test # MAC: Create a set with skbinfo extension @@ -45,9 +45,9 @@ # MAC: Add element with mark, skbprio and skbqueue 0 ipset a test 1:2:3:4:5:11 skbmark 0x11223344/0xffff0000 skbprio 2:1 skbqueue 8 # MAC: List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # MAC: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:mac.t.list1 +0 ./diff.sh .foo hash:mac.t.list1 # MAC: Destroy test set 0 ipset -X test # MAC: Create a set with small maxelem parameter @@ -63,9 +63,9 @@ # MAC: Add second element with another extension value 0 ipset -! a test 1:2:3:4:5:7 skbprio 1:12 skbqueue 8 # MAC: List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # MAC: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:mac.t.list3 +0 ./diff.sh .foo hash:mac.t.list3 # MAC: Destroy test set 0 ipset x test # eof -- cgit v1.2.3