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/transactions | |
| 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/transactions')
| -rwxr-xr-x | tests/shell/testcases/transactions/0003table_0 | 4 | ||||
| -rwxr-xr-x | tests/shell/testcases/transactions/0040set_0 | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/shell/testcases/transactions/0003table_0 b/tests/shell/testcases/transactions/0003table_0 index 6861eaba..91186dec 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 a404abc8..468816b0 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 |