git: 36edc5014f63 - main - packages: remove tests from base set

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=36edc5014f633c1f00031f5fc5a291f8cdd46d83

commit 36edc5014f633c1f00031f5fc5a291f8cdd46d83
Author:     Isaac Freund <ifreund@freebsdfoundation.org>
AuthorDate: 2025-09-16 15:01:09 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2025-09-16 17:02:50 +0000

    packages: remove tests from base set
    
    Create a new tests package set to hold the tests, which are not useful
    to all users and don't belong in the base set.
    
    Reviewed by:    emaste, ivy
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D52574
---
 release/packages/generate-ucl.lua  | 4 ++++
 release/packages/sets/tests.ucl    | 5 +++++
 release/packages/ucl/tests-all.ucl | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/release/packages/generate-ucl.lua b/release/packages/generate-ucl.lua
index 47f0a0e9a6a9..211766067952 100755
--- a/release/packages/generate-ucl.lua
+++ b/release/packages/generate-ucl.lua
@@ -191,6 +191,10 @@ elseif pkgname:match("%-lib32$") then
 -- support or you don't.
 elseif pkgname:match("%-dev$") or pkgname:match("^lib.*%-man$") then
 	set = "devel"
+-- Don't separate tests and tests-dbg into 2 sets, if the user wants tests
+-- they should be able to debug failures.
+elseif set == "tests" then
+	set = set
 -- If this is a -dbg package, it goes in <set>-dbg, which means the user can
 -- install debug symbols only for the sets they have installed.
 elseif pkgname:match("%-dbg$") then
diff --git a/release/packages/sets/tests.ucl b/release/packages/sets/tests.ucl
new file mode 100644
index 000000000000..88426a54a807
--- /dev/null
+++ b/release/packages/sets/tests.ucl
@@ -0,0 +1,5 @@
+comment = "System test suite"
+
+desc = <<EOD
+This metapackage installs the system test suite.
+EOD
diff --git a/release/packages/ucl/tests-all.ucl b/release/packages/ucl/tests-all.ucl
index 39bd365bee5b..42d4ea160ec7 100644
--- a/release/packages/ucl/tests-all.ucl
+++ b/release/packages/ucl/tests-all.ucl
@@ -2,3 +2,7 @@ comment = "Test Suite"
 desc = <<EOD
 Test Suite
 EOD
+
+annotations {
+	set = tests
+}