Date: Wed, 22 Apr 2026 14:16:53 +0000 From: Olivier Cochard <olivier@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 19213b8eb33f - main - ctl: require ctladm in addition to sg_opcodes Message-ID: <69e8d855.25982.19cab126@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=19213b8eb33f8cb692abb1ee857778af347ddfeb commit 19213b8eb33f8cb692abb1ee857778af347ddfeb Author: Olivier Cochard <olivier@FreeBSD.org> AuthorDate: 2026-04-22 14:14:04 +0000 Commit: Olivier Cochard <olivier@FreeBSD.org> CommitDate: 2026-04-22 14:16:15 +0000 ctl: require ctladm in addition to sg_opcodes Each test case in opcodes.sh uses ctladm to create and remove the LUN it exercises, but only sg_opcodes was listed in require.progs. On systems where ctladm is not builded the tests would fail at setup instead of being skipped cleanly. Approved by: asomers Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D56568 --- tests/sys/cam/ctl/opcodes.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/sys/cam/ctl/opcodes.sh b/tests/sys/cam/ctl/opcodes.sh index 1d558a1095a0..ccb39828f6ed 100644 --- a/tests/sys/cam/ctl/opcodes.sh +++ b/tests/sys/cam/ctl/opcodes.sh @@ -46,7 +46,7 @@ all_opcodes_head() { atf_set "descr" "REPORT SUPPORTED OPCODES can report all supported opcodes" atf_set "require.user" "root" - atf_set "require.progs" sg_opcodes + atf_set "require.progs" sg_opcodes ctladm } all_opcodes_body() { @@ -66,7 +66,7 @@ basic_head() { atf_set "descr" "REPORT SUPPORTED OPCODES can report a single supported opcode" atf_set "require.user" "root" - atf_set "require.progs" sg_opcodes + atf_set "require.progs" sg_opcodes ctladm } basic_body() { @@ -84,7 +84,7 @@ invalid_rep_opts_head() { atf_set "descr" "REPORT SUPPORTED OPCODES will fail gracefully if the REPORTING OPTIONS field is set to an invalid value" atf_set "require.user" "root" - atf_set "require.progs" sg_opcodes + atf_set "require.progs" sg_opcodes ctladm } invalid_rep_opts_body() { @@ -105,7 +105,7 @@ missing_service_action_head() { atf_set "descr" "REPORT SUPPORTED OPCODES fails gracefully if the service action is omitted" atf_set "require.user" "root" - atf_set "require.progs" sg_opcodes + atf_set "require.progs" sg_opcodes ctladm } missing_service_action_body() { @@ -124,7 +124,7 @@ out_of_bounds_service_action_head() { atf_set "descr" "REPORT SUPPORTED OPCODES fails gracefully if the requested service action is out of bounds" atf_set "require.user" "root" - atf_set "require.progs" sg_opcodes + atf_set "require.progs" sg_opcodes ctladm } out_of_bounds_service_action_body() { @@ -152,7 +152,7 @@ service_action_head() { atf_set "descr" "REPORT SUPPORTED OPCODES can query an opcode that needs a service action" atf_set "require.user" "root" - atf_set "require.progs" sg_opcodes + atf_set "require.progs" sg_opcodes ctladm } service_action_body() { @@ -172,7 +172,7 @@ unexpected_service_action_head() { atf_set "descr" "REPORT SUPPORTED OPCODES fails gracefully if an extraneous service action is provided" atf_set "require.user" "root" - atf_set "require.progs" sg_opcodes + atf_set "require.progs" sg_opcodes ctladm } unexpected_service_action_body() { @@ -194,7 +194,7 @@ unexpected_service_action_ro3_head() { atf_set "descr" "REPORT SUPPORTED OPCODES fails gracefully if an extraneous service action is provided, using REPORTING OPTIONS 3" atf_set "require.user" "root" - atf_set "require.progs" sg_opcodes + atf_set "require.progs" sg_opcodes ctladm } unexpected_service_action_ro3_body() { @@ -213,7 +213,7 @@ unsupported_opcode_head() { atf_set "descr" "REPORT SUPPORTED OPCODES can report a single unsupported opcode" atf_set "require.user" "root" - atf_set "require.progs" sg_opcodes + atf_set "require.progs" sg_opcodes ctladm } unsupported_opcode_body() {home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e8d855.25982.19cab126>