Testsuite changes: keep temporary files

Keep temporary files in the tests and erase them only after successfully
running the testsuite. This makes simpler to analyze failed tests.

diff --git a/tests/bitmap:ip.t b/tests/bitmap:ip.t
index 271bf8936bea741d2b2eb52700c7367b9ff9f9dc..341ebf05138693b8acd44bf8ef3436c597108dd5 100644 (file)
--- a/tests/bitmap:ip.t
+++ b/tests/bitmap:ip.t
@@ -37,13 +37,13 @@
 # Range: List set
 0 ipset list test | sed 's/timeout ./timeout x/' > .foo
 # Range: Check listing
-0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list4 && rm .foo
+0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list4
 # Sleep 5s so that entries can time out
 0 sleep 5s
 # Range: List set after timeout
 0 ipset list test > .foo
 # Range: Check listing
-0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list0
 # Range: Flush test set
 0 ipset flush test
 # Range: Delete test set
@@ -79,13 +79,13 @@
 # Network: List set
 0 ipset list test | sed 's/timeout ./timeout x/' > .foo
 # Network: Check listing
-0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list5 && rm .foo
+0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list5
 # Sleep 5s so that entries can time out
 0 sleep 5s
 # Network: List set
 0 ipset list test > .foo
 # Network: Check listing
-0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list1
 # Network: Flush test set
 0 ipset flush test
 # Network: Delete test set
@@ -121,13 +121,13 @@
 # Subnets: List set
 0 ipset list test | sed 's/timeout ./timeout x/' > .foo
 # Subnets: Check listing
-0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list6 && rm .foo
+0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list6
 # Sleep 5s so that entries can time out
 0 sleep 5s
 # Subnets: List set
 0 ipset list test > .foo
 # Subnets: Check listing
-0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list2 && rm .foo
+0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list2
 # Subnets: Flush test set
 0 ipset flush test
 # Subnets: Delete test set
@@ -147,7 +147,7 @@
 # Full: List set
 0 ipset list test > .foo
 # Full: Check listing
-0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list3 && rm .foo
+0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list3
 # Full: flush set
 0 ipset flush test
 # Full: add element with 1s timeout

diff --git a/tests/hash:ip,port,ip.t b/tests/hash:ip,port,ip.t
index 951cf26ce1bb2f0fbc6bae2935ef5c41004e92ea..76a5def270dd83a5c4f9dec26b599e9ab9ea31eb 100644 (file)
--- a/tests/hash:ip,port,ip.t
+++ b/tests/hash:ip,port,ip.t
@@ -37,13 +37,13 @@
 # List set
 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip,port,ip.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip,port,ip.t.list0
 # Sleep 5s so that elements can time out
 0 sleep 5
 # List set
 0 ipset list test > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip,port,ip.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip,port,ip.t.list1
 # Flush test set
 0 ipset flush test
 # Add multiple elements in one step

diff --git a/tests/hash:ip,port,net.t b/tests/hash:ip,port,net.t
index 97eae8da11034d190b153b02a11d835b733dab86..abc1b762896c3fa3748976c5b38a5d0eaf095509 100644 (file)
--- a/tests/hash:ip,port,net.t
+++ b/tests/hash:ip,port,net.t
@@ -29,7 +29,7 @@
 # List set
 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip,port,net.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip,port,net.t.list0
 # Sleep 5s so that elements can time out
 0 sleep 5
 # List set

diff --git a/tests/hash:ip,port.t b/tests/hash:ip,port.t
index 020be72910243f7e3f79a8b401a27ccbf1c82e74..5c1bf812527d16c8718c8c26f1054a673520986d 100644 (file)
--- a/tests/hash:ip,port.t
+++ b/tests/hash:ip,port.t
@@ -29,13 +29,13 @@
 # List set
 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip,port.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip,port.t.list0
 # Sleep 5s so that elements can time out
 0 sleep 5
 # List set
 0 ipset list test > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip,port.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip,port.t.list1
 # Flush test set
 0 ipset flush test
 # Add multiple elements in one step
@@ -71,7 +71,7 @@
 # List set
 0 ipset list test > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip,port.t.list2 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip,port.t.list2
 # Delete set
 0 ipset destroy test
 # eof

