From: Masatake YAMATO <yamato@redhat.com>
Date: Tue, 26 Sep 2023 16:15:21 +0000 (+0900)
Subject: tests: (lsfd) extend the cases for testing BPF.NAME column
X-Git-Tag: v2.40-rc1~224^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c11c43cb38e8c96dc621034036ec0bb544cdf79;p=thirdparty%2Futil-linux.git

tests: (lsfd) extend the cases for testing BPF.NAME column

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---

diff --git a/tests/expected/lsfd/mkfds-bpf-map b/tests/expected/lsfd/mkfds-bpf-map
new file mode 100644
index 0000000000..b4f7964906
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-bpf-map
@@ -0,0 +1,2 @@
+array 2 mkfds_map
+BPF-MAP.TYPE,BPF-MAP.TYPE.RAW,BPF.NAME: 0
diff --git a/tests/expected/lsfd/mkfds-bpf-prog b/tests/expected/lsfd/mkfds-bpf-prog
index 8596d25324..b67afc540f 100644
--- a/tests/expected/lsfd/mkfds-bpf-prog
+++ b/tests/expected/lsfd/mkfds-bpf-prog
@@ -1,2 +1,2 @@
-kprobe 2
-BPF-PROG.TYPE,BPF-PROG.TYPE.RAW: 0
+kprobe 2 mkdfs_prog
+BPF-PROG.TYPE,BPF-PROG.TYPE.RAW,BPF.NAME: 0
diff --git a/tests/ts/lsfd/mkfds-bpf-map b/tests/ts/lsfd/mkfds-bpf-map
index cbf88d8b8a..0782ef0435 100755
--- a/tests/ts/lsfd/mkfds-bpf-map
+++ b/tests/ts/lsfd/mkfds-bpf-map
@@ -30,11 +30,12 @@ ts_cd "$TS_OUTDIR"
 
 PID=
 FD=3
+NAME=mkfds_map
 {
-    coproc MKFDS { "$TS_HELPER_MKFDS" bpf-map "$FD" map-type-id=2; }
+    coproc MKFDS { "$TS_HELPER_MKFDS" bpf-map "$FD" map-type-id=2 name="$NAME"; }
     if read -r -u "${MKFDS[0]}" PID; then
-	"${TS_CMD_LSFD}" -r -n -oBPF-MAP.TYPE,BPF-MAP.TYPE.RAW -p "${PID}" -Q "(FD == $FD)"
-	echo "BPF-MAP.TYPE,BPF-MAP.TYPE.RAW": $?
+	"${TS_CMD_LSFD}" -r -n -oBPF-MAP.TYPE,BPF-MAP.TYPE.RAW,BPF.NAME -p "${PID}" -Q "(FD == $FD)"
+	echo "BPF-MAP.TYPE,BPF-MAP.TYPE.RAW,BPF.NAME": $?
 
 	echo DONE >&"${MKFDS[1]}"
     fi
diff --git a/tests/ts/lsfd/mkfds-bpf-prog b/tests/ts/lsfd/mkfds-bpf-prog
index 72a4aea202..c26843fac0 100755
--- a/tests/ts/lsfd/mkfds-bpf-prog
+++ b/tests/ts/lsfd/mkfds-bpf-prog
@@ -30,11 +30,12 @@ ts_cd "$TS_OUTDIR"
 
 PID=
 FD=3
+NAME=mkdfs_prog
 {
-    coproc MKFDS { "$TS_HELPER_MKFDS" bpf-prog "$FD" prog-type-id=2; }
+    coproc MKFDS { "$TS_HELPER_MKFDS" bpf-prog "$FD" prog-type-id=2 name="$NAME"; }
     if read -r -u "${MKFDS[0]}" PID; then
-	"${TS_CMD_LSFD}" -r -n -oBPF-PROG.TYPE,BPF-PROG.TYPE.RAW -p "${PID}" -Q "(FD == $FD)"
-	echo "BPF-PROG.TYPE,BPF-PROG.TYPE.RAW": $?
+	"${TS_CMD_LSFD}" -r -n -oBPF-PROG.TYPE,BPF-PROG.TYPE.RAW,BPF.NAME -p "${PID}" -Q "(FD == $FD)"
+	echo "BPF-PROG.TYPE,BPF-PROG.TYPE.RAW,BPF.NAME": $?
 
 	echo DONE >&"${MKFDS[1]}"
     fi