From: Phil Sutter Date: Tue, 1 Oct 2024 19:43:18 +0000 (+0200) Subject: tests: shell: Adjust for recent changes in libnftnl X-Git-Tag: v1.8.11~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e93372954cf88ac044fb2fc14dcb0e9237804e2d;p=thirdparty%2Fiptables.git tests: shell: Adjust for recent changes in libnftnl libnftnl commit a96d5a338f24e ("rule: Don't append a newline when printing a rule") affected nft (and iptables-nft) debug output in that no extra newline is appended to rule bytecode output anymore. Tolerate this in the sole test case it breaks by ignoring changes to blank lines. Signed-off-by: Phil Sutter --- diff --git a/iptables/tests/shell/testcases/nft-only/0009-needless-bitwise_0 b/iptables/tests/shell/testcases/nft-only/0009-needless-bitwise_0 index 34802cc2..bfceed49 100755 --- a/iptables/tests/shell/testcases/nft-only/0009-needless-bitwise_0 +++ b/iptables/tests/shell/testcases/nft-only/0009-needless-bitwise_0 @@ -343,4 +343,4 @@ filter() { awk '/^table /{exit} /^( \[|$)/{print}' } -diff -u -Z <(filter <<< "$EXPECT") <(nft --debug=netlink list ruleset | filter) +diff -u -Z -B <(filter <<< "$EXPECT") <(nft --debug=netlink list ruleset | filter)