From aed371507cc18cd613449396aa35b3303484e2c8 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Sun, 23 Nov 2025 16:00:24 +0900 Subject: [PATCH] tests: (lsfd::mkfds-cdev-tun,refactor) make the case extensible Signed-off-by: Masatake YAMATO --- tests/ts/lsfd/mkfds-cdev-tun | 55 ++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/tests/ts/lsfd/mkfds-cdev-tun b/tests/ts/lsfd/mkfds-cdev-tun index 7354509c4d..028b420013 100755 --- a/tests/ts/lsfd/mkfds-cdev-tun +++ b/tests/ts/lsfd/mkfds-cdev-tun @@ -32,34 +32,47 @@ PID= FD=3 IFNAME= +cdev_tun_test() { - coproc MKFDS { "$TS_HELPER_MKFDS" cdev-tun $FD ; } - if read -u ${MKFDS[0]} PID IFNAME; then - EXPR='(FD == '"$FD"')' - ${TS_CMD_LSFD} -p "${PID}" -n -o ASSOC,MODE,TYPE,SOURCE -Q "${EXPR}" - echo 'ASSOC,MODE,TYPE,SOURCE': $? + local tname=domestic - output=$(${TS_CMD_LSFD} -p "${PID}" -n --raw -o NAME -Q "${EXPR}") - if [[ "$output" == "iface=$IFNAME" ]]; then - echo 'NAME': $? - else - echo 'NAME': $? - echo "expected NAME: iface=$IFNAME" - echo "output NAME: $output" - fi + ts_init_subtest "$tname" + { + coproc MKFDS { "$TS_HELPER_MKFDS" cdev-tun $FD ; } + + if read -u ${MKFDS[0]} PID IFNAME; then + EXPR='(FD == '"$FD"')' + ${TS_CMD_LSFD} -p "${PID}" -n -o ASSOC,MODE,TYPE,SOURCE -Q "${EXPR}" + echo 'ASSOC,MODE,TYPE,SOURCE': $? + + output=$(${TS_CMD_LSFD} -p "${PID}" -n --raw -o NAME -Q "${EXPR}") + if [[ "$output" == "iface=$IFNAME" ]]; then + echo 'NAME': $? + else + echo 'NAME': $? + echo "expected NAME: iface=$IFNAME" + echo "output NAME: $output" + fi - output=$(${TS_CMD_LSFD} -p "${PID}" -n --raw -o TUN.IFACE -Q "${EXPR}") - if [[ "$output" == "$IFNAME" ]]; then - echo 'TUN.IFACE': $? - else - echo 'TUN.IFAEC': $? - echo "expected TUN.IFACE: $IFNAME" - echo "output TUN.IFACE: $output" + output=$(${TS_CMD_LSFD} -p "${PID}" -n --raw -o TUN.IFACE -Q "${EXPR}") + if [[ "$output" == "$IFNAME" ]]; then + echo 'TUN.IFACE': $? + else + echo 'TUN.IFAEC': $? + echo "expected TUN.IFACE: $IFNAME" + echo "output TUN.IFACE: $output" + fi fi + } > $TS_OUTPUT 2>&1 + ts_finalize_subtest + if [[ -n "$PID" ]]; then echo DONE >&"${MKFDS[1]}" fi + wait ${MKFDS_PID} -} > $TS_OUTPUT 2>&1 +} + +cdev_tun_test ts_finalize -- 2.47.3