Skip vsock-related checks if AF_VSOCK is not supported.

Gbp-Pq: Name 0010-Skip-vsock-related-checks-if-AF_VSOCK-is-not-support.patch

diff --git a/tests/functions.sh.in b/tests/functions.sh.in
index 403fa56e2eabf3188f1bcc0058cd6c9b3f28d64b..d6c4255cd23d4732b9e289c41bc8f3877e821c5b 100644 (file)
--- a/tests/functions.sh.in
+++ b/tests/functions.sh.in
@@ -239,6 +239,16 @@ requires_non_root ()
     fi
 }
 
+# Tests that use the vsock interface will fail if vsock is not
+# supported.
+requires_vsock_support ()
+{
+    if ! grep -q ^AF_VSOCK /proc/net/protocols; then
+        echo "$0: test skipped because AF_VSOCK is not supported."
+        exit 77
+    fi
+}
+
 # start_nbdkit -P pidfile args...
 #
 # Run nbdkit with args and wait for it to start up.  If it fails to

diff --git a/tests/test-ip-filter-anyvsock.sh b/tests/test-ip-filter-anyvsock.sh
index 3160e9822057d49610585bbe54cc68e1fe45bf71..016b1da9f2c70f95c82e3e55f1e5a768de3ca033 100755 (executable)
--- a/tests/test-ip-filter-anyvsock.sh
+++ b/tests/test-ip-filter-anyvsock.sh
@@ -47,6 +47,7 @@ requires nbdsh --version
 requires nbdsh -c 'print(h.connect_vsock)'
 requires_nbdsh_uri
 requires_linux_kernel_version 5.6
+requires_vsock_support
 
 # Not supported on Windows.
 if is_windows; then

diff --git a/tests/test-nbd-vsock.sh b/tests/test-nbd-vsock.sh
index e37368984a5abd2f06ffd7d826a3b99ea3ce8913..f1f839a06a3c0c67afcff1bfe0ea615ae3871f0e 100755 (executable)
--- a/tests/test-nbd-vsock.sh
+++ b/tests/test-nbd-vsock.sh
@@ -47,6 +47,7 @@ set -x
 requires_nbdsh_uri
 requires nbdsh -c 'print(h.connect_vsock)'
 requires_linux_kernel_version 5.6
+requires_vsock_support
 
 # Because vsock ports are 32 bits, we can basically pick one at random
 # and be sure that it's not used.  However we must pick one >= 1024

diff --git a/tests/test-vsock.sh b/tests/test-vsock.sh
index fc39cb7b972b423c49270a79cf6a343aba967e0f..0bcfc4baf9629cfe2c22947b67c9ea53ce02a836 100755 (executable)
--- a/tests/test-vsock.sh
+++ b/tests/test-vsock.sh
@@ -47,6 +47,7 @@ requires nbdsh --version
 requires nbdsh -c 'print(h.connect_vsock)'
 requires_nbdsh_uri
 requires_linux_kernel_version 5.6
+requires_vsock_support
 
 # Because vsock ports are 32 bits, we can basically pick one at random
 # and be sure that it's not used.  However we must pick one >= 1024