From: Masatake YAMATO <yamato@redhat.com>
Date: Mon, 9 Oct 2023 06:29:40 +0000 (+0900)
Subject: tests: (lsfd::mkfds-socketpair) make a case for testing DGRAM a subtest and add a... 
X-Git-Tag: v2.40-rc1~210^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98d1485de9c5fdc81d424e59eb7da47d21405555;p=thirdparty%2Futil-linux.git

tests: (lsfd::mkfds-socketpair) make a case for testing DGRAM a subtest and add a subtest for STREAM

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

diff --git a/tests/expected/lsfd/mkfds-socketpair b/tests/expected/lsfd/mkfds-socketpair-DGRAM
similarity index 100%
rename from tests/expected/lsfd/mkfds-socketpair
rename to tests/expected/lsfd/mkfds-socketpair-DGRAM
diff --git a/tests/expected/lsfd/mkfds-socketpair-STREAM b/tests/expected/lsfd/mkfds-socketpair-STREAM
new file mode 100644
index 0000000000..d8ba4d0bc5
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-socketpair-STREAM
@@ -0,0 +1,3 @@
+3 rw- SOCK sockfs UNIX
+4 rw- SOCK sockfs UNIX
+ASSOC,MODE,STTYPE,SOURCE,SOCK.PROTONAME: 0
diff --git a/tests/ts/lsfd/mkfds-socketpair b/tests/ts/lsfd/mkfds-socketpair
index 64984d9464..e8c9be0be5 100755
--- a/tests/ts/lsfd/mkfds-socketpair
+++ b/tests/ts/lsfd/mkfds-socketpair
@@ -33,6 +33,7 @@ FD0=3
 FD1=4
 EXPR=
 
+ts_init_subtest "DGRAM"
 {
     coproc MKFDS { "$TS_HELPER_MKFDS" socketpair $FD0 $FD1 socktype=DGRAM; }
     if read -u ${MKFDS[0]} PID; then
@@ -42,7 +43,24 @@ EXPR=
 
 	echo DONE >&"${MKFDS[1]}"
     fi
-    wait ${MKFDS_PID}
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
+
+wait ${MKFDS_PID}
+ts_finalize_subtest
+
+ts_init_subtest "STREAM"
+{
+    coproc MKFDS { "$TS_HELPER_MKFDS" socketpair $FD0 $FD1 socktype=STREAM; }
+    if read -u ${MKFDS[0]} PID; then
+	EXPR='(PID == '"${PID}"') and ((FD == '"$FD0"') or (FD == '"$FD1"'))'
+	${TS_CMD_LSFD} -n -o ASSOC,MODE,STTYPE,SOURCE,SOCK.PROTONAME -Q "${EXPR}" | sed -e 's/UNIX-STREAM/UNIX/'
+	echo 'ASSOC,MODE,STTYPE,SOURCE,SOCK.PROTONAME': ${PIPESTATUS[0]}
+
+	echo DONE >&"${MKFDS[1]}"
+    fi
+} > "$TS_OUTPUT" 2>&1
+
+wait ${MKFDS_PID}
+ts_finalize_subtest
 
 ts_finalize