From nobody Thu Feb 27 19:45:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z3hf64g6nz59Ryq; Thu, 27 Feb 2025 19:45:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z3hf63p2Dz3dcx; Thu, 27 Feb 2025 19:45:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740685550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xjmf0EcewgID0csO6vdnBMABE8rDjcL8GN8OipRNq8Y=; b=GPde1yRctB5LeXaL/nsUolxCcSbjYirCG1e5z5esVi20cqk5hKtOCQXVwNOqwWtV36RRAY sI//bfc6h4LpbbFPj0pjflrM6DgY2G0wTm/YKl7LTnX99wIvIDlx/LhEg2SPugLvIdybcY kUNxmJEPfCEze2t9p9YSI0DP0gCBLEFRKu3734XxG4yukopewp5EfJhd5hO5GLtvpyLPzq nlnyFQVSRb1Ys+rmFGPp0t6VDPh5tL/YdvABXxopF/qUL1H5ht3GmJzWDl8xDWL9qyyUyN OwS+YB6ia1Z7wcxcQImqlDMqkmGscDIg7EesSrDgbrHRfZs/6+zayZZcVJsqPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740685550; a=rsa-sha256; cv=none; b=va48OKF2Mt9ZJz3W4GkrF3Wonscj1ikHS9TRqsOqRdc9Yw2uJwLjPVzI+eyqxYEdKvOPBD WA9IOQLnDjXQgNBXEZOn7T9LHsFqylCMI7ldY7sZkp+dLG7U4K7U7R2HKwxz7/dnT2LvPA YqMg2vCdJWERhj1vQS0blqhLW/LsBkWott6f4MQ++qz4BAaiCkBJ5luy9gYGaUrjg4Z03W dAyObHzuX8p6CBS3+unevGI+0eZ4n2qFTPLGXJGogPNfTI4rA+tR5CK5JAecvmT1LYENf/ +poVZuPvanJAC3AixkPDY2322bPsosA03feEMEafCmmUOe794oQtyyVKBSoStA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740685550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xjmf0EcewgID0csO6vdnBMABE8rDjcL8GN8OipRNq8Y=; b=rqKvkd2PVjW+1AvJKGQ0PGPDk573uAMkQ1PMK7IV/GTY//UHcbNV+PNNYmPUbhk0K36Gj5 ZWZ62J0Cc3SWg8tJvlbYZX4jD2GQYpZHsL14HihamdJccxM90qqHGkxF1PPoaE07rJ8+fw R0Ua20d1KwPHLEzGKzeL+V/8wFVrt3cRRmZ02ml16qXQae9xDQvNpviSSJ1SlKqzsGWbwW qxdBM7CuK8PXCyHD1aHy+o9WdPR/qqTTd6JDhDKuSWjK1jN3ZGjCsvI/z4dDaXGAQkxJ/g zeYMK8wPd01Mss4qV9w22Y310ZFl20Q9f7+ZJZiWLuvYAqb+u3TDb4BQibX6iA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z3hf62y4tzvlw; Thu, 27 Feb 2025 19:45:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51RJjo1t035058; Thu, 27 Feb 2025 19:45:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51RJjoG9035055; Thu, 27 Feb 2025 19:45:50 GMT (envelope-from git) Date: Thu, 27 Feb 2025 19:45:50 GMT Message-Id: <202502271945.51RJjoG9035055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: f183965bb8f5 - stable/14 - pkgbase: fix inclusion of tests in ssh, bsnmp, clibs-dev List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f183965bb8f5cf68edbd60a7c39e20ad211d6bd5 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f183965bb8f5cf68edbd60a7c39e20ad211d6bd5 commit f183965bb8f5cf68edbd60a7c39e20ad211d6bd5 Author: Isaac Freund AuthorDate: 2024-12-23 21:54:29 +0000 Commit: Ed Maste CommitDate: 2025-02-27 19:45:40 +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 (cherry picked from commit 3a56015a2f5d630910177fa79a522bb95511ccf7) --- lib/csu/Makefile.inc | 2 +- lib/csu/tests/Makefile | 1 + lib/libbsnmp/Makefile.inc | 2 +- lib/libbsnmp/tests/Makefile | 2 ++ secure/libexec/Makefile.inc | 2 +- secure/libexec/tests/Makefile | 1 + 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc index 1509a1ece2c3..1c9d3853b0d4 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 3f95193420ea..c9a0e6eff5da 100644 --- a/lib/csu/tests/Makefile +++ b/lib/csu/tests/Makefile @@ -1,3 +1,4 @@ +PACKAGE= tests SUBDIR= dso TESTS_SUBDIRS= dynamic diff --git a/lib/libbsnmp/Makefile.inc b/lib/libbsnmp/Makefile.inc index 80478f392410..d9ae6f7deb8c 100644 --- a/lib/libbsnmp/Makefile.inc +++ b/lib/libbsnmp/Makefile.inc @@ -1,5 +1,5 @@ INCSDIR= ${INCLUDEDIR}/bsnmp -PACKAGE= bsnmp +PACKAGE?= bsnmp .include "../Makefile.inc" diff --git a/lib/libbsnmp/tests/Makefile b/lib/libbsnmp/tests/Makefile index 529622104449..ca8bcda8401f 100644 --- a/lib/libbsnmp/tests/Makefile +++ b/lib/libbsnmp/tests/Makefile @@ -1,6 +1,8 @@ .include +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 e5beeed87cac..6cb7a9096b7b 100644 --- a/secure/libexec/Makefile.inc +++ b/secure/libexec/Makefile.inc @@ -1,5 +1,5 @@ BINDIR?= /usr/libexec -PACKAGE= ssh +PACKAGE?= ssh .include "../Makefile.inc" diff --git a/secure/libexec/tests/Makefile b/secure/libexec/tests/Makefile index b8996030aafc..b8e8a3828b9c 100644 --- a/secure/libexec/tests/Makefile +++ b/secure/libexec/tests/Makefile @@ -1,5 +1,6 @@ .PATH: ${SRCTOP}/tests KYUAFILE= yes +PACKAGE= tests .include