From: Florian Westphal Date: Thu, 23 Jul 2026 10:35:02 +0000 (+0200) Subject: tests: prefer diff -u to cmp X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b45ed3c95f468e9b679593600fb153ce8f952f72;p=thirdparty%2Fipset.git tests: prefer diff -u to cmp Irrelevant when things are working as expected, but is beneficial when they are not: diff -u is much easier to decipher than: "differ, byte x line y" Signed-off-by: Florian Westphal Signed-off-by: Jozsef Kadlecsik --- diff --git a/tests/iphash.t b/tests/iphash.t index c7c0b08..e4386bb 100644 --- a/tests/iphash.t +++ b/tests/iphash.t @@ -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 > "$IPSET_TMP/.foo.1") && (ipset -S test | grep add | sort > "$IPSET_TMP/.foo.2") && cmp "$IPSET_TMP/"{.foo.1,.foo.2} +0 (grep add iphash.t.restore | sort > "$IPSET_TMP/.foo.1") && (ipset -S test | grep add | sort > "$IPSET_TMP/.foo.2") && diff -u "$IPSET_TMP/"{.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 > "$IPSET_TMP/.foo.1") && (ipset -S test | grep add | sort > "$IPSET_TMP/.foo.2") && cmp "$IPSET_TMP/"{.foo.1,.foo.2} +0 (grep add iphash.t.restore | sort > "$IPSET_TMP/.foo.1") && (ipset -S test | grep add | sort > "$IPSET_TMP/.foo.2") && diff -u "$IPSET_TMP/"{.foo.1,.foo.2} # IP: Flush test set 0 ipset -F test # IP: Delete test set @@ -55,7 +55,7 @@ # IP: Save sets 0 ipset -s -f "$IPSET_TMP/.foo0" save && ./ignore.sh "$IPSET_TMP/.foo0" # IP: Compare sorted save and restore -0 cmp "$IPSET_TMP/.foo" iphash.t.restore.sorted +0 diff -u "$IPSET_TMP/.foo" iphash.t.restore.sorted # IP: Delete test set 0 ipset x test # IP: Delete test2 set @@ -65,7 +65,7 @@ # IP: Save the restored set 0 (ipset save test | sort > "$IPSET_TMP/.foo.1") && ./ignore.sh "$IPSET_TMP/.foo.1" # IP: Compare save and restore -0 (sort iphash.t.large > "$IPSET_TMP/.foo.2") && (cmp "$IPSET_TMP/.foo" "$IPSET_TMP/.foo.2") +0 (sort iphash.t.large > "$IPSET_TMP/.foo.2") && (diff -u "$IPSET_TMP/.foo" "$IPSET_TMP/.foo.2") # IP: Delete all elements, one by one 0 ipset list test | sed '1,/Members/d' | xargs -n1 ipset del test # IP: Delete test set diff --git a/tests/restore.t b/tests/restore.t index 02da446..dddd724 100644 --- a/tests/restore.t +++ b/tests/restore.t @@ -1,7 +1,7 @@ # Check multi-set restore 0 ipset restore < restore.t.multi # Save sets and compare -0 ipset save > "$IPSET_TMP/.foo" && diff restore.t.multi.saved "$IPSET_TMP/.foo" +0 ipset save > "$IPSET_TMP/.foo" && diff -u restore.t.multi.saved "$IPSET_TMP/.foo" # Delete all sets 0 ipset x # Check auto-increasing maximal number of sets