From nobody Wed Nov 05 21:26:24 2025 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 4d1z0K39bPz65BXH; Wed, 05 Nov 2025 21:26:25 +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 4d1z0K1K33z3FDc; Wed, 05 Nov 2025 21:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762377985; 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=pAbcmO0syGC/V+QeXNY2breegdhumpBYblh4JJqt/Nk=; b=fKvtBaZns0Els6fMopAb/XiKFZIvDI95R2h1Qlir6gvbVVeAwH5Oa1/ypw3MsTjPzbd4uw UfvF8VLM1qiCLS5EY7P8ZK4rvfSN5pUO49GAnzZCmXNetY9t/cffT0i+b78isEmy7OwgXN uiwcQ+PdASSvtsej06zDrBLGjWXELoU8pdsbOb8dHNQq2qY+AULtH09bhpyWcNbqEPkyDO gf6NFBzNBwEcVM967R1eVv3e7t67YlI/lp6Q4wjHEJi5o8YaundyVAUn1+QWART0MbaYIH wWfq5wJfCv6+bgk2RZYUPzDKWmqHmUISQC/Su5GUh/XQMwJgiWA+6wN4rbtBOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762377985; 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=pAbcmO0syGC/V+QeXNY2breegdhumpBYblh4JJqt/Nk=; b=GZ98jl2Mvvblmw/CWTYVeGIPMd6hFYYe9hv3sT1hhQXZiGhKHSKPlOrQTwgzH/TKYllnJg D79SOmPTMXLWydiYIquWYX/7tFES4S90ikUVi0EJCN3AgFNw623t6xX2eBMKZMY5kK8seL b/NnMjdnlorP5dtUbUgapoHIbTR0pOzdoAfuuiUo158keBeSNh4IL02CVW0+XHkWgAgQyg 9MXR5lEbN+HYzgxw55lup98UJv0pA9lS+H3IPodMylsuKO0KAOkC4S46kYVIy6218+rfJ6 diYjI9dipXLDRJFaI7ii8XAyXc0MUU6U/O+TAutAgUBjErNv3OLFDsQSbGgJNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762377985; a=rsa-sha256; cv=none; b=Ccg0ygiS+RVyUJnbUo+3Nrs6eS27yQcs8tL78HXZclRwOFx5N5Rbl+yUENiugMl5LIO2kL vGyHfE0Dra12dGVcXEA/cZcRVM7kCz2cu4ZuCovPshL8fJwOeaL+BQct3EJPYbYn+08fmD nkqgFZ/jaQHofAiLs0+IH9LT0wJg9HzaXf2KKe1J5r6m9FM2KH5HRhKTaxBB7sh0/mJj2E pXVGQYeOPW9dRlWs93GOJMQ6tLYzLSijuGOuZdCTR+bNGe2NoMe5n7CE3CrXHfuQgBk0NO M+qCZKowRJrvVajxa03VMAU9gyaAPgqF/y0g8b9UNldv5tOU6H2C2PaSy93gkQ== 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 4d1z0K0hbfz113r; Wed, 05 Nov 2025 21:26:25 +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 5A5LQOOY093584; Wed, 5 Nov 2025 21:26:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5LQONS093581; Wed, 5 Nov 2025 21:26:24 GMT (envelope-from git) Date: Wed, 5 Nov 2025 21:26:24 GMT Message-Id: <202511052126.5A5LQONS093581@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 4b342830abd3 - main - atf: Move the tests back to the tests package 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b342830abd39cdc20b67a215e15309293673e75 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=4b342830abd39cdc20b67a215e15309293673e75 commit 4b342830abd39cdc20b67a215e15309293673e75 Author: Lexi Winter AuthorDate: 2025-11-05 21:16:32 +0000 Commit: Lexi Winter CommitDate: 2025-11-05 21:16:32 +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. 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 --- 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