Page MenuHomeFreeBSD

pkgbase: fix inclusion of tests in ssh, bsnmp, clibs-dev
AcceptedPublic

Authored by ifreund_freebsdfoundation.org on Wed, Oct 9, 1:17 PM.
Tags
None
Referenced Files
F102099048: D47025.diff
Thu, Nov 7, 2:39 PM
Unknown Object (File)
Sun, Oct 20, 6:27 PM
Unknown Object (File)
Fri, Oct 18, 3:20 AM
Unknown Object (File)
Fri, Oct 11, 2:37 PM
Unknown Object (File)
Thu, Oct 10, 10:05 PM
Subscribers

Details

Reviewers
bapt
emaste
Summary

Currently, files that belong in the tests package are included in the
ssh, bsnmp, and clibs-dev packages:

ssh.plist
24:@dir(root,wheel,0755,) /usr/tests/secure/libexec
25:@(root,wheel,0444,) /usr/tests/secure/libexec/Kyuafile

bsnmp.plist
82:@dir(root,wheel,0755,) /usr/tests/lib/libbsnmp
83:@(root,wheel,0444,) /usr/tests/lib/libbsnmp/Kyuafile
84:@(root,wheel,0555,) /usr/tests/lib/libbsnmp/bsnmpd_test

clibs-dev.plist
2518:@dir(root,wheel,0755,) /usr/tests/lib/csu
2519:@(root,wheel,0444,) /usr/tests/lib/csu/Kyuafile

This is caused by the PACKAGE=foo assignment in foo/Makefile.inc which
overrides the default PACKAGE?=tests in bsd.test.mk.

To fix this, instead use PACKAGE?=foo in foo/Makefile.inc and set
PACKAGE=tests in foo/tests/Makefile.

PR: 249144
Sponsored by: The FreeBSD Foundation

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 59867
Build 56752: arc lint + arc unit

Event Timeline

I wonder if we can have bsd.test.mk set PACKAGE?= tests before .include <bsd.init.mk>, which would let us drop the Makefile changes. I'm fine with either version so will see if @bapt has a comment.

This revision is now accepted and ready to land.Wed, Oct 9, 7:13 PM

I wonder if we can have bsd.test.mk set PACKAGE?= tests before .include <bsd.init.mk>, which would let us drop the Makefile changes. I'm fine with either version so will see if @bapt has a comment.

Yes, that would work and allow us to avoid the PACKAGE=tests in foo/tests/Makefile though we would still need to replace PACKAGE=foo with PACKAGE?=foo in foo/Makefile.inc.

I don't have a strong opinion on which approach is better, they both seem reasonable to me.