tests: (lsfd) don't run the unix-stream testcase including newlines in the path on...

Close #2402.

The communication code for retrieving unix socket information doesn't
consider the byteorder now.

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

diff --git a/tests/expected/lsfd/mkfds-unix-stream b/tests/expected/lsfd/mkfds-unix-stream
index 22d1d352d1fb001f1b932bfcde57a3992a67d746..645be818454823b946409a61c1ca3e54ffa48bce 100644 (file)
--- a/tests/expected/lsfd/mkfds-unix-stream
+++ b/tests/expected/lsfd/mkfds-unix-stream
@@ -14,10 +14,6 @@ ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
 4 SOCK state=connected                                         connected stream 0 
 5 SOCK state=connected path=test_mkfds-unix with spaces stream connected stream 0 test_mkfds-unix with spaces stream
 ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
-3 SOCK state=listen path=test_mkfds-unix with newline stream a\x0ab\x0ac       listen stream 1 test_mkfds-unix with newline stream a\x0ab\x0ac
-4 SOCK state=connected                                                      connected stream 0 
-5 SOCK state=connected path=test_mkfds-unix with newline stream a\x0ab\x0ac connected stream 0 test_mkfds-unix with newline stream a\x0ab\x0ac
-ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
 3 SOCK state=listen path=test_mkfds-unix-seqpacket type=seqpacket       listen seqpacket 1 test_mkfds-unix-seqpacket
 4 SOCK state=connected type=seqpacket                                connected seqpacket 0 
 5 SOCK state=connected path=test_mkfds-unix-seqpacket type=seqpacket connected seqpacket 0 test_mkfds-unix-seqpacket
@@ -34,7 +30,3 @@ ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
 4 SOCK state=connected type=seqpacket                                            connected seqpacket 0 
 5 SOCK state=connected path=test_mkfds-unix with spaces seqpacket type=seqpacket connected seqpacket 0 test_mkfds-unix with spaces seqpacket
 ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
-3 SOCK state=listen path=test_mkfds-unix with newline seqpacket a\x0ab\x0ac type=seqpacket       listen seqpacket 1 test_mkfds-unix with newline seqpacket a\x0ab\x0ac
-4 SOCK state=connected type=seqpacket                                                         connected seqpacket 0 
-5 SOCK state=connected path=test_mkfds-unix with newline seqpacket a\x0ab\x0ac type=seqpacket connected seqpacket 0 test_mkfds-unix with newline seqpacket a\x0ab\x0ac
-ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0

diff --git a/tests/expected/lsfd/mkfds-unix-stream-requiring-sockdiag b/tests/expected/lsfd/mkfds-unix-stream-requiring-sockdiag
new file mode 100644 (file)
index 0000000..946c95f
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-unix-stream-requiring-sockdiag
@@ -0,0 +1,8 @@
+3 SOCK state=listen path=test_mkfds-unix with newline stream a\x0ab\x0ac       listen stream 1 test_mkfds-unix with newline stream a\x0ab\x0ac
+4 SOCK state=connected                                                      connected stream 0 
+5 SOCK state=connected path=test_mkfds-unix with newline stream a\x0ab\x0ac connected stream 0 test_mkfds-unix with newline stream a\x0ab\x0ac
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
+3 SOCK state=listen path=test_mkfds-unix with newline seqpacket a\x0ab\x0ac type=seqpacket       listen seqpacket 1 test_mkfds-unix with newline seqpacket a\x0ab\x0ac
+4 SOCK state=connected type=seqpacket                                                         connected seqpacket 0 
+5 SOCK state=connected path=test_mkfds-unix with newline seqpacket a\x0ab\x0ac type=seqpacket connected seqpacket 0 test_mkfds-unix with newline seqpacket a\x0ab\x0ac
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0

diff --git a/tests/ts/lsfd/mkfds-unix-stream b/tests/ts/lsfd/mkfds-unix-stream
index e4ec361756e7b6d8b139b9d9e560582b91051d2a..fe08e720350ff7598a8bf74e7eee7672ce90e3a4 100755 (executable)
--- a/tests/ts/lsfd/mkfds-unix-stream
+++ b/tests/ts/lsfd/mkfds-unix-stream
@@ -92,19 +92,6 @@ EXPR='(((TYPE == "UNIX-STREAM") or (TYPE == "UNIX")) and (FD >= 3) and (FD <= 5)
        fi
        wait "${MKFDS_PID}"
 
-       coproc MKFDS { "$TS_HELPER_MKFDS" unix-stream $FDS $FDC $FDA \
-                                         path="test_mkfds-unix with newline ${t} $(printf 'a\nb\nc')" \
-                                         type=$t ; }
-       if read -r -u "${MKFDS[0]}" PID; then
-           ${TS_CMD_LSFD} -n \
-                          -o ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH \
-                          -p "${PID}" -Q "${EXPR}" | lsfd_strip_type_stream
-           echo 'ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH': ${PIPESTATUS[0]}
-
-           kill -CONT "${PID}"
-       fi
-       wait "${MKFDS_PID}"
-
     done
 } > "$TS_OUTPUT" 2>&1
 

diff --git a/tests/ts/lsfd/mkfds-unix-stream-requiring-sockdiag b/tests/ts/lsfd/mkfds-unix-stream-requiring-sockdiag
new file mode 100755 (executable)
index 0000000..64bdae0
--- /dev/null
+++ b/tests/ts/lsfd/mkfds-unix-stream-requiring-sockdiag
@@ -0,0 +1,56 @@
+#!/bin/bash
+#
+# Copyright (C) 2022 Masatake YAMATO <yamato@redhat.com>
+#
+# This file is part of util-linux.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+TS_TOPDIR="${0%/*}/../.."
+TS_DESC="UNIX stream sockets"
+
+. "$TS_TOPDIR"/functions.sh
+ts_init "$*"
+ts_skip_qemu_user
+
+. "$TS_SELF/lsfd-functions.bash"
+
+ts_check_test_command "$TS_CMD_LSFD"
+ts_check_test_command "$TS_HELPER_MKFDS"
+
+ts_cd "$TS_OUTDIR"
+
+PID=
+FDS=3
+FDC=4
+FDA=5
+EXPR='(((TYPE == "UNIX-STREAM") or (TYPE == "UNIX")) and (FD >= 3) and (FD <= 5))'
+
+{
+    for t in stream seqpacket; do
+
+       coproc MKFDS { "$TS_HELPER_MKFDS" unix-stream $FDS $FDC $FDA \
+                                         path="test_mkfds-unix with newline ${t} $(printf 'a\nb\nc')" \
+                                         type=$t ; }
+       if read -r -u "${MKFDS[0]}" PID; then
+           ${TS_CMD_LSFD} -n \
+                          -o ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH \
+                          -p "${PID}" -Q "${EXPR}" | lsfd_strip_type_stream
+           echo 'ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH': ${PIPESTATUS[0]}
+
+           kill -CONT "${PID}"
+       fi
+       wait "${MKFDS_PID}"
+
+    done
+} > "$TS_OUTPUT" 2>&1
+
+ts_finalize