diff --git a/tests/hash:ip.t b/tests/hash:ip.t
index ce8b14b8176fb27e3739ccc8c64ee98013a17f4a..5c65915cfe2b20d1c029f5cf96c393863e3f9948 100644 (file)
--- a/tests/hash:ip.t
+++ b/tests/hash:ip.t
@@ -21,13 +21,13 @@
 # IP: List set
 0 ipset -L test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
 # IP: Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip.t.list2 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip.t.list2
 # Sleep 5s so that element can time out
 0 sleep 5
 # IP: List set
 0 ipset -L test 2>/dev/null > .foo0 && ./sort.sh .foo0
 # IP: Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip.t.list0
 # IP: Flush test set
 0 ipset -F test
 # IP: Add multiple elements in one step
@@ -87,13 +87,13 @@
 # Network: List set
 0 ipset -L test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
 # Network: Check listing
-0 diff -I 'Size in memory.*' -I 'Size in memory.*' .foo hash:ip.t.list3 && rm .foo
+0 diff -I 'Size in memory.*' -I 'Size in memory.*' .foo hash:ip.t.list3
 # Sleep 5s so that elements can time out
 0 sleep 5
 # Network: List set
 0 ipset -L test > .foo
 # Network: Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip.t.list1
 # Network: Flush test set
 0 ipset -F test
 # Network: add element with 1s timeout

diff --git a/tests/hash:ip6,port,ip6.t b/tests/hash:ip6,port,ip6.t
index 93d2861c2dad499174b81bf788a4f91c2a546965..85c1e02fdb7aae24a5bab6fc6265ea3e2fe2f8e8 100644 (file)
--- a/tests/hash:ip6,port,ip6.t
+++ b/tests/hash:ip6,port,ip6.t
@@ -37,13 +37,13 @@
 # List set
 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip6,port,ip6.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip6,port,ip6.t.list0
 # Sleep 5s so that elements can time out
 0 sleep 5
 # List set
 0 ipset list test > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip6,port,ip6.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip6,port,ip6.t.list1
 # Flush test set
 0 ipset flush test
 # Add multiple elements in one step

diff --git a/tests/hash:ip6,port,net6.t b/tests/hash:ip6,port,net6.t
index 4980b3ba476c6817ddb25a7ee016aae9c1c595ed..5c5610769d70ce532555491c83a99e107073d24c 100644 (file)
--- a/tests/hash:ip6,port,net6.t
+++ b/tests/hash:ip6,port,net6.t
@@ -37,7 +37,7 @@
 # Range: List set
 0 ipset -L test > .foo0 && ./sort.sh .foo0
 # Range: Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip6,port,net6.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip6,port,net6.t.list0
 # Range: Flush test set
 0 ipset -F test
 # Range: Delete test set

diff --git a/tests/hash:ip6,port.t b/tests/hash:ip6,port.t
index 26d53001acfdfbf235fb84cd4ccda4705575630b..ade34705a143c228a7ff7c4c5546913242658367 100644 (file)
--- a/tests/hash:ip6,port.t
+++ b/tests/hash:ip6,port.t
@@ -29,13 +29,13 @@
 # List set
 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip6,port.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip6,port.t.list0
 # Sleep 5s so that elements can time out
 0 sleep 5
 # List set
 0 ipset list test > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip6,port.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip6,port.t.list1
 # Flush test set
 0 ipset flush test
 # Add multiple elements in one step

diff --git a/tests/hash:ip6.t b/tests/hash:ip6.t
index 991a899d0dc00be2423a9581c8ddcd5f5412a213..952965afff2fb31145754c81f81dc1dcce309767 100644 (file)
--- a/tests/hash:ip6.t
+++ b/tests/hash:ip6.t
@@ -23,7 +23,7 @@
 # IP: List set
 0 ipset -L test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
 # IP: Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip6.t.list2 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip6.t.list2
 # IP: Save set
 0 ipset save test > hash:ip6.t.restore
 # Sleep 5s so that element can time out
@@ -31,7 +31,7 @@
 # IP: List set
 0 ipset -L test 2>/dev/null > .foo0 && ./sort.sh .foo0
 # IP: Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip6.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip6.t.list0
 # IP: Destroy set
 0 ipset x test
 # IP: Restore saved set
@@ -39,7 +39,7 @@
 # IP: List set
 0 ipset -L test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
 # IP: Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip6.t.list2 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip6.t.list2
 # IP: Flush test set
 0 ipset -F test
 # IP: Try to add multiple elements in one step
