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/sets | |
| 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/sets')
| -rwxr-xr-x | tests/shell/testcases/sets/0028delete_handle_0 | 3 | ||||
| -rwxr-xr-x | tests/shell/testcases/sets/0036add_set_element_expiration_0 | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/shell/testcases/sets/0028delete_handle_0 b/tests/shell/testcases/sets/0028delete_handle_0 index 5ad17c22..c6d12534 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 8dfed6c1..51ed0f2c 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" |