git: 3a56015a2f5d - main - pkgbase: fix inclusion of tests in ssh, bsnmp, clibs-dev

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=3a56015a2f5d630910177fa79a522bb95511ccf7

commit 3a56015a2f5d630910177fa79a522bb95511ccf7
Author:     Isaac Freund <ifreund@freebsdfoundation.org>
AuthorDate: 2024-12-23 21:54:29 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-12-23 22:03:30 +0000

    pkgbase: fix inclusion of tests in ssh, bsnmp, clibs-dev
    
    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
    Reviewed by:    bapt, emaste
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D47025
---
 lib/csu/Makefile.inc          | 2 +-
 lib/csu/tests/Makefile        | 2 ++
 lib/libbsnmp/Makefile.inc     | 2 +-
 lib/libbsnmp/tests/Makefile   | 2 ++
 secure/libexec/Makefile.inc   | 2 +-
 secure/libexec/tests/Makefile | 1 +
 6 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc
index 9903b25b7011..c4a1f90b173f 100644
--- a/lib/csu/Makefile.inc
+++ b/lib/csu/Makefile.inc
@@ -1,4 +1,4 @@
-PACKAGE=	clibs-dev
+PACKAGE?=	clibs-dev
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 # Can't instrument these files since that breaks non-sanitized programs.
diff --git a/lib/csu/tests/Makefile b/lib/csu/tests/Makefile
index 946d293973db..c9a0e6eff5da 100644
--- a/lib/csu/tests/Makefile
+++ b/lib/csu/tests/Makefile
@@ -1,3 +1,5 @@
+PACKAGE=	tests
+
 SUBDIR=		dso
 TESTS_SUBDIRS=	dynamic
 TESTS_SUBDIRS+=	dynamiclib
diff --git a/lib/libbsnmp/Makefile.inc b/lib/libbsnmp/Makefile.inc
index ea77a5f420d3..ed0d6c46bd6c 100644
--- a/lib/libbsnmp/Makefile.inc
+++ b/lib/libbsnmp/Makefile.inc
@@ -1,4 +1,4 @@
 INCSDIR=	${INCLUDEDIR}/bsnmp
-PACKAGE=	bsnmp
+PACKAGE?=	bsnmp
 
 .include "../Makefile.inc"
diff --git a/lib/libbsnmp/tests/Makefile b/lib/libbsnmp/tests/Makefile
index fdd5484ec075..7a4a17e893a6 100644
--- a/lib/libbsnmp/tests/Makefile
+++ b/lib/libbsnmp/tests/Makefile
@@ -1,5 +1,7 @@
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+
 ATF_TESTS_C+=	bsnmpd_test
 
 SRCS.bsmpd_test=	bsnmpd_test.c
diff --git a/secure/libexec/Makefile.inc b/secure/libexec/Makefile.inc
index 8998b613dda3..e5e48d7a9b37 100644
--- a/secure/libexec/Makefile.inc
+++ b/secure/libexec/Makefile.inc
@@ -1,4 +1,4 @@
 BINDIR?=	/usr/libexec
-PACKAGE=	ssh
+PACKAGE?=	ssh
 
 .include "../Makefile.inc"
diff --git a/secure/libexec/tests/Makefile b/secure/libexec/tests/Makefile
index 29b1b564beca..e142d9c1e98a 100644
--- a/secure/libexec/tests/Makefile
+++ b/secure/libexec/tests/Makefile
@@ -1,4 +1,5 @@
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
+PACKAGE=	tests
 
 .include <bsd.test.mk>