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 <phil@nwl.cc>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/tests/shell/run-tests.sh b/tests/shell/run-tests.sh
index 632cccee0af299418370e1cde5b37d6b334a94ed..29a2c3988cdcd8a636f15d06fff8244c94341869 100755 (executable)
--- 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 985d4a3ad6ce2beb2fd7998ca2dbfaedc6702c18..8dd8d9fdab0028468a2bfb4066695ae1966683a6 100755 (executable)
--- 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 1b288e43ae5ff42470e2854ddc0cbd5b3ab06879..5060be01cd9b8d1f51070b529f53d9a67b39dabc 100755 (executable)
--- 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 2c7c995203b85f0ab7306027a9d3ada1c92ece0c..1d69119f338d7f96da992b43b60049e897cabf18 100755 (executable)
--- 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 c326680629f4e749f6045807ddb97f57a4bc3579..39c0328261ed1c0627d74b3594992da2ce9c827e 100755 (executable)
--- 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 093d5a57f6b7a0a4b7c68e70f2804dc80d1edfe6..1b67f50cf0a363fe8f88d48a7042799a9cc1e9b3 100755 (executable)
--- 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 b24cc4c0dadb0a76779de93af46e33ec1b408317..257c7a908cfec2250a15b7de15c92f2035f473ea 100755 (executable)
--- 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 fff0fee3244dcd6e016049666c0c935ec4af21e1..be42c4789a1f6bad391807ceefc5d52acfd069fd 100755 (executable)
--- 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 247ed47706acbc1512b04823607e2ea2800ac33e..c6a99f509f37db7b004ccd109f284a7c1eb585d2 100755 (executable)
--- 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 855cceb85932be18d941a0dfa2018574620cefb4..0f5f2bd56611b64790cb9fb85c824b1a7335d6f8 100755 (executable)
--- 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 aac9eac93ff66b4afcfb82fc73c96aad0d214ec5..b6f12b59533b3f6cd0659e476e3016d52839fb27 100755 (executable)
--- 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 da16d94d5a60f34d5abb05b8e2f3fd89272cd28d..6e4c959034aae96ba096df27ff984e05be71c7f2 100755 (executable)
--- 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 f6915796eacf2e8886291860501480d11badc3e1..4d39143d9ce030820056a968e4a7fc69bbbb2062 100755 (executable)
--- 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 20f68406e58fa48a99295a3d298366978c65e50d..31d94f8621604b89717d3be5f5a57546b74f9646 100755 (executable)
--- 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 4ff74e321b8c44a088c7fbe6e897a2e59a1d1e8f..65fbe62cbdf6e8a6126599d9b926fa2febe0eb11 100755 (executable)
--- 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 8a586e8034f9cdfb72d619cc35d560c1020f560f..c4e72db0cd5f8d379c2ac1d19afecf163e008b2c 100755 (executable)
--- 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 544b6bf588e2325e21513ce18f29dcf818855800..4af253dceeace0bfcee2104d3cf3561045dfd4a3 100755 (executable)
--- 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 54a8a06440793009aead065854ea30a3bf6845ee..6e8cb4d6f9ef78a794930ca9324070abd5f82f14 100755 (executable)
--- 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 6f630f14a8ba965181f7653cf7d2abc1aae6b6df..2f0a98d16fd38723b4c7784b6cd6036616c81fc6 100755 (executable)
--- 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 047f9497dff0df30cd589119ae5083e321a734e8..2b254c51b3c3f0bbcf3e826142e10bc8e9670c52 100755 (executable)
--- 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 58b399c116218e735c8426214d236eb251afe467..3de0c9de4f9347df910ab9475c2b74d70eba732f 100755 (executable)
--- 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 7da6eb38ddf73f59d66f3a40b4b3a15fe6bde735..39ea3127be89aab1c44548b9fc68edfeabc10f21 100755 (executable)
--- 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 819422638339d6b1a9efd1f626d20fe85e5ad4d8..a591f2cdf863d9b62d02885498c72ff411dd7102 100755 (executable)
--- 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 465c2e8646dc021923c33012d778f40e424aeb8e..231f1fb7c0f0dc4dd64e61c9e07655d4ad778481 100755 (executable)
--- 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 a5fcb5d6b2ef42c1455baded02a9b215ed6fe2e3..afe9117dd501c392fa567e6091d83ac603fbda5a 100755 (executable)
--- 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 4c26b3796fbf6eab088c70e57b0e4b088ba2b637..1f59f6b8233dfc30de4a8c81aab3567bd4f4b496 100755 (executable)
--- 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 a2ae4228d6fa41bc17cdf4ca4017d1852e0a69c1..9b65e6771e169296315bc6ef676707c300c3507a 100755 (executable)
--- 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 17c0c86cf9b0f2815b0abca326804629098e91e2..8b12b8c57cd8bb4f7b33f802cc0297e01ff71e83 100755 (executable)
--- 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 bb3fda51c27f0728a6e13e79a210f82c357f2528..237e9e3204c932f1f4d8d3eaf67a1afb9a3c2ee3 100755 (executable)
--- 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 5ad17c223db27c7323c0cca5a491fd7ea372cbd4..c6d1253424e7dc33ad53c1272c4ebbe4bfe4a492 100755 (executable)
--- 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 8dfed6c1a6446cd1a0be3405f146a2c819d8eaa2..51ed0f2c1b3e833d22cbc3eda162e0b86122cf21 100755 (executable)
--- 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 6861eabab125694df47dd76ab9f260cc4ee701fd..91186deca13d03125f2456e3fdcad01a174d01dc 100755 (executable)
--- 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 a404abc8e029d1c3cfcc42b0b530225640229c1a..468816b03b504d2b65bed4e5fc8dd5163a9c5c1a 100755 (executable)
--- 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