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

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 (file)
index 0000000..d8ba4d0
--- /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 64984d9464204cd46762e9c9c0e2b43418a71bf0..e8c9be0be5350d1fac29221e46c1fbddcbb2a54d 100755 (executable)
--- 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