tests: (lsfd) don't refer "$?" on the line follwoing the use of "local"

[thirdparty/util-linux.git] / tests / ts / lsfd / lsfd-functions.bash

diff --git a/tests/ts/lsfd/lsfd-functions.bash b/tests/ts/lsfd/lsfd-functions.bash
index 014145e3ca3a2f3ae6e09b54a81c35402f5f0950..9c2eb0785b3cd1c589bc582ffbd6f37623240362 100644 (file)
--- a/tests/ts/lsfd/lsfd-functions.bash
+++ b/tests/ts/lsfd/lsfd-functions.bash
@@ -16,10 +16,11 @@
 #
 
 # The exit-status used in a test target.
-readonly ENOSYS=17
 readonly EPERM=18
 readonly ENOPROTOOPT=19
 readonly EPROTONOSUPPORT=20
+readonly EACCES=21
+readonly ENOENT=22
 
 function lsfd_wait_for_pausing {
        ts_check_prog "sleep"
@@ -39,13 +40,18 @@ function lsfd_compare_dev {
     ts_check_prog "expr"
     ts_check_prog "stat"
 
-    local DEV=$("${LSFD}" --raw -n -o DEV -Q "${EXPR}")
+    local DEV
+    DEV=$("${LSFD}" --raw -n -o DEV -Q "${EXPR}")
     echo 'DEV[RUN]:' $?
+
     local MAJ=${DEV%:*}
     local MIN=${DEV#*:}
-    local DEVNUM=$(( ( MAJ << 8 ) + MIN ))
-    local STAT_DEVNUM=$(stat -c "%d" "$FILE")
+    local DEVNUM=$(ts_makedev "$MAJ" "$MIN")
+
+    local STAT_DEVNUM
+    STAT_DEVNUM=$(stat -c "%d" "$FILE")
     echo 'STAT[RUN]:' $?
+
     if [ "${DEVNUM}" == "${STAT_DEVNUM}" ]; then
        echo 'DEVNUM[STR]:' 0
     else
@@ -57,3 +63,64 @@ function lsfd_compare_dev {
        echo 'STAT_DEVNUM:' "${STAT_DEVNUM}"
     fi
 }
+
+function lsfd_strip_type_stream
+{
+    # lsfd changes the output of NAME column for a unix stream socket
+    # whether the kernel reports it is a "UNIX-STREAM" socket or a
+    # "UNIX" socket. For "UNIX", lsfd appends "type=stream" to the
+    # NAME column. Let's delete the appended string before comparing.
+    sed -e 's/ type=stream//'
+}
+
+function lsfd_make_state_connected
+{
+    # Newer kernels report the states of unix dgram sockets created by
+    # sockerpair(2) are "connected" via /proc/net/unix though Older
+    # kernels report "unconnected".
+    #
+    # Newer kernels report the states of unix dgram sockets already
+    # connect(2)'ed are "connected", too.
+    #
+    # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=83301b5367a98c17ec0d76c7bc0ccdc3c7e7ad6d
+    #
+    # This rewriting adjusts the output of lsfd running on older kernels
+    # to that on newer kernels.
+    sed -e 's/state=unconnected/state=connected/'
+}
+
+function lsfd_check_mkfds_factory
+{
+       local FACTORY=$1
+
+       ts_check_test_command "$TS_HELPER_MKFDS"
+       if ! "$TS_HELPER_MKFDS" --is-available "$FACTORY"; then
+               ts_skip "test_mkfds has no factory for $FACTORY"
+       fi
+}
+
+function lsfd_check_sockdiag
+{
+       local family=$1
+
+       ts_check_test_command "$TS_HELPER_MKFDS"
+
+       local msg
+       local err
+
+       msg=$("$TS_HELPER_MKFDS" -c sockdiag 9 family=$family 2>&1)
+       err=$?
+
+       case $err in
+           0)
+               return;;
+           $EPROTONOSUPPORT)
+               ts_skip "NETLINK_SOCK_DIAG protocol is not supported in socket(2)";;
+           $EACCES)
+               ts_skip "sending a msg via a sockdiag netlink socket is not permitted";;
+           $ENOENT)
+               ts_skip "sockdiag netlink socket is not available";;
+           *)
+               ts_failed "failed to create a sockdiag netlink socket $family ($err): $msg";;
+       esac
+}