upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-18 18:20:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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

(cherry picked from commit 3a56015a2f5d630910177fa79a522bb95511ccf7)
This commit is contained in:
Isaac Freund 2024-12-23 15:54:29 -06:00 committed by Ed Maste
parent dd48b36aa2
commit f183965bb8
6 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/csu/Makefile.inc
View file

@ -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.

1
lib/csu/tests/Makefile
View file

@ -1,3 +1,4 @@
PACKAGE= tests
SUBDIR= dso
TESTS_SUBDIRS= dynamic

2
lib/libbsnmp/Makefile.inc
View file

@ -1,5 +1,5 @@
INCSDIR= ${INCLUDEDIR}/bsnmp
PACKAGE= bsnmp
PACKAGE?= bsnmp
.include "../Makefile.inc"

2
lib/libbsnmp/tests/Makefile
View file

@ -1,6 +1,8 @@
.include <bsd.own.mk>
PACKAGE= tests
ATF_TESTS_C+= bsnmpd_test
SRCS.bsmpd_test= bsnmpd_test.c

2
secure/libexec/Makefile.inc
View file

@ -1,5 +1,5 @@
BINDIR?= /usr/libexec
PACKAGE= ssh
PACKAGE?= ssh
.include "../Makefile.inc"

1
secure/libexec/tests/Makefile
View file

@ -1,5 +1,6 @@
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
PACKAGE= tests
.include <bsd.test.mk>