From 8537751e48dfacee11d48ad3f050bdacc930284c Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 17 Jan 2020 12:50:23 +0100 Subject: [PATCH] tests: shell: Search diff tool once and for all Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1790793 Upstream Status: nftables commit 68310ba0f9c20 commit 68310ba0f9c2066f7463d66a1a1938b66fb8a4c4 Author: Phil Sutter Date: Tue Jan 14 16:50:35 2020 +0100 tests: shell: Search diff tool once and for all Instead of calling 'which diff' over and over again, just detect the tool's presence in run-tests.sh and pass $DIFF to each testcase just like with nft binary. Fall back to using 'true' command to avoid the need for any conditional calling in test cases. While being at it, unify potential diff calls so that a string comparison in shell happens irrespective of diff presence. Signed-off-by: Phil Sutter Acked-by: Pablo Neira Ayuso --- tests/shell/run-tests.sh | 7 ++++++- tests/shell/testcases/flowtable/0010delete_handle_0 | 3 +-- tests/shell/testcases/listing/0003table_0 | 6 ++---- tests/shell/testcases/listing/0004table_0 | 3 +-- tests/shell/testcases/listing/0005ruleset_ip_0 | 3 +-- tests/shell/testcases/listing/0006ruleset_ip6_0 | 3 +-- tests/shell/testcases/listing/0007ruleset_inet_0 | 3 +-- tests/shell/testcases/listing/0008ruleset_arp_0 | 3 +-- tests/shell/testcases/listing/0009ruleset_bridge_0 | 3 +-- tests/shell/testcases/listing/0010sets_0 | 3 +-- tests/shell/testcases/listing/0011sets_0 | 3 +-- tests/shell/testcases/listing/0012sets_0 | 3 +-- tests/shell/testcases/listing/0013objects_0 | 3 +-- tests/shell/testcases/listing/0014objects_0 | 6 ++---- tests/shell/testcases/listing/0015dynamic_0 | 3 +-- tests/shell/testcases/listing/0017objects_0 | 3 +-- tests/shell/testcases/listing/0018data_0 | 3 +-- tests/shell/testcases/listing/0019set_0 | 3 +-- tests/shell/testcases/listing/0020flowtable_0 | 3 +-- tests/shell/testcases/maps/0003map_add_many_elements_0 | 3 +-- tests/shell/testcases/maps/0004interval_map_create_once_0 | 3 +-- tests/shell/testcases/maps/0008interval_map_delete_0 | 3 +-- tests/shell/testcases/netns/0001nft-f_0 | 3 +-- tests/shell/testcases/netns/0002loosecommands_0 | 3 +-- tests/shell/testcases/netns/0003many_0 | 3 +-- tests/shell/testcases/nft-f/0016redefines_1 | 3 +-- tests/shell/testcases/optionals/delete_object_handles_0 | 3 +-- tests/shell/testcases/optionals/update_object_handles_0 | 3 +-- .../shell/testcases/rule_management/0001addinsertposition_0 | 12 ++++-------- tests/shell/testcases/sets/0028delete_handle_0 | 3 +-- tests/shell/testcases/sets/0036add_set_element_expiration_0 | 5 ++++- tests/shell/testcases/transactions/0003table_0 | 4 +--- tests/shell/testcases/transactions/0040set_0 | 3 +-- 33 files changed, 46 insertions(+), 75 deletions(-) diff --git a/tests/shell/run-tests.sh b/tests/shell/run-tests.sh index 632ccce..29a2c39 100755 --- a/tests/shell/run-tests.sh +++ b/tests/shell/run-tests.sh @@ -43,6 +43,11 @@ if [ ! -x "$MODPROBE" ] ; then msg_error "no modprobe binary found" fi +DIFF="$(which diff)" +if [ ! -x "$DIFF" ] ; then + DIFF=true +fi + if [ "$1" == "-v" ] ; then VERBOSE=y shift @@ -96,7 +101,7 @@ do kernel_cleanup msg_info "[EXECUTING] $testfile" - test_output=$(NFT=$NFT ${testfile} 2>&1) + test_output=$(NFT=$NFT DIFF=$DIFF ${testfile} 2>&1) rc_got=$? echo -en "\033[1A\033[K" # clean the [EXECUTING] foobar line diff --git a/tests/shell/testcases/flowtable/0010delete_handle_0 b/tests/shell/testcases/flowtable/0010delete_handle_0 index 985d4a3..8dd8d9f 100755 --- a/tests/shell/testcases/flowtable/0010delete_handle_0 +++ b/tests/shell/testcases/flowtable/0010delete_handle_0 @@ -16,7 +16,6 @@ EXPECTED="table inet t { GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0003table_0 b/tests/shell/testcases/listing/0003table_0 index 1b288e4..5060be0 100755 --- a/tests/shell/testcases/listing/0003table_0 +++ b/tests/shell/testcases/listing/0003table_0 @@ -11,15 +11,13 @@ $NFT add table test GET="$($NFT list table test)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi # also this way GET="$($NFT list table ip test)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0004table_0 b/tests/shell/testcases/listing/0004table_0 index 2c7c995..1d69119 100755 --- a/tests/shell/testcases/listing/0004table_0 +++ b/tests/shell/testcases/listing/0004table_0 @@ -12,8 +12,7 @@ $NFT add table test2 GET="$($NFT list table test)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0005ruleset_ip_0 b/tests/shell/testcases/listing/0005ruleset_ip_0 index c326680..39c0328 100755 --- a/tests/shell/testcases/listing/0005ruleset_ip_0 +++ b/tests/shell/testcases/listing/0005ruleset_ip_0 @@ -15,7 +15,6 @@ $NFT add table bridge test GET="$($NFT list ruleset ip)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0006ruleset_ip6_0 b/tests/shell/testcases/listing/0006ruleset_ip6_0 index 093d5a5..1b67f50 100755 --- a/tests/shell/testcases/listing/0006ruleset_ip6_0 +++ b/tests/shell/testcases/listing/0006ruleset_ip6_0 @@ -15,7 +15,6 @@ $NFT add table bridge test GET="$($NFT list ruleset ip6)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0007ruleset_inet_0 b/tests/shell/testcases/listing/0007ruleset_inet_0 index b24cc4c..257c7a9 100755 --- a/tests/shell/testcases/listing/0007ruleset_inet_0 +++ b/tests/shell/testcases/listing/0007ruleset_inet_0 @@ -15,7 +15,6 @@ $NFT add table bridge test GET="$($NFT list ruleset inet)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0008ruleset_arp_0 b/tests/shell/testcases/listing/0008ruleset_arp_0 index fff0fee..be42c47 100755 --- a/tests/shell/testcases/listing/0008ruleset_arp_0 +++ b/tests/shell/testcases/listing/0008ruleset_arp_0 @@ -15,7 +15,6 @@ $NFT add table bridge test GET="$($NFT list ruleset arp)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0009ruleset_bridge_0 b/tests/shell/testcases/listing/0009ruleset_bridge_0 index 247ed47..c6a99f5 100755 --- a/tests/shell/testcases/listing/0009ruleset_bridge_0 +++ b/tests/shell/testcases/listing/0009ruleset_bridge_0 @@ -15,7 +15,6 @@ $NFT add table bridge test GET="$($NFT list ruleset bridge)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0010sets_0 b/tests/shell/testcases/listing/0010sets_0 index 855cceb..0f5f2bd 100755 --- a/tests/shell/testcases/listing/0010sets_0 +++ b/tests/shell/testcases/listing/0010sets_0 @@ -57,7 +57,6 @@ $NFT add set inet filter set2 { type icmpv6_type \; } GET="$($NFT list sets)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0011sets_0 b/tests/shell/testcases/listing/0011sets_0 index aac9eac..b6f12b5 100755 --- a/tests/shell/testcases/listing/0011sets_0 +++ b/tests/shell/testcases/listing/0011sets_0 @@ -38,7 +38,6 @@ $NFT add rule inet filter test tcp dport {80, 443} GET="$($NFT list sets)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0012sets_0 b/tests/shell/testcases/listing/0012sets_0 index da16d94..6e4c959 100755 --- a/tests/shell/testcases/listing/0012sets_0 +++ b/tests/shell/testcases/listing/0012sets_0 @@ -33,7 +33,6 @@ $NFT add set inet filter set2 { type icmpv6_type \; } GET="$($NFT list sets inet)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0013objects_0 b/tests/shell/testcases/listing/0013objects_0 index f691579..4d39143 100755 --- a/tests/shell/testcases/listing/0013objects_0 +++ b/tests/shell/testcases/listing/0013objects_0 @@ -42,7 +42,6 @@ $NFT add table test-ip GET="$($NFT list table test)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0014objects_0 b/tests/shell/testcases/listing/0014objects_0 index 20f6840..31d94f8 100755 --- a/tests/shell/testcases/listing/0014objects_0 +++ b/tests/shell/testcases/listing/0014objects_0 @@ -17,15 +17,13 @@ $NFT add table test-ip GET="$($NFT list quotas)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi GET="$($NFT list quota test https-quota)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0015dynamic_0 b/tests/shell/testcases/listing/0015dynamic_0 index 4ff74e3..65fbe62 100755 --- a/tests/shell/testcases/listing/0015dynamic_0 +++ b/tests/shell/testcases/listing/0015dynamic_0 @@ -16,8 +16,7 @@ $NFT -f - <<< "$EXPECTED" GET="$($NFT list set ip filter test_set)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0017objects_0 b/tests/shell/testcases/listing/0017objects_0 index 8a586e8..c4e72db 100755 --- a/tests/shell/testcases/listing/0017objects_0 +++ b/tests/shell/testcases/listing/0017objects_0 @@ -13,7 +13,6 @@ $NFT flush map inet filter countermap GET="$($NFT list map inet filter countermap)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0018data_0 b/tests/shell/testcases/listing/0018data_0 index 544b6bf..4af253d 100755 --- a/tests/shell/testcases/listing/0018data_0 +++ b/tests/shell/testcases/listing/0018data_0 @@ -13,7 +13,6 @@ $NFT flush map inet filter ipmap GET="$($NFT list map inet filter ipmap)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0019set_0 b/tests/shell/testcases/listing/0019set_0 index 54a8a06..6e8cb4d 100755 --- a/tests/shell/testcases/listing/0019set_0 +++ b/tests/shell/testcases/listing/0019set_0 @@ -13,7 +13,6 @@ $NFT flush set inet filter ipset GET="$($NFT list set inet filter ipset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/listing/0020flowtable_0 b/tests/shell/testcases/listing/0020flowtable_0 index 6f630f1..2f0a98d 100755 --- a/tests/shell/testcases/listing/0020flowtable_0 +++ b/tests/shell/testcases/listing/0020flowtable_0 @@ -15,7 +15,6 @@ $NFT -f - <<< "$EXPECTED" GET="$($NFT list flowtable inet filter f)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/maps/0003map_add_many_elements_0 b/tests/shell/testcases/maps/0003map_add_many_elements_0 index 047f949..2b254c5 100755 --- a/tests/shell/testcases/maps/0003map_add_many_elements_0 +++ b/tests/shell/testcases/maps/0003map_add_many_elements_0 @@ -61,8 +61,7 @@ EXPECTED="table ip x { }" GET=$($NFT list ruleset) if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/maps/0004interval_map_create_once_0 b/tests/shell/testcases/maps/0004interval_map_create_once_0 index 58b399c..3de0c9d 100755 --- a/tests/shell/testcases/maps/0004interval_map_create_once_0 +++ b/tests/shell/testcases/maps/0004interval_map_create_once_0 @@ -60,8 +60,7 @@ EXPECTED="table ip x { }" GET=$($NFT list ruleset) if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/maps/0008interval_map_delete_0 b/tests/shell/testcases/maps/0008interval_map_delete_0 index 7da6eb3..39ea312 100755 --- a/tests/shell/testcases/maps/0008interval_map_delete_0 +++ b/tests/shell/testcases/maps/0008interval_map_delete_0 @@ -26,7 +26,6 @@ $NFT add element filter m { 127.0.0.2 : 0x2 } GET=$($NFT -s list ruleset) if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/netns/0001nft-f_0 b/tests/shell/testcases/netns/0001nft-f_0 index 8194226..a591f2c 100755 --- a/tests/shell/testcases/netns/0001nft-f_0 +++ b/tests/shell/testcases/netns/0001nft-f_0 @@ -93,8 +93,7 @@ fi KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset)" $IP netns del $NETNS_NAME if [ "$RULESET" != "$KERNEL_RULESET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$RULESET") <(echo "$KERNEL_RULESET") + $DIFF -u <(echo "$RULESET") <(echo "$KERNEL_RULESET") exit 1 fi exit 0 diff --git a/tests/shell/testcases/netns/0002loosecommands_0 b/tests/shell/testcases/netns/0002loosecommands_0 index 465c2e8..231f1fb 100755 --- a/tests/shell/testcases/netns/0002loosecommands_0 +++ b/tests/shell/testcases/netns/0002loosecommands_0 @@ -56,7 +56,6 @@ RULESET="table ip t { KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset)" $IP netns del $NETNS_NAME if [ "$RULESET" != "$KERNEL_RULESET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$RULESET") <(echo "$KERNEL_RULESET") + $DIFF -u <(echo "$RULESET") <(echo "$KERNEL_RULESET") exit 1 fi diff --git a/tests/shell/testcases/netns/0003many_0 b/tests/shell/testcases/netns/0003many_0 index a5fcb5d..afe9117 100755 --- a/tests/shell/testcases/netns/0003many_0 +++ b/tests/shell/testcases/netns/0003many_0 @@ -97,8 +97,7 @@ function test_netns() KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset)" if [ "$RULESET" != "$KERNEL_RULESET" ] ; then echo "E: ruleset in netns $NETNS_NAME differs from the loaded" >&2 - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$RULESET") <(echo "$KERNEL_RULESET") + $DIFF -u <(echo "$RULESET") <(echo "$KERNEL_RULESET") $IP netns del $NETNS_NAME exit 1 fi diff --git a/tests/shell/testcases/nft-f/0016redefines_1 b/tests/shell/testcases/nft-f/0016redefines_1 index 4c26b37..1f59f6b 100755 --- a/tests/shell/testcases/nft-f/0016redefines_1 +++ b/tests/shell/testcases/nft-f/0016redefines_1 @@ -26,8 +26,7 @@ $NFT -f - <<< "$RULESET" GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/optionals/delete_object_handles_0 b/tests/shell/testcases/optionals/delete_object_handles_0 index a2ae422..9b65e67 100755 --- a/tests/shell/testcases/optionals/delete_object_handles_0 +++ b/tests/shell/testcases/optionals/delete_object_handles_0 @@ -37,7 +37,6 @@ table ip6 test-ip6 { GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/optionals/update_object_handles_0 b/tests/shell/testcases/optionals/update_object_handles_0 index 17c0c86..8b12b8c 100755 --- a/tests/shell/testcases/optionals/update_object_handles_0 +++ b/tests/shell/testcases/optionals/update_object_handles_0 @@ -19,7 +19,6 @@ EXPECTED="table ip test-ip { GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/rule_management/0001addinsertposition_0 b/tests/shell/testcases/rule_management/0001addinsertposition_0 index bb3fda5..237e9e3 100755 --- a/tests/shell/testcases/rule_management/0001addinsertposition_0 +++ b/tests/shell/testcases/rule_management/0001addinsertposition_0 @@ -30,8 +30,7 @@ for arg in "position 2" "handle 2" "index 0"; do GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi done @@ -42,8 +41,7 @@ for arg in "position 3" "handle 3" "index 1"; do GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi done @@ -62,8 +60,7 @@ for arg in "position 3" "handle 3" "index 1"; do GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi done @@ -82,8 +79,7 @@ for arg in "position 2" "handle 2" "index 0"; do GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi done diff --git a/tests/shell/testcases/sets/0028delete_handle_0 b/tests/shell/testcases/sets/0028delete_handle_0 index 5ad17c2..c6d1253 100755 --- a/tests/shell/testcases/sets/0028delete_handle_0 +++ b/tests/shell/testcases/sets/0028delete_handle_0 @@ -29,7 +29,6 @@ EXPECTED="table ip test-ip { GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi diff --git a/tests/shell/testcases/sets/0036add_set_element_expiration_0 b/tests/shell/testcases/sets/0036add_set_element_expiration_0 index 8dfed6c..51ed0f2 100755 --- a/tests/shell/testcases/sets/0036add_set_element_expiration_0 +++ b/tests/shell/testcases/sets/0036add_set_element_expiration_0 @@ -8,6 +8,9 @@ add element ip x y { 1.1.1.1 timeout 30s expires 15s }" test_output=$($NFT -e -f - <<< "$RULESET" 2>&1) -diff -u <(echo "$test_output") <(echo "$RULESET") +if [ "$test_output" != "$RULESET" ] ; then + $DIFF -u <(echo "$test_output") <(echo "$RULESET") + exit 1 +fi $NFT "add chain ip x c; add rule ip x c ip saddr @y" diff --git a/tests/shell/testcases/transactions/0003table_0 b/tests/shell/testcases/transactions/0003table_0 index 6861eab..91186de 100755 --- a/tests/shell/testcases/transactions/0003table_0 +++ b/tests/shell/testcases/transactions/0003table_0 @@ -14,7 +14,6 @@ fi KERNEL_RULESET="$($NFT list ruleset)" if [ "" != "$KERNEL_RULESET" ] ; then - DIFF="$(which diff)" echo "Got a ruleset, but expected empty: " echo "$KERNEL_RULESET" exit 1 @@ -42,7 +41,6 @@ $NFT -f - <<< "$RULESETFAIL" && exit 2 KERNEL_RULESET="$($NFT list ruleset)" if [ "$RULESET" != "$KERNEL_RULESET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$RULESET") <(echo "$KERNEL_RULESET") + $DIFF -u <(echo "$RULESET") <(echo "$KERNEL_RULESET") exit 1 fi diff --git a/tests/shell/testcases/transactions/0040set_0 b/tests/shell/testcases/transactions/0040set_0 index a404abc..468816b 100755 --- a/tests/shell/testcases/transactions/0040set_0 +++ b/tests/shell/testcases/transactions/0040set_0 @@ -29,8 +29,7 @@ fi GET="$($NFT list ruleset)" if [ "$RULESET" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$RULESET") <(echo "$GET") + $DIFF -u <(echo "$RULESET") <(echo "$GET") exit 1 fi -- 1.8.3.1