From: Phil Sutter <phil@nwl.cc>
Date: Sun, 23 Mar 2025 21:46:18 +0000 (+0100)
Subject: tests: shell: Fix owner/0002-persist on aarch64
X-Git-Tag: v1.1.2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=125aafd175605e1c0912d51314491dec8e807be2;p=thirdparty%2Fnftables.git

tests: shell: Fix owner/0002-persist on aarch64

Not sure if arch-specific, but for some reason src/nft wrapper script
would call src/.libs/lt-nft and thus the owner appeared as 'lt-nft'
instead of the expected 'nft'. Cover for that by extracting the expected
program name from /proc.

Fixes: b5205165bd708 ("tests: shell: Extend table persist flag test a bit")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Florian Westphal <fw@strlen.de>
---

diff --git a/tests/shell/testcases/owner/0002-persist b/tests/shell/testcases/owner/0002-persist
index 98a8eb13..700f00ec 100755
--- a/tests/shell/testcases/owner/0002-persist
+++ b/tests/shell/testcases/owner/0002-persist
@@ -47,7 +47,8 @@ cat >&"${COPROC[1]}" <<EOF
 add table ip t { flags owner, persist; }
 EOF
 
-EXPECT="table ip t { # progname nft
+COMM=$(</proc/${COPROC_PID}/comm)
+EXPECT="table ip t { # progname $COMM
 	flags owner,persist
 }"
 diff -u <(echo "$EXPECT") <($NFT list ruleset) || {