| Message ID | 20241001194844.17817-1-phil@nwl.cc |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [iptables] tests: shell: Adjust for recent changes in libnftnl | expand |
On Tue, Oct 01, 2024 at 09:48:44PM +0200, Phil Sutter wrote: > 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 <phil@nwl.cc> Also applied.
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 34802cc26aad4..bfceed4976f18 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)
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 <phil@nwl.cc> --- iptables/tests/shell/testcases/nft-only/0009-needless-bitwise_0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)