From: Masatake YAMATO <yamato@redhat.com>
Date: Mon, 6 Jan 2025 12:04:09 +0000 (+0900)
Subject: tests: (lsfd::mkfds_vsock) skip if diag socket for AF_VSOCK is unavailable
X-Git-Tag: v2.42-start~103^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1dcb396ab03b378e9e9108362f8e9793b102a2c;p=thirdparty%2Futil-linux.git

tests: (lsfd::mkfds_vsock) skip if diag socket for AF_VSOCK is unavailable

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

diff --git a/tests/ts/lsfd/lsfd-functions.bash b/tests/ts/lsfd/lsfd-functions.bash
index 8bbe31ab1..7aa384c1c 100644
--- a/tests/ts/lsfd/lsfd-functions.bash
+++ b/tests/ts/lsfd/lsfd-functions.bash
@@ -105,13 +105,14 @@ function lsfd_check_mkfds_factory
 function lsfd_check_sockdiag
 {
 	local family=$1
+	local type=${2:-dgram}
 
 	ts_check_test_command "$TS_HELPER_MKFDS"
 
 	local msg
 	local err
 
-	msg=$("$TS_HELPER_MKFDS" -c sockdiag 9 family=$family 2>&1)
+	msg=$("$TS_HELPER_MKFDS" -c sockdiag 9 family=$family type=$type 2>&1)
 	err=$?
 
 	case $err in
diff --git a/tests/ts/lsfd/mkfds-vsock b/tests/ts/lsfd/mkfds-vsock
index 7b740aca0..fb926c999 100755
--- a/tests/ts/lsfd/mkfds-vsock
+++ b/tests/ts/lsfd/mkfds-vsock
@@ -48,7 +48,10 @@ modprobe --quiet hv_vsock ||:
 # VMADDR_CID_LOCAL requires this.
 modprobe --quiet vsock_loopback	||:
 
+modprobe --quiet vsock_diag || :
+
 lsfd_check_vsock
+lsfd_check_sockdiag vsock raw
 
 {