summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-04-11 10:13:16 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-04-11 10:13:16 +0200
commitce17cdd73068c1ee71f149a8de9f7450a556caba (patch)
tree421d2e1e2110200f4bbb72cc754c60b3e5c3540b
parentba281d251016a880786323b8d04dbecb5375e2f8 (diff)
Use unified diff output in tests
-rw-r--r--tests/bitmap:ip.t14
-rw-r--r--tests/hash:ip,port,ip.t4
-rw-r--r--tests/hash:ip,port,net.t2
-rw-r--r--tests/hash:ip,port.t6
-rw-r--r--tests/hash:ip.t8
-rw-r--r--tests/hash:ip6,port,ip6.t4
-rw-r--r--tests/hash:ip6,port,net6.t2
-rw-r--r--tests/hash:ip6,port.t4
-rw-r--r--tests/hash:ip6.t14
-rw-r--r--tests/hash:net,port.t4
-rw-r--r--tests/hash:net.t4
-rw-r--r--tests/hash:net6,port.t6
-rw-r--r--tests/hash:net6.t4
-rw-r--r--tests/iphash.t4
-rw-r--r--tests/ipmap.t10
-rw-r--r--tests/ipporthash.t4
-rw-r--r--tests/ipportiphash.t4
-rw-r--r--tests/ipportnethash.t4
-rw-r--r--tests/iptree.t2
-rw-r--r--tests/iptreemap.t2
-rw-r--r--tests/macipmap.t8
-rw-r--r--tests/nethash.t2
-rw-r--r--tests/portmap.t8
-rw-r--r--tests/setlist.t8
24 files changed, 66 insertions, 66 deletions
diff --git a/tests/bitmap:ip.t b/tests/bitmap:ip.t
index 341ebf0..ba9ff66 100644
--- 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 76a5def..7a6f952 100644
--- 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 abc1b76..34cdc1a 100644
--- 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 5c1bf81..9befcb8 100644
--- 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 5c65915..e21ab6e 100644
--- 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 85c1e02..485a8e9 100644
--- 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 5c56107..91dc60f 100644
--- 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 ade3470..684074c 100644
--- 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 952965a..a913f22 100644
--- 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 7624e2a..ed8209a 100644
--- 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 d4ac559..9947bf6 100644
--- 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 8e844e0..ac23288 100644
--- 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 f8509e0..372ed39 100644
--- 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 5f58b45..2196a34 100644
--- 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 3331140..a3bff10 100644
--- 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 3ec8fb9..4875ed8 100644
--- 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 0ce01c6..ff65de0 100644
--- 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 3745892..22ba63b 100644
--- 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 ee783a9..2185a9f 100644
--- 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 aa29931..5a4d307 100644
--- 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 27f04b4..8ceb99f 100644
--- 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 faa2585..706aaf4 100644
--- 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 851e5dd..c9856bf 100644
--- 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 a4f45b5..0430741 100644
--- 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