Blame 0122-test-TEST-30-ISCSI-depend-on-tgtd-and-tgtadm.patch

Harald Hoyer 53404a
From dba974844eaff2beb31a3c248965f5789d22bbb6 Mon Sep 17 00:00:00 2001
Harald Hoyer 53404a
From: Harald Hoyer <harald@redhat.com>
Harald Hoyer 53404a
Date: Mon, 22 Aug 2016 13:32:03 +0200
Harald Hoyer 53404a
Subject: [PATCH] test/TEST-30-ISCSI: depend on tgtd and tgtadm
Harald Hoyer 53404a
Harald Hoyer 53404a
the testsuite now needs tgtd and tgtadm and not iscsi-target
Harald Hoyer 53404a
---
Harald Hoyer 53404a
 test/TEST-30-ISCSI/test.sh | 4 ++--
Harald Hoyer 53404a
 1 file changed, 2 insertions(+), 2 deletions(-)
Harald Hoyer 53404a
Harald Hoyer 53404a
diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
Harald Hoyer 53404a
index 63944b3..d4f0f8c 100755
Harald Hoyer 53404a
--- a/test/TEST-30-ISCSI/test.sh
Harald Hoyer 53404a
+++ b/test/TEST-30-ISCSI/test.sh
Harald Hoyer 53404a
@@ -138,8 +138,8 @@ test_run() {
Harald Hoyer 53404a
 }
Harald Hoyer 53404a
 
Harald Hoyer 53404a
 test_setup() {
Harald Hoyer 53404a
-    if [ ! -x /usr/sbin/iscsi-target ]; then
Harald Hoyer 53404a
-        echo "Need iscsi-target from netbsd-iscsi"
Harald Hoyer 53404a
+    if ! command -v tgtd &>/dev/null || ! command -v tgtadm &>/dev/null; then
Harald Hoyer 53404a
+        echo "Need tgtd and tgtadm from scsi-target-utils"
Harald Hoyer 53404a
         return 1
Harald Hoyer 53404a
     fi
Harald Hoyer 53404a