Differential D51081

skip ctladm test if not installed
ClosedPublic
Actions

Authored by olivier on Jun 28 2025, 2:52 PM.

Details

Reviewers

asomers

Commits

rG872d4fb51ef4: ctladm: skip the tests if ctladm is missing
rG582f787e2a5c: ctladm: skip the tests if ctladm is missing

Summary

Use the same binary check regarding ctladm as with tests/sys/cam/ctl/*.sh scripts.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

olivier requested review of this revision.Jun 28 2025, 2:52 PM

olivier created this revision.

This is ok. It should normally be unnecessary, though, because ctladm should always be installed. Are you using pkgbase or something? I guess it might be optional in a pkgbase world.

This revision is now accepted and ready to land.Jun 28 2025, 3:42 PM

In D51081#1165915, @asomers wrote:

This is ok. It should normally be unnecessary, though, because ctladm should always be installed. Are you using pkgbase or something? I guess it might be optional in a pkgbase world.

Yes, indeed, it should now always be installed. However, we have a custom world (WITHOUT_ISCSI) and kernel (no device ctl), and since ctladm is no longer gated behind WITHOUT_ISCSI (commit 08419bf19469), this is the cleanest way I’ve found to fix this specific use case.

In D51081#1165925, @olivier wrote:

In D51081#1165915, @asomers wrote:

This is ok. It should normally be unnecessary, though, because ctladm should always be installed. Are you using pkgbase or something? I guess it might be optional in a pkgbase world.

Yes, indeed, it should now always be installed. However, we have a custom world (WITHOUT_ISCSI) and kernel (no device ctl), and since ctladm is no longer gated behind WITHOUT_ISCSI (commit 08419bf19469), this is the cleanest way I’ve found to fix this specific use case.