From nobody Fri Nov 07 05:47:06 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 4d2p3b38rtz655SZ; Fri, 07 Nov 2025 05:47:07 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2p3b0SCTz3bJl; Fri, 07 Nov 2025 05:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762494427; 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=x+wnsdzlGZbyFd99wrFkU2BjPw5fJdMMtc5BBp5mccs=; b=XCQDKuqYYUkOWs0TGq5Fpr/OZtYjm2X5Y8tzTS644kjwEMOYaO/mYizOAW6nxMdWD3VlPc Y+gcSsrxPbT+3Vx8togjy3YdLw/ohoZFlJvFQmUe4OLhDFJ3E0sagy6Lttev7yKD5X63av ByYZNURNy1ocAFbR4hvbNCWsYRBoL8FzXU1ZxvyAqpB1r7i8sKqVpDN3Q3zw0M+a6wengQ mDMlkKfYaQXdj+QAwtVj/gqloV1VwVvemkDWJ2KhzEGS0KdwV5pZcrCuJkmt28ff3s6DC7 O1pfHjwqvypmaoXncyr9MU9VTR7vQPgWbNghsyyF0NVuhHr9ZsSnJVNOTKHnaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762494427; 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=x+wnsdzlGZbyFd99wrFkU2BjPw5fJdMMtc5BBp5mccs=; b=STZXpKGY3j19vjY2yeckSribVazwCW0Sqg8PhHFQdxfLyb3XatG2SN8KWtJ8WJJflu8yVg 3dIiz5iend6MRD2xBEtY2CUXQjO3t4BFXbWxDsCxFeRur8APmka59XvuH9b3Lnk4KQeHpV dyeYX1gKXA9QwiDMOVJh1UfwyMxtK0BavyKEfjtGIaZ47+Ea6kCZTqlPlInDSKNAyFAjYt JFnU48IKluMUeH4ICak2uR2J7Wgc1KrSsMpkGgm5uQptcY084pSZi+32RGbJkpBL65ePzP Drw98fpL0jG8faJarKwtFn4oVdF3l3my8tZqBeBfGXOkMQgF06DTMeV4p4rVBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762494427; a=rsa-sha256; cv=none; b=tO/0+b2dHuuVdDFqLpSUJYtNpmUhmn/afUygvvlCSfd0lQ3vves4pWebQvTaKhVXKJj0jI NUWT0+WNrXWrRzMSTs1yKkBRmDnA9gwjYI4zWKloEqJN6mTRrB2H4C7MQhMRv3jrrivJuF cPKCzCCnrb1EYA4WZBb3B+q0PAOiuvcjXqzvBkpA6i+28znUc4HAugPz2U5qCF/3+3Q/IE +XB6J0OBUOtmHnm2IaH5caEtpgn5OL1nAiNR89pzYzfFojNpaLvWCsFuLskwgsx1snNbu9 vs/ZfFtVYHLWVOoYpmftlC24tXIAP9/++YS9oVxiVDNw2yUSLVUCvVlvL2jCew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d2p3b03dVzn2t; Fri, 07 Nov 2025 05:47:07 +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 5A75l6lJ049645; Fri, 7 Nov 2025 05:47:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75l6aZ049642; Fri, 7 Nov 2025 05:47:06 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:47:06 GMT Message-Id: <202511070547.5A75l6aZ049642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 3447fc070cc2 - releng/15.0 - atf: Move the tests back to the tests package 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 3447fc070cc205671ac33e1582c023033094de7f Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3447fc070cc205671ac33e1582c023033094de7f commit 3447fc070cc205671ac33e1582c023033094de7f Author: Lexi Winter AuthorDate: 2025-11-05 21:16:32 +0000 Commit: Colin Percival CommitDate: 2025-11-07 05:46:58 +0000 atf: Move the tests back to the tests package Commit 9065390ddc7b moved atf to its own package, but mistakenly moved the tests as well. Put the tests back into the test package. Approved by: re (cperciva) Fixes: 9065390ddc7b ("packages: Remove the tests-dev package") MFC after: 1 day Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53594 (cherry picked from commit 4b342830abd39cdc20b67a215e15309293673e75) (cherry picked from commit cdfa9139777189a16ea7a86c6457f169b76d7628) --- lib/atf/Makefile.inc | 2 +- lib/atf/libatf-c++/tests/Makefile | 2 ++ lib/atf/libatf-c++/tests/detail/Makefile | 2 ++ lib/atf/libatf-c/tests/Makefile | 2 ++ lib/atf/libatf-c/tests/detail/Makefile | 2 ++ lib/atf/tests/Makefile | 3 +++ libexec/atf/Makefile.inc | 2 +- libexec/atf/atf-check/tests/Makefile | 2 ++ libexec/atf/tests/Makefile | 3 +++ 9 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc index bebed0280596..af176036f136 100644 --- a/lib/atf/Makefile.inc +++ b/lib/atf/Makefile.inc @@ -24,7 +24,7 @@ # SUCH DAMAGE. # -PACKAGE= atf +PACKAGE?= atf LIB_PACKAGE= CFLAGS+= -DHAVE_CONFIG_H diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile index 839c6902d6b1..dc052c19df67 100644 --- a/lib/atf/libatf-c++/tests/Makefile +++ b/lib/atf/libatf-c++/tests/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= tests + TESTS_SUBDIRS= detail ATF= ${SRCTOP}/contrib/atf diff --git a/lib/atf/libatf-c++/tests/detail/Makefile b/lib/atf/libatf-c++/tests/detail/Makefile index 4b95f8dbd663..55cefe524068 100644 --- a/lib/atf/libatf-c++/tests/detail/Makefile +++ b/lib/atf/libatf-c++/tests/detail/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= tests + TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c++/detail ATF= ${SRCTOP}/contrib/atf diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile index 5647e7b9fcbe..c81c18a91f00 100644 --- a/lib/atf/libatf-c/tests/Makefile +++ b/lib/atf/libatf-c/tests/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= tests + TESTS_SUBDIRS= detail ATF= ${SRCTOP}/contrib/atf diff --git a/lib/atf/libatf-c/tests/detail/Makefile b/lib/atf/libatf-c/tests/detail/Makefile index 5123f6f4d796..3fa2919b98b9 100644 --- a/lib/atf/libatf-c/tests/detail/Makefile +++ b/lib/atf/libatf-c/tests/detail/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= tests + TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c/detail ATF= ${SRCTOP}/contrib/atf diff --git a/lib/atf/tests/Makefile b/lib/atf/tests/Makefile index 500ff0f20c3b..2609bb593d57 100644 --- a/lib/atf/tests/Makefile +++ b/lib/atf/tests/Makefile @@ -1,4 +1,7 @@ .PATH: ${SRCTOP}/tests + +PACKAGE= tests + KYUAFILE= yes SUBDIR= test-programs diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc index e40827fa0b69..5fd06c35cd09 100644 --- a/libexec/atf/Makefile.inc +++ b/libexec/atf/Makefile.inc @@ -24,7 +24,7 @@ # SUCH DAMAGE. # -PACKAGE= atf +PACKAGE?= atf LIB_PACKAGE= CFLAGS+= -DHAVE_CONFIG_H diff --git a/libexec/atf/atf-check/tests/Makefile b/libexec/atf/atf-check/tests/Makefile index e98f82d941cd..6e21e4ede211 100644 --- a/libexec/atf/atf-check/tests/Makefile +++ b/libexec/atf/atf-check/tests/Makefile @@ -1,6 +1,8 @@ ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-sh +PACKAGE= tests + ATF_TESTS_SH= atf-check_test .include diff --git a/libexec/atf/tests/Makefile b/libexec/atf/tests/Makefile index 29b1b564beca..ad9431e75a63 100644 --- a/libexec/atf/tests/Makefile +++ b/libexec/atf/tests/Makefile @@ -1,4 +1,7 @@ .PATH: ${SRCTOP}/tests + +PACKAGE= tests + KYUAFILE= yes .include