@@ -75,13 +75,13 @@
 # Network: List set
 0 ipset -L test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
 # Network: Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip6.t.list3 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip6.t.list3
 # Sleep 5s so that elements can time out
 0 sleep 5
 # Network: List set
 0 ipset -L test > .foo
 # Network: Check listing
-0 diff -I 'Size in memory.*' .foo hash:ip6.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:ip6.t.list1
 # Network: Flush test set
 0 ipset -F test
 # Network: Delete test set
@@ -95,7 +95,7 @@
 # List restored set b
 0 ipset l b > .foo0 && ./sort.sh .foo0
 # Check listing of set b
-0 diff -I 'Size in memory.*' .foo restore.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo restore.t.list1
 # Destroy by restore
 0 ipset restore < restore.t.destroy
 # eof

diff --git a/tests/hash:net,port.t b/tests/hash:net,port.t
index e0f922df6589dbdb584883b725828ed45d7c075f..7624e2a7157950b4f84af7d7e3a8d0b4144aa581 100644 (file)
--- a/tests/hash:net,port.t
+++ b/tests/hash:net,port.t
@@ -43,7 +43,7 @@
 # IP: List set
 0 ipset -L test 2>/dev/null > .foo0 && ./sort.sh .foo0
 # IP: Check listing
-0 diff -I 'Size in memory.*' .foo hash:net,port.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:net,port.t.list1
 # Flush test set
 0 ipset flush test
 # Add multiple elements in one step

diff --git a/tests/hash:net.t b/tests/hash:net.t
index 9edd3c90490b25e38c0c6a07024c32cc57c8728a..d4ac559a6517102e0a7b560b0f1ad631afd5e5ff 100644 (file)
--- a/tests/hash:net.t
+++ b/tests/hash:net.t
@@ -35,13 +35,13 @@
 # List set
 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo hash:net.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:net.t.list0
 # Sleep 5s so that element can time out
 0 sleep 5
 # IP: List set
 0 ipset -L test 2>/dev/null > .foo0 && ./sort.sh .foo0
 # IP: Check listing
-0 diff -I 'Size in memory.*' .foo hash:net.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:net.t.list1
 # Flush test set
 0 ipset flush test
 # Delete test set

diff --git a/tests/hash:net6,port.t b/tests/hash:net6,port.t
index 12a37cbc5d8d14a2b2d1e2277c9c07fe759f6c0c..8e844e0a5c6cc57eb35671660057fd515f130a3b 100644 (file)
--- a/tests/hash:net6,port.t
+++ b/tests/hash:net6,port.t
@@ -39,13 +39,13 @@
 # Save set
 0 ipset save test > hash:net6,port.t.restore
 # Check listing
-0 diff -I 'Size in memory.*' .foo hash:net6,port.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:net6,port.t.list0
 # Sleep 5s so that element can time out
 0 sleep 5
 # IP: List set
 0 ipset -L test 2>/dev/null > .foo0 && ./sort.sh .foo0
 # IP: Check listing
-0 diff -I 'Size in memory.*' .foo hash:net6,port.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:net6,port.t.list1
 # Destroy set
 0 ipset x test
 # Restore set
@@ -53,7 +53,7 @@
 # List set
 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo hash:net6,port.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:net6,port.t.list0
 # Flush test set
 0 ipset flush test
 # Add multiple elements in one step

diff --git a/tests/hash:net6.t b/tests/hash:net6.t
index ecb415e6c3c8947f45f47a28b5fd74e20701f4c0..f8509e006857318c4a9a7cefbd53bac44298443c 100644 (file)
--- a/tests/hash:net6.t
+++ b/tests/hash:net6.t
@@ -35,13 +35,13 @@
 # List set
 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo hash:net6.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:net6.t.list0
 # Sleep 5s so that element can time out
 0 sleep 5
 # IP: List set
 0 ipset -L test 2>/dev/null > .foo0 && ./sort.sh .foo0
 # IP: Check listing
-0 diff -I 'Size in memory.*' .foo hash:net6.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo hash:net6.t.list1
 # Flush test set
 0 ipset flush test
 # Delete test set

diff --git a/tests/iphash.t b/tests/iphash.t
index 96ae49b632589a001e83efa88ec298b073e44780..5f58b4545a1a3a3bb6e462d282dcc45d42d51b20 100644 (file)
--- a/tests/iphash.t
+++ b/tests/iphash.t
@@ -25,7 +25,7 @@
 # IP: List set
 0 ipset -L test 2>/dev/null > .foo0 && ./sort.sh .foo0
 # IP: Check listing
