diff options
author | Phil Sutter <phil@nwl.cc> | 2020-01-14 16:50:35 +0100 |
---|---|---|
committer | Phil Sutter <phil@nwl.cc> | 2020-01-16 16:06:14 +0100 |
commit | 68310ba0f9c2066f7463d66a1a1938b66fb8a4c4 (patch) | |
tree | e1ce9632323f2cfc2d4a061d6e433ddd48dc17ec /tests/shell/testcases/maps | |
parent | 488356b895024d0944b20feb1f930558726e0877 (diff) |
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>
Diffstat (limited to 'tests/shell/testcases/maps')
-rwxr-xr-x | tests/shell/testcases/maps/0003map_add_many_elements_0 | 3 | ||||
-rwxr-xr-x | tests/shell/testcases/maps/0004interval_map_create_once_0 | 3 | ||||
-rwxr-xr-x | tests/shell/testcases/maps/0008interval_map_delete_0 | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/tests/shell/testcases/maps/0003map_add_many_elements_0 b/tests/shell/testcases/maps/0003map_add_many_elements_0 index 047f9497..2b254c51 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 58b399c1..3de0c9de 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 7da6eb38..39ea3127 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 |