From c5c049f8398409f9ebdfc647ce1d69ce147842d0 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Tue, 15 Aug 2023 04:11:50 +0900 Subject: [PATCH] tests: (test_mkfds::mkfds-multiplexing) make the output of ts_skip_subtest visible --- tests/ts/lsfd/mkfds-multiplexing | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/ts/lsfd/mkfds-multiplexing b/tests/ts/lsfd/mkfds-multiplexing index 86753f5574..8cc7f31c09 100755 --- a/tests/ts/lsfd/mkfds-multiplexing +++ b/tests/ts/lsfd/mkfds-multiplexing @@ -41,14 +41,16 @@ for multiplexer in pselect6 select poll ppoll; do { coproc MKFDS { "$TS_HELPER_MKFDS" -w "$multiplexer" multiplexing {10..22}; } - if read -r -u "${MKFDS[0]}" PID; then - if ! cat /proc/"${PID}"/syscall > /dev/null 2>&1; then - kill -CONT "${PID}" - wait "${MKFDS_PID}" - ts_skip_subtest "cannot open /proc/${PID}/syscall" - continue - fi + } > "$TS_OUTPUT" 2>&1 + if read -r -u "${MKFDS[0]}" PID; then + if ! cat /proc/"${PID}"/syscall > /dev/null 2>&1; then + kill -CONT "${PID}" + wait "${MKFDS_PID}" + ts_skip_subtest "cannot open /proc/${PID}/syscall" + continue + fi + { "${TS_CMD_LSFD}" -n -o ASSOC,XMODE -p "${PID}" -Q '(FD >= 10) && (FD <= 22)' echo "[$multiplexer] ASSOC,XMODE: $?" @@ -58,8 +60,8 @@ for multiplexer in pselect6 select poll ppoll; do fi echo DONE >&"${MKFDS[1]}" - fi - } > "$TS_OUTPUT" 2>&1 + } >> "$TS_OUTPUT" 2>&1 + fi wait "${MKFDS_PID}" ts_finalize_subtest -- 2.47.2