git: 872d4fb51ef4 - stable/14 - ctladm: skip the tests if ctladm is missing

From: Alan Somers <asomers_at_FreeBSD.org>
Date: Sat, 27 Sep 2025 14:24:06 UTC
The branch stable/14 has been updated by asomers:

URL: https://cgit.FreeBSD.org/src/commit/?id=872d4fb51ef4d885302a0802101964787e02c2b5

commit 872d4fb51ef4d885302a0802101964787e02c2b5
Author:     Olivier Cochard <olivier@FreeBSD.org>
AuthorDate: 2025-06-29 00:26:13 +0000
Commit:     Alan Somers <asomers@FreeBSD.org>
CommitDate: 2025-09-27 14:21:19 +0000

    ctladm: skip the tests if ctladm is missing
    
    Reviewed by:    asomers
    Sponsored by:   Netflix
    Differential Revision:  https://reviews.freebsd.org/D51081
    
    (cherry picked from commit 582f787e2a5c3114819dfaa4611cb4762716f0a1)
---
 usr.sbin/ctladm/tests/port.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/usr.sbin/ctladm/tests/port.sh b/usr.sbin/ctladm/tests/port.sh
index a9ff609d3f4c..5bc5d879c983 100644
--- a/usr.sbin/ctladm/tests/port.sh
+++ b/usr.sbin/ctladm/tests/port.sh
@@ -73,6 +73,7 @@ create_ioctl_head()
 {
 	atf_set "descr" "ctladm can create a new ioctl port"
 	atf_set "require.user" "root"
+	atf_set "require.progs" ctladm
 }
 create_ioctl_body()
 {
@@ -96,6 +97,7 @@ remove_ioctl_without_required_args_head()
 {
 	atf_set "descr" "ctladm will gracefully fail to remove an ioctl target if required arguments are missing"
 	atf_set "require.user" "root"
+	atf_set "require.progs" ctladm
 }
 remove_ioctl_without_required_args_body()
 {
@@ -115,6 +117,7 @@ create_iscsi_head()
 {
 	atf_set "descr" "ctladm can create a new iscsi port"
 	atf_set "require.user" "root"
+	atf_set "require.progs" ctladm
 }
 create_iscsi_body()
 {
@@ -142,6 +145,7 @@ create_iscsi_alias_head()
 {
 	atf_set "descr" "ctladm can create a new iscsi port with a target alias"
 	atf_set "require.user" "root"
+	atf_set "require.progs" ctladm
 }
 create_iscsi_alias_body()
 {
@@ -168,6 +172,7 @@ create_iscsi_without_required_args_head()
 {
 	atf_set "descr" "ctladm will gracefully fail to create an iSCSI target if required arguments are missing"
 	atf_set "require.user" "root"
+	atf_set "require.progs" ctladm
 }
 create_iscsi_without_required_args_body()
 {
@@ -184,6 +189,7 @@ create_ioctl_options_head()
 {
 	atf_set "descr" "ctladm can set options when creating a new ioctl port"
 	atf_set "require.user" "root"
+	atf_set "require.progs" ctladm
 }
 create_ioctl_options_body()
 {
@@ -211,6 +217,7 @@ disable_ioctl_head()
 {
 	atf_set "descr" "ctladm can disable an ioctl port"
 	atf_set "require.user" "root"
+	atf_set "require.progs" ctladm
 }
 disable_ioctl_body()
 {
@@ -232,6 +239,7 @@ enable_ioctl_head()
 {
 	atf_set "descr" "ctladm can enable an ioctl port"
 	atf_set "require.user" "root"
+	atf_set "require.progs" ctladm
 }
 enable_ioctl_body()
 {
@@ -254,6 +262,7 @@ remove_ioctl_head()
 {
 	atf_set "descr" "ctladm can remove an ioctl port"
 	atf_set "require.user" "root"
+	atf_set "require.progs" ctladm
 }
 remove_ioctl_body()
 {
@@ -278,6 +287,7 @@ remove_iscsi_head()
 {
 	atf_set "descr" "ctladm can remove an iscsi port"
 	atf_set "require.user" "root"
+	atf_set "require.progs" ctladm
 }
 remove_iscsi_body()
 {
@@ -303,6 +313,7 @@ remove_iscsi_without_required_args_head()
 {
 	atf_set "descr" "ctladm will gracefully fail to remove an iSCSI target if required arguments are missing"
 	atf_set "require.user" "root"
+	atf_set "require.progs" ctladm
 }
 remove_iscsi_without_required_args_body()
 {