-0 diff -I 'Size in memory.*' .foo iphash.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo iphash.t.list0
 # IP: Flush test set
 0 ipset -F test
 # IP: Delete test set
@@ -33,13 +33,13 @@
 # IP: Restore values so that rehashing is triggered, old format
 0 ipset -R < iphash.t.restore.old
 # IP: Check that all values are restored
-0 (grep add iphash.t.restore | sort > .foo.1) && (ipset -S test | grep add | sort > .foo.2) && cmp .foo.1 .foo.2 && rm .foo.*
+0 (grep add iphash.t.restore | sort > .foo.1) && (ipset -S test | grep add | sort > .foo.2) && cmp .foo.1 .foo.2
 # IP: Delete test set
 0 ipset -X test
 # IP: Restore values so that rehashing is triggered
 0 ipset -R < iphash.t.restore
 # IP: Check that all values are restored
-0 (grep add iphash.t.restore | sort > .foo.1) && (ipset -S test | grep add | sort > .foo.2) && cmp .foo.1 .foo.2 && rm .foo.*
+0 (grep add iphash.t.restore | sort > .foo.1) && (ipset -S test | grep add | sort > .foo.2) && cmp .foo.1 .foo.2
 # IP: Flush test set
 0 ipset -F test
 # IP: Delete test set
@@ -49,7 +49,7 @@
 # IP: Save the restored set
 0 ipset save test | sort > .foo.1
 # IP: Compare save and restore
-0 (sort iphash.t.large > .foo.2) && (cmp .foo.1 .foo.2) && rm .foo.*
+0 (sort iphash.t.large > .foo.2) && (cmp .foo.1 .foo.2)
 # IP: Delete test set
 0 ipset x test
 # Network: Create a set 
@@ -79,7 +79,7 @@
 # Network: List set
 0 ipset -L test > .foo0 && ./sort.sh .foo0
 # Network: Check listing
-0 diff -I 'Size in memory.*' .foo iphash.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo iphash.t.list1
 # Network: Flush test set
 0 ipset -F test
 # Network: Delete test set

diff --git a/tests/ipmap.t b/tests/ipmap.t
index 443d40dc51f749aa03e58de1cefe64db02a6e712..33311400b7260fab4c5984f7e27fc4884b437e8f 100644 (file)
--- a/tests/ipmap.t
+++ b/tests/ipmap.t
@@ -51,13 +51,13 @@
 # Range: List set
 0 ipset -L test > .foo
 # Range: Check listing
-0 diff -I 'Size in memory.*' .foo ipmap.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo ipmap.t.list0
 # Range: Delete a range of elements
 0 ipset -! -D test 2.0.0.128-2.0.0.132
 # Range: List set
 0 ipset -L test > .foo
 # Range: Check listing
-0 diff -I 'Size in memory.*' .foo ipmap.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo ipmap.t.list1
 # Range: Flush test set
 0 ipset -F test
 # Range: Delete test set
@@ -93,7 +93,7 @@
 # Network: List set
 0 ipset -L test > .foo
 # Network: Check listing
-0 diff -I 'Size in memory.*' .foo ipmap.t.list2 && rm .foo
+0 diff -I 'Size in memory.*' .foo ipmap.t.list2
 # Network: Flush test set
 0 ipset -F test
 # Network: Delete test set
@@ -129,7 +129,7 @@
 # Subnets: List set
 0 ipset -L test > .foo
 # Subnets: Check listing
-0 diff -I 'Size in memory.*' .foo ipmap.t.list3 && rm .foo
+0 diff -I 'Size in memory.*' .foo ipmap.t.list3
 # Subnets: FLush test set
 0 ipset -F test
 # Subnets: Delete test set
@@ -155,7 +155,7 @@
 # Full: List set
 0 ipset -L test > .foo
 # Full: Check listing
-0 diff -I 'Size in memory.*' .foo ipmap.t.list4 && rm .foo
+0 diff -I 'Size in memory.*' .foo ipmap.t.list4
 # Full: Delete test set
 0 ipset -X test
 # eof

diff --git a/tests/ipporthash.t b/tests/ipporthash.t
index 052ba9d758bf62e91df1ff69ce1eb76f9015b86d..3ec8fb9b84503bc8e9c70f54a045ed8d66799f4a 100644 (file)
--- a/tests/ipporthash.t
+++ b/tests/ipporthash.t
@@ -33,7 +33,7 @@
 # List set
 0 ipset -L test > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo ipporthash.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo ipporthash.t.list0
 # Flush test set
 0 ipset -F test
 # Delete test set
