test/NBD: add checks for needed binaries

diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
index 1a6524de281c03f15ccc5ae94d2004cb5b24063e..848a103fcf577ac12abead99b881de104bdfa900 100755 (executable)
--- a/test/TEST-40-NBD/test.sh
+++ b/test/TEST-40-NBD/test.sh
@@ -95,7 +95,6 @@ client_test() {
 }
 
 test_run() {
-    modinfo nbd &>/dev/null || { echo "Kernel does not support nbd"; exit 1; }
     if ! run_server; then
         echo "Failed to start server" 1>&2
         return 1
@@ -325,9 +324,6 @@ make_server_root() {
 }
 
 test_setup() {
-
-    modinfo nbd &>/dev/null || { echo "Kernel does not support nbd"; exit 1; }
-
     make_encrypted_root || return 1
     make_client_root || return 1
     make_server_root || return 1
@@ -370,6 +366,12 @@ kill_server() {
     fi
 }
 
+test_check() {
+    modinfo nbd &>/dev/null || { echo "Kernel does not support nbd"; return 1; }
+    command -v nbd-client &>/dev/null || { echo "No nbd-client available"; return 1; }
+    command -v nbd-server &>/dev/null || { echo "No nbd-server available"; return 1; }
+}
+
 test_cleanup() {
     kill_server
 }