* [iptables PATCH] tests: shell: Adjust for recent changes in libnftnl
@ 2024-10-01 19:48 Phil Sutter
2024-10-01 19:50 ` Phil Sutter
0 siblings, 1 reply; 2+ messages in thread
From: Phil Sutter @ 2024-10-01 19:48 UTC (permalink / raw)
To: netfilter-devel
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(-)
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)
--
2.43.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [iptables PATCH] tests: shell: Adjust for recent changes in libnftnl
2024-10-01 19:48 [iptables PATCH] tests: shell: Adjust for recent changes in libnftnl Phil Sutter
@ 2024-10-01 19:50 ` Phil Sutter
0 siblings, 0 replies; 2+ messages in thread
From: Phil Sutter @ 2024-10-01 19:50 UTC (permalink / raw)
To: netfilter-devel
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-10-01 19:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-01 19:48 [iptables PATCH] tests: shell: Adjust for recent changes in libnftnl Phil Sutter
2024-10-01 19:50 ` Phil Sutter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).