@@ -63,7 +63,7 @@
 # List set
 0 ipset -L test > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo ipporthash.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo ipporthash.t.list1
 # Flush test set
 0 ipset -F test
 # Delete test set

diff --git a/tests/ipportiphash.t b/tests/ipportiphash.t
index bfde875dcaf436adb7a715799e112996671342b2..0ce01c62e75e4031b7be409f4d5fc5aa5b9ef8bc 100644 (file)
--- a/tests/ipportiphash.t
+++ b/tests/ipportiphash.t
@@ -41,7 +41,7 @@
 # List set
 0 ipset -L test > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo ipportiphash.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo ipportiphash.t.list0
 # Flush test set
 0 ipset -F test
 # Delete test set
@@ -73,7 +73,7 @@
 # List set
 0 ipset -L test > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo ipportiphash.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo ipportiphash.t.list1
 # Flush test set
 0 ipset -F test
 # Delete test set

diff --git a/tests/ipportnethash.t b/tests/ipportnethash.t
index 818e3b0ce59c1ef2a33c41397322a95e97a57367..37458921e138f6fb85b3c2bf10ebb5bef6035bb6 100644 (file)
--- a/tests/ipportnethash.t
+++ b/tests/ipportnethash.t
@@ -37,7 +37,7 @@
 # Range: List set
 0 ipset -L test > .foo0 && ./sort.sh .foo0
 # Range: Check listing
-0 diff -I 'Size in memory.*' .foo ipportnethash.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo ipportnethash.t.list0
 # Range: Flush test set
 0 ipset -F test
 # Range: Delete test set
@@ -67,7 +67,7 @@
 # Network: List set
 0 ipset -L test > .foo0 && ./sort.sh .foo0
 # Network: Check listing
-0 diff -I 'Size in memory.*' .foo ipportnethash.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo ipportnethash.t.list1
 # Network: Flush test set
 0 ipset -F test
 # Network: Delete test set

diff --git a/tests/iptree.t b/tests/iptree.t
index b61c0c937c195bd2a37e8518e23d987125e0a605..ee783a9221c071aec617f899636622712388d6f1 100644 (file)
--- a/tests/iptree.t
+++ b/tests/iptree.t
@@ -15,7 +15,7 @@
 # Static: List set
 0 ipset -L test > .foo0 && ./sort.sh .foo0
 # Static: Check listing
-0 diff -I 'Size in memory.*' .foo iptree.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo iptree.t.list0
 # Static: Flush test set
 0 ipset -F test
 # Static: Delete test set

diff --git a/tests/iptreemap.t b/tests/iptreemap.t
index aa8ed1e95f612da27530bf7324aef1393f93d1ca..aa299313985160435c3b62a04dabd49ad620e67d 100644 (file)
--- a/tests/iptreemap.t
+++ b/tests/iptreemap.t
@@ -51,7 +51,7 @@
 # List set
 0 ipset -L test > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo iptreemap.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo iptreemap.t.list0
 # Flush test set
 0 ipset -F test
 # Delete test set

diff --git a/tests/macipmap.t b/tests/macipmap.t
index 7332f75a68fbf8a8b167e9ccb231e9d4f21249de..27f04b4d69c5743e075da775b44e4bebec42e2b1 100644 (file)
--- a/tests/macipmap.t
+++ b/tests/macipmap.t
@@ -41,7 +41,7 @@
 # Range: List set
 0 ipset -L test > .foo
 # Range: Check listing
-0 diff -I 'Size in memory.*' .foo macipmap.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo macipmap.t.list0
 # Range: Flush test set
 0 ipset -F test
 # Range: Delete test set
@@ -81,7 +81,7 @@
 # Network: List set
 0 ipset -L test > .foo
 # Network: Check listing
-0 diff -I 'Size in memory.*' .foo macipmap.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo macipmap.t.list1
 # Network: Flush test set
 0 ipset -F test
 # Network: Delete test set
@@ -121,13 +121,13 @@
 # Range: List set
 0 ipset -L test | sed 's/timeout ./timeout x/' > .foo
 # Range: Check listing
-0 diff -I 'Size in memory.*' .foo macipmap.t.list3 && rm .foo
+0 diff -I 'Size in memory.*' .foo macipmap.t.list3
 # Range: sleep 5s so that elements can timeout
 0 sleep 5
 # Range: List set
 0 ipset -L test | sed 's/timeout ./timeout x/' > .foo
 # Range: Check listing
-0 diff -I 'Size in memory.*' .foo macipmap.t.list2 && rm .foo
+0 diff -I 'Size in memory.*' .foo macipmap.t.list2
 # Range: Flush test set
 0 ipset -F test
 # Range: add element with 1s timeout

diff --git a/tests/nethash.t b/tests/nethash.t
index 537c0db3065b2871f551e488ea0b2e7b70883fef..faa258570cdfb9a7e198fecd096a173b62121876 100644 (file)
--- a/tests/nethash.t
+++ b/tests/nethash.t
@@ -35,7 +35,7 @@
 # List set
 0 ipset -L test > .foo0 && ./sort.sh .foo0
 # Check listing
-0 diff -I 'Size in memory.*' .foo nethash.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo nethash.t.list0
 # Flush test set
 0 ipset -F test
 # Delete test set

diff --git a/tests/portmap.t b/tests/portmap.t
index 084d68ce7293c64ad42d7c50d26ba3aeac09bdc5..851e5dd8b78846d3fbb2f63f2d15b003456c8997 100644 (file)
--- a/tests/portmap.t
+++ b/tests/portmap.t
@@ -27,7 +27,7 @@
 # Range: List set
 0 ipset -L test > .foo
 # Range: Check listing
-0 diff -I 'Size in memory.*' .foo portmap.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo portmap.t.list0
 # Range: Flush test set
 0 ipset -F test
 # Range: Delete test set
@@ -47,7 +47,7 @@
 # Full: List set
 0 ipset -L test > .foo
 # Full: Check listing
-0 diff -I 'Size in memory.*' .foo portmap.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo portmap.t.list1
 # Full: Flush test set
 0 ipset -F test
 # Full: Delete test set
@@ -71,13 +71,13 @@
 # Full: List set
 0 ipset -L test | sed 's/timeout ./timeout x/' > .foo
 # Full: Check listing
-0 diff -I 'Size in memory.*' .foo portmap.t.list3 && rm .foo
+0 diff -I 'Size in memory.*' .foo portmap.t.list3
 # Full: sleep 5s so that elements can timeout
 0 sleep 5
 # Full: List set
 0 ipset -L test > .foo
 # Full: Check listing
-# 0 diff -I 'Size in memory.*' .foo portmap.t.list2 && rm .foo
+# 0 diff -I 'Size in memory.*' .foo portmap.t.list2
 # Full: Flush test set
 0 ipset -F test
 # Full: add element with 1s timeout

diff --git a/tests/runtest.sh b/tests/runtest.sh
index cc2e9db14a133252a5090f770e75fed148f864f5..ae0780ea16b76839e195814152a26ef6d333f3a6 100755 (executable)
--- a/tests/runtest.sh
+++ b/tests/runtest.sh
@@ -103,6 +103,6 @@ for x in $tests; do
        esac
 done
 rmmod ip_set >/dev/null 2>&1
-rm -f .foo.err
+rm -f .foo*
 echo "All tests are passed"
 

diff --git a/tests/setlist.t b/tests/setlist.t
index 8dcf54a22c31557e290d12cdada57c4892a2a6b4..a4f45b51d12ae90b7006b5d85f792e045818e8a5 100644 (file)
--- a/tests/setlist.t
+++ b/tests/setlist.t
@@ -47,7 +47,7 @@
 # List set
 0 ipset -L test > .foo
 # Check listing
-0 diff -I 'Size in memory.*' .foo setlist.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo setlist.t.list0
 # Flush all sets
 0 ipset -F
 # Delete all sets
@@ -63,7 +63,7 @@
 # List test set
 0 ipset list test > .foo
 # Check listing
-0 diff -I 'Size in memory.*' .foo setlist.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo setlist.t.list1
 # Test a set before b
 0 ipset test test a before b
 # Test c set after b
@@ -73,13 +73,13 @@
 # List test set
 0 ipset list test > .foo
 # Check listing
-0 diff -I 'Size in memory.*' .foo setlist.t.list2 && rm .foo
+0 diff -I 'Size in memory.*' .foo setlist.t.list2
 # Delete c set after a
 0 ipset del test c after a
 # List test set
 0 ipset list test > .foo
 # Check listing
-0 diff -I 'Size in memory.*' .foo setlist.t.list3 && rm .foo
+0 diff -I 'Size in memory.*' .foo setlist.t.list3
 # Flush sets
 0 ipset flush
 # Destroy sets