Use unified diff output in tests

diff --git a/tests/bitmap:ip.t b/tests/bitmap:ip.t
index 341ebf05138693b8acd44bf8ef3436c597108dd5..ba9ff662109029e15ba0a5ebd5e2d39075d8e8ee 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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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 76a5def270dd83a5c4f9dec26b599e9ab9ea31eb..7a6f952b91e8e054537bee9749e5dc2b2f152a81 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
+0 diff -u -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
+0 diff -u -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 abc1b762896c3fa3748976c5b38a5d0eaf095509..34cdc1ac3a2fefbba49fdd4ccc639624b2136f2d 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
+0 diff -u -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 5c1bf812527d16c8718c8c26f1054a673520986d..9befcb8e6f17c9e47727b0dd8899c87e978d149a 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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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 5c65915cfe2b20d1c029f5cf96c393863e3f9948..e21ab6e2403ff86041b6cf1e125c9d8964d32709 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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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 85c1e02fdb7aae24a5bab6fc6265ea3e2fe2f8e8..485a8e9a503f3fa2defd206b21cfc7efeba1236b 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
+0 diff -u -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
+0 diff -u -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 5c5610769d70ce532555491c83a99e107073d24c..91dc60fcd5b17721ee0db08806749d956e415d81 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
+0 diff -u -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 ade34705a143c228a7ff7c4c5546913242658367..684074cb7d9713d98ac7f6f202ae57b9b87ba6a8 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
+0 diff -u -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
+0 diff -u -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 952965afff2fb31145754c81f81dc1dcce309767..a913f22dccd42d1f40327ed0db125693a0fd4c69 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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -I 'Size in memory.*' .foo hash:ip6.t.list1
 # Network: Flush test set
 0 ipset -F test
 # Network: Delete test set
@@ -91,11 +91,11 @@
 # List restored set a
 0 ipset l a > .foo0 && ./sort.sh .foo0
 # Check listing of set a
-0 diff -I 'Size in memory.*' .foo restore.t.list0
+0 diff -u -I 'Size in memory.*' .foo restore.t.list0
 # 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
+0 diff -u -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 7624e2a7157950b4f84af7d7e3a8d0b4144aa581..ed8209a7d26e7cf4d02a6c7363dda64f446b4619 100644 (file)
--- a/tests/hash:net,port.t
+++ b/tests/hash:net,port.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:net,port.t.list0
+0 diff -u -I 'Size in memory.*' .foo hash:net,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:net,port.t.list1
+0 diff -u -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 d4ac559a6517102e0a7b560b0f1ad631afd5e5ff..9947bf6810e22f8b1913f224bbdb4eea1dd09bc9 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
+0 diff -u -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
+0 diff -u -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 8e844e0a5c6cc57eb35671660057fd515f130a3b..ac23288cd07d190824c6182ce7e36c640126327b 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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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 f8509e006857318c4a9a7cefbd53bac44298443c..372ed394c9e76f81f468c04d91c073ab559bc46c 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
+0 diff -u -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
+0 diff -u -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 5f58b4545a1a3a3bb6e462d282dcc45d42d51b20..2196a3431b5dc43925e9b0369c0919ed3a1ece60 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
+0 diff -u -I 'Size in memory.*' .foo iphash.t.list0
 # IP: Flush test set
 0 ipset -F test
 # IP: Delete test 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
+0 diff -u -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 33311400b7260fab4c5984f7e27fc4884b437e8f..a3bff10a0ecdc3775e4b6ca2b44aaf18d3355f27 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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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 3ec8fb9b84503bc8e9c70f54a045ed8d66799f4a..4875ed876f34a8e8dc9a16c74148de69e1bef33b 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
+0 diff -u -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
+0 diff -u -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 0ce01c62e75e4031b7be409f4d5fc5aa5b9ef8bc..ff65de0d6d963d8709418ad73e8251a674e44477 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
+0 diff -u -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
+0 diff -u -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 37458921e138f6fb85b3c2bf10ebb5bef6035bb6..22ba63bb9bcfdf7db0a15757bf64af4b86fa6d63 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
+0 diff -u -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
+0 diff -u -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 ee783a9221c071aec617f899636622712388d6f1..2185a9f33062389087b08fb70f7122643375b832 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
+0 diff -u -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 aa299313985160435c3b62a04dabd49ad620e67d..5a4d3079ae1537a53367f28a56bbffd9a88911e6 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
+0 diff -u -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 27f04b4d69c5743e075da775b44e4bebec42e2b1..8ceb99fd0ea13c585726a84a11c85eb0c1611ae5 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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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 faa258570cdfb9a7e198fecd096a173b62121876..706aaf4bf74f2c2e14fcaf6611551114db53fef5 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
+0 diff -u -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 851e5dd8b78846d3fbb2f63f2d15b003456c8997..c9856bf9285d11e91136b23819d7a18ae3457a8f 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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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
+# 0 diff -u -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/setlist.t b/tests/setlist.t
index a4f45b51d12ae90b7006b5d85f792e045818e8a5..043074136bd8b37ef14cc2b4668aa12744c08c7c 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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -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
+0 diff -u -I 'Size in memory.*' .foo setlist.t.list3
 # Flush sets
 0 ipset flush
 # Destroy sets