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 (file)
index 0000000..b4f7964
--- /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 8596d25324feb6256b331cca74e2c1aeff32eab6..b67afc540f0b11452addfd50160d1d12701682e1 100644 (file)
--- 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 cbf88d8b8a3930e0ecc37b07c51d9b0eabca232e..0782ef043585453e9d81203ae4cadac897ecf9a0 100755 (executable)
--- 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 72a4aea20236f3fa6f5bdc31b2cc9cfa2429cdf8..c26843fac0723bc0342ff7bf24843dd07b475298 100755 (executable)
--- 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