git: 215fd38e2915 - main - ctl: skip the test if ctladm is missing (WITHOUT_ISCSI)

The branch main has been updated by olivier:

URL: https://cgit.FreeBSD.org/src/commit/?id=215fd38e2915d142cb4b0245f137329ef4da5a12

commit 215fd38e2915d142cb4b0245f137329ef4da5a12
Author:     Olivier Cochard <olivier@FreeBSD.org>
AuthorDate: 2024-10-01 13:59:47 +0000
Commit:     Olivier Cochard <olivier@FreeBSD.org>
CommitDate: 2024-10-01 13:59:47 +0000

    ctl: skip the test if ctladm is missing (WITHOUT_ISCSI)
    
    Reviewed by:    asomers
    Sponsored by:   Netflix
    Differential Revision:  https://reviews.freebsd.org/D46853
---
 tests/sys/cam/ctl/prevent.sh         | 10 +++++-----
 tests/sys/cam/ctl/read_buffer.sh     | 10 +++++-----
 tests/sys/cam/ctl/start_stop_unit.sh |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/sys/cam/ctl/prevent.sh b/tests/sys/cam/ctl/prevent.sh
index a5a187dad8ff..315bedc39581 100644
--- a/tests/sys/cam/ctl/prevent.sh
+++ b/tests/sys/cam/ctl/prevent.sh
@@ -36,7 +36,7 @@ allow_head()
 {
 	atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL will prevent a CD from being ejected"
 	atf_set "require.user" "root"
-	atf_set "require.progs" sg_prevent sg_start
+	atf_set "require.progs" "sg_prevent sg_start ctladm"
 }
 allow_body()
 {
@@ -63,7 +63,7 @@ allow_idempotent_head()
 {
 	atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL is idempotent when run from the same initiator"
 	atf_set "require.user" "root"
-	atf_set "require.progs" sg_prevent sg_start
+	atf_set "require.progs" "sg_prevent sg_start ctladm"
 }
 allow_idempotent_body()
 {
@@ -89,7 +89,7 @@ nonremovable_head()
 {
 	atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL may not be used on non-removable media"
 	atf_set "require.user" "root"
-	atf_set "require.progs" sg_prevent
+	atf_set "require.progs" "sg_prevent ctladm"
 }
 nonremovable_body()
 {
@@ -108,7 +108,7 @@ prevent_head()
 {
 	atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL will prevent a CD from being ejected"
 	atf_set "require.user" "root"
-	atf_set "require.progs" sg_prevent sg_start
+	atf_set "require.progs" "sg_prevent sg_start ctladm"
 }
 prevent_body()
 {
@@ -130,7 +130,7 @@ prevent_idempotent_head()
 {
 	atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL is idempotent when run from the same initiator"
 	atf_set "require.user" "root"
-	atf_set "require.progs" sg_prevent sg_start
+	atf_set "require.progs" "sg_prevent sg_start ctladm"
 }
 prevent_idempotent_body()
 {
diff --git a/tests/sys/cam/ctl/read_buffer.sh b/tests/sys/cam/ctl/read_buffer.sh
index e54b0dadc134..98515943dd40 100644
--- a/tests/sys/cam/ctl/read_buffer.sh
+++ b/tests/sys/cam/ctl/read_buffer.sh
@@ -35,7 +35,7 @@ basic_head()
 {
 	atf_set "descr" "READ BUFFER can retrieve data previously written by WRITE BUFFER"
 	atf_set "require.user" "root"
-	atf_set "require.progs" sg_read_buffer sg_write_buffer
+	atf_set "require.progs" "sg_read_buffer sg_write_buffer ctladm"
 }
 basic_body()
 {
@@ -66,7 +66,7 @@ desc_head()
 {
 	atf_set "descr" "READ BUFFER can retrieve the buffer size via the DESCRIPTOR mode"
 	atf_set "require.user" "root"
-	atf_set "require.progs" sg_read_buffer
+	atf_set "require.progs" "sg_read_buffer ctladm"
 }
 desc_body()
 {
@@ -84,7 +84,7 @@ length_head()
 {
 	atf_set "descr" "READ BUFFER can limit its length with the LENGTH field"
 	atf_set "require.user" "root"
-	atf_set "require.progs" sg_read_buffer sg_write_buffer
+	atf_set "require.progs" "sg_read_buffer sg_write_buffer ctladm"
 }
 length_body()
 {
@@ -113,7 +113,7 @@ offset_head()
 {
 	atf_set "descr" "READ BUFFER accepts the BUFFER OFFSET field"
 	atf_set "require.user" "root"
-	atf_set "require.progs" sg_read_buffer sg_write_buffer
+	atf_set "require.progs" "sg_read_buffer sg_write_buffer ctladm"
 }
 offset_body()
 {
@@ -142,7 +142,7 @@ uninitialized_head()
 {
 	atf_set "descr" "READ BUFFER buffers are zero-initialized"
 	atf_set "require.user" "root"
-	atf_set "require.progs" sg_read_buffer
+	atf_set "require.progs" "sg_read_buffer ctladm"
 }
 uninitialized_body()
 {
diff --git a/tests/sys/cam/ctl/start_stop_unit.sh b/tests/sys/cam/ctl/start_stop_unit.sh
index 163011c8f574..a1160b35e4a7 100644
--- a/tests/sys/cam/ctl/start_stop_unit.sh
+++ b/tests/sys/cam/ctl/start_stop_unit.sh
@@ -40,7 +40,7 @@ eject_head()
 {
 	atf_set "descr" "START STOP UNIT can eject a CDROM device"
 	atf_set "require.user" "root"
-	atf_set "require.progs" sg_start sg_readcap
+	atf_set "require.progs" "sg_start sg_readcap ctladm"
 }
 eject_body()
 {
@@ -68,7 +68,7 @@ load_head()
 {
 	atf_set "descr" "START STOP UNIT can load a CDROM device"
 	atf_set "require.user" "root"
-	atf_set "require.progs" sg_start sg_readcap
+	atf_set "require.progs" "sg_start sg_readcap ctladm"
 }
 load_body()
 {
@@ -97,7 +97,7 @@ start_head()
 {
 	atf_set "descr" "START STOP UNIT can start a device"
 	atf_set "require.user" "root"
-	atf_set "require.progs" sg_start sg_readcap
+	atf_set "require.progs" "sg_start sg_readcap ctladm"
 }
 start_body()
 {
@@ -123,7 +123,7 @@ stop_head()
 {
 	atf_set "descr" "START STOP UNIT can stop a device"
 	atf_set "require.user" "root"
-	atf_set "require.progs" sg_start sg_readcap
+	atf_set "require.progs" "sg_start sg_readcap ctladm"
 }
 stop_body()
 {