From: Masatake YAMATO Date: Fri, 25 Oct 2024 20:41:29 +0000 (+0900) Subject: tests: (lsfd::mkfds-bpf-prog) verify BPF-PROG.{ID,TAG} column X-Git-Tag: v2.42-start~170^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f03c26fdd5ddf2d3e7ff32eeb42600b4ea4196be;p=thirdparty%2Futil-linux.git tests: (lsfd::mkfds-bpf-prog) verify BPF-PROG.{ID,TAG} column Signed-off-by: Masatake YAMATO --- diff --git a/tests/expected/lsfd/mkfds-bpf-prog b/tests/expected/lsfd/mkfds-bpf-prog index b67afc540..0b2478d27 100644 --- a/tests/expected/lsfd/mkfds-bpf-prog +++ b/tests/expected/lsfd/mkfds-bpf-prog @@ -1,2 +1,4 @@ kprobe 2 mkdfs_prog BPF-PROG.TYPE,BPF-PROG.TYPE.RAW,BPF.NAME: 0 +comparing ids: OK +comparing tags: OK diff --git a/tests/ts/lsfd/mkfds-bpf-prog b/tests/ts/lsfd/mkfds-bpf-prog index 1c1df1ef5..1ec4cbf8f 100755 --- a/tests/ts/lsfd/mkfds-bpf-prog +++ b/tests/ts/lsfd/mkfds-bpf-prog @@ -29,14 +29,30 @@ ts_check_test_command "$TS_HELPER_MKFDS" ts_cd "$TS_OUTDIR" PID= +ID= +TAG= FD=3 NAME=mkdfs_prog { coproc MKFDS { "$TS_HELPER_MKFDS" bpf-prog "$FD" prog-type-id=2 name="$NAME"; } - if read -r -u "${MKFDS[0]}" PID UNUSED; then + if read -r -u "${MKFDS[0]}" PID ID TAG; then "${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": $? + ID_0=$("${TS_CMD_LSFD}" -r -n -oBPF-PROG.ID -p "${PID}" -Q "(FD == $FD)") + if [[ "${ID_0}" == "${ID}" ]]; then + echo "comparing ids": OK + else + echo "comparing ids": FAILED "ID_0:${ID_0} == ID:${ID}" + fi + + TAG_0=$("${TS_CMD_LSFD}" -r -n -oBPF-PROG.TAG -p "${PID}" -Q "(FD == $FD)") + if [[ "${TAG_0}" == "${TAG}" ]]; then + echo "comparing tags": OK + else + echo "comparing tags": FAILED "TAG_0:${TAG_0} == TAG:${TAG}" + fi + echo DONE >&"${MKFDS[1]}" fi wait "${MKFDS_PID}"