From nobody Mon Dec 23 22:03:50 2024 X-Original-To: dev-commits-src-all@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 4YHBqp1xWbz5hVVZ; Mon, 23 Dec 2024 22:03: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHBqp1N76z4KWm; Mon, 23 Dec 2024 22:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734991430; 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=bxxHy2zUxJMS0Lz/z8QLaX7EvV8T3yntUeQerm00ZrI=; b=jX73h2Co7wym+mrU/Nqf82x+5mBjGtumpWfKq6q+AjV2P1CWyfsk1PV8FK5aHLSoJfmmzx 7cOt44PH0IFdWFppr+Zgs/izF80vHkQYy4+ih5EZ2IZ+MMot4ycSad0CZvckJKzi1RrP71 LPX+fmpPcNaLEGRpXg88U9WPnJumLNdaNuTL8DPqP4To+EnLEqZRRwXdJ8e0zyHGWB0oP5 abPAZZkHDV25VBDwAzZg+Jc61CePVhetBDtySs+PEUbXhcnWeBv8WSoE6mXApt4ZmNpKyQ RQ2xKAK2+zwjzOFtaUS+Pa/jOmyrThxsMT/wd8E5T2YYWSes4H1yitx8P+0Jzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734991430; 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=bxxHy2zUxJMS0Lz/z8QLaX7EvV8T3yntUeQerm00ZrI=; b=iZM3dZjVsWAvzQ0UqI0uyLBy8Fu5ei65yY7pmm+PPmUiMe65bQ9Wu46wp939eTt2EoGjBX W0d5IODqddM1V6+G56ZcwPWV/dCcq4tZdQj7sD7mMP6BlWPi6HricLlIFD5Wky8lVJNrRI EPuLu1T3dpQyk9fz562MhyHZUAKh8OzO945TXzITfCl+d8397r585ETbUtXGrok3T14sL7 j4vbbnZUMZRW9aj+e7OBYeCDZ9PRMmucXYtyavN0n+xyo2qREM2Ya+aQfg2FGu81mJSb5L x2HDPEP3Iw1ZkwuPYY/U0TlhedyJbpUr9LaviJzFRmrvMnpEgxxlwXME8llZhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734991430; a=rsa-sha256; cv=none; b=cTki0A+ngiJsrER9d4Ec+egIIFLervIZnddgiiISV1gaf8scx0FhDogDkBifmCoH5V4Gs7 LiJWuwxRPsrFaxMgTeIAMPR+v+d9qTN/ZYGJJ6oXarBf68RuR2LpFA5tSA/THR61aAijzf auTfnWbcUA9Qg3wQjgg6v49YlCAOSJ0xXCFiHw7j7bs45LpjoET2jXGcSTCMm8Ia/FKi20 T/o5aAsODrstXX8mJ/TB5V6gCd7ejpqXt7SuoXg61SisbItWIoVtnk3ZKrHQWQ6z+13R7N +5NIfw0TcBRwA2seInK0NqUVgqbH9qn/v5GFItWvJ4kh5p6RQLiKWiOBp6VJcQ== 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 4YHBqp0wk0z19l0; Mon, 23 Dec 2024 22:03: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 4BNM3og9021294; Mon, 23 Dec 2024 22:03:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNM3oEn021291; Mon, 23 Dec 2024 22:03:50 GMT (envelope-from git) Date: Mon, 23 Dec 2024 22:03:50 GMT Message-Id: <202412232203.4BNM3oEn021291@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 3a56015a2f5d - main - pkgbase: fix inclusion of tests in ssh, bsnmp, clibs-dev List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 3a56015a2f5d630910177fa79a522bb95511ccf7 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3a56015a2f5d630910177fa79a522bb95511ccf7 commit 3a56015a2f5d630910177fa79a522bb95511ccf7 Author: Isaac Freund AuthorDate: 2024-12-23 21:54:29 +0000 Commit: Ed Maste 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 +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