Page MenuHomeFreeBSD

Do not install ctladm tests if WITHOUT_ISCSI
ClosedPublic

Authored by olivier on Sep 30 2024, 8:49 PM.
Tags
None
Referenced Files
F102142613: D46853.diff
Fri, Nov 8, 3:46 AM
Unknown Object (File)
Wed, Nov 6, 7:44 AM
Unknown Object (File)
Fri, Nov 1, 4:30 AM
Unknown Object (File)
Thu, Oct 24, 5:48 AM
Unknown Object (File)
Tue, Oct 22, 6:34 PM
Unknown Object (File)
Mon, Oct 21, 1:08 PM
Unknown Object (File)
Sat, Oct 19, 11:24 AM
Unknown Object (File)
Sat, Oct 19, 12:48 AM
Subscribers

Details

Summary

in case of building with WITHOUT_ISCSI, we don’t want tests/sys/cam/ctl/ too.

Test Plan

Before:
Building with WITHOUT_ISCSI, all tests/sys/cam/ctl/ are failing because ctladm missing.
After:
No more tests/sys/cam/ctl… so no more failure.

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

asomers added a subscriber: asomers.

Technically, ctl can be used without iscsi, so I think that MK knob is named wrong. But that's beyond the scope of this PR. I think that this change is OK. Note that another way to fix the same problem would be add ctladm to the list of require.progs in each test case within that directory. But your method requires less code.

This revision is now accepted and ready to land.Sep 30 2024, 9:01 PM

I have a slight preference for require.prog since the counts are better aligne. Also, that lets people install the dist tests on their maybe customized systems for QA. I'll likely need to skip these for bsd-user too, but that's also beyond the scope. But I'm not insisting because this solves the immediate need

In D46853#1068383, @imp wrote:

I have a slight preference for require.prog since the counts are better aligne. Also, that lets people install the dist tests on their maybe customized systems for QA. I'll likely need to skip these for bsd-user too, but that's also beyond the scope. But I'm not insisting because this solves the immediate need

I will update this patch it and use the require.progs, because it is already used so I just need to add ctladm.

New version using requiered_progs.
But anyway which port should insall all the missing sg_* binaries ? I don’t find instruction about them.
Because right now they are ignored:
https://ci.freebsd.org/job/FreeBSD-main-amd64-test/lastCompletedBuild/testReport/sys.cam.ctl/prevent/allow/

This revision now requires review to proceed.Oct 1 2024, 8:20 AM

New version using requiered_progs.
But anyway which port should insall all the missing sg_* binaries ? I don’t find instruction about them.
Because right now they are ignored:
https://ci.freebsd.org/job/FreeBSD-main-amd64-test/lastCompletedBuild/testReport/sys.cam.ctl/prevent/allow/

The sg_ binaries are installed by sysutils/sg3_utils.

This revision is now accepted and ready to land.Oct 1 2024, 1:04 PM