Page MenuHomeFreeBSD
Files F139436305

D52597.id162314.diff
No OneTemporary
Actions

D52597.id162314.diff
View Options

diff --git a/UPDATING b/UPDATING
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,14 @@
world, or to merely disable the most expensive debugging functionality
at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20250918:
+ Kyua has been moved to the FreeBSD-kyua package, and ATF has been moved
+ to the FreeBSD-atf* packages. If you have FreeBSD-tests installed,
+ these packages will be installed automatically, otherwise you should
+ manually install them if you need these tools.
+
+ This only affects pkgbase users.
+
20250912:
If SRCCONF is unset and a file named src.conf is present at
the top of the source tree, it will now be used instead of
diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc
--- a/lib/atf/Makefile.inc
+++ b/lib/atf/Makefile.inc
@@ -24,6 +24,8 @@
# SUCH DAMAGE.
#
+PACKAGE= atf
+LIB_PACKAGE=
CFLAGS+= -DHAVE_CONFIG_H
WARNS?= 3
diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
--- a/lib/atf/libatf-c++/Makefile
+++ b/lib/atf/libatf-c++/Makefile
@@ -27,7 +27,6 @@
.include <src.opts.mk>
.include <bsd.init.mk>
-PACKAGE= tests
LIB_CXX= atf-c++
PRIVATELIB= true
SHLIB_MAJOR= 2
diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile
--- a/lib/atf/libatf-c++/tests/Makefile
+++ b/lib/atf/libatf-c++/tests/Makefile
@@ -1,7 +1,5 @@
.include <bsd.init.mk>
-PACKAGE= tests
-
TESTS_SUBDIRS= detail
ATF= ${SRCTOP}/contrib/atf
diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile
--- a/lib/atf/libatf-c/Makefile
+++ b/lib/atf/libatf-c/Makefile
@@ -27,7 +27,6 @@
.include <src.opts.mk>
.include <bsd.init.mk>
-PACKAGE= tests
LIB= atf-c
PRIVATELIB= true
SHLIB_MAJOR= 1
diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile
--- a/lib/atf/libatf-c/tests/Makefile
+++ b/lib/atf/libatf-c/tests/Makefile
@@ -1,7 +1,5 @@
.include <bsd.init.mk>
-PACKAGE= tests
-
TESTS_SUBDIRS= detail
ATF= ${SRCTOP}/contrib/atf
diff --git a/lib/libc/tests/tls/dso/Makefile b/lib/libc/tests/tls/dso/Makefile
--- a/lib/libc/tests/tls/dso/Makefile
+++ b/lib/libc/tests/tls/dso/Makefile
@@ -6,6 +6,7 @@
MAN=
PACKAGE= tests
+NO_DEV_PACKAGE=
LIBDIR= ${TESTSBASE}/lib/libc/tls
SHLIB_MAJOR= 1
diff --git a/lib/libc/tests/tls_dso/Makefile b/lib/libc/tests/tls_dso/Makefile
--- a/lib/libc/tests/tls_dso/Makefile
+++ b/lib/libc/tests/tls_dso/Makefile
@@ -7,6 +7,7 @@
SHLIBDIR= ${TESTSBASE}/lib/libc/tls
SHLIB_MAJOR= 1
PACKAGE= tests
+NO_DEV_PACKAGE=
WITHOUT_STATIC=
WITHOUT_PROFILE=
diff --git a/lib/libxo/tests/encoder/Makefile b/lib/libxo/tests/encoder/Makefile
--- a/lib/libxo/tests/encoder/Makefile
+++ b/lib/libxo/tests/encoder/Makefile
@@ -1,4 +1,5 @@
PACKAGE= tests
+NO_DEV_PACKAGE=
LIBXOSRC= ${SRCTOP}/contrib/libxo
diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc
--- a/libexec/atf/Makefile.inc
+++ b/libexec/atf/Makefile.inc
@@ -24,6 +24,8 @@
# SUCH DAMAGE.
#
+PACKAGE= atf
+LIB_PACKAGE=
CFLAGS+= -DHAVE_CONFIG_H
WARNS?= 3
diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile
--- a/libexec/atf/atf-check/Makefile
+++ b/libexec/atf/atf-check/Makefile
@@ -30,7 +30,6 @@
ATF= ${SRCTOP}/contrib/atf
.PATH: ${ATF}/atf-sh
-PACKAGE= tests
PROG_CXX= atf-check
SRCS= atf-check.cpp
MAN= atf-check.1
diff --git a/libexec/atf/atf-pytest-wrapper/Makefile b/libexec/atf/atf-pytest-wrapper/Makefile
--- a/libexec/atf/atf-pytest-wrapper/Makefile
+++ b/libexec/atf/atf-pytest-wrapper/Makefile
@@ -1,7 +1,6 @@
.include <src.opts.mk>
.include <bsd.init.mk>
-PACKAGE= tests
PROG_CXX= atf_pytest_wrapper
SRCS= atf_pytest_wrapper.cpp
MAN=
diff --git a/libexec/atf/atf-sh/Makefile b/libexec/atf/atf-sh/Makefile
--- a/libexec/atf/atf-sh/Makefile
+++ b/libexec/atf/atf-sh/Makefile
@@ -30,7 +30,6 @@
ATF= ${SRCTOP}/contrib/atf
.PATH: ${ATF}/atf-sh
-PACKAGE= tests
PROG_CXX= atf-sh
SRCS= atf-sh.cpp
MAN= atf-sh.1 atf-sh.3
diff --git a/libexec/rtld-elf/tests/Makefile.inc b/libexec/rtld-elf/tests/Makefile.inc
--- a/libexec/rtld-elf/tests/Makefile.inc
+++ b/libexec/rtld-elf/tests/Makefile.inc
@@ -1,2 +1,3 @@
PACKAGE?= tests
+NO_DEV_PACKAGE=
TESTSDIR?= ${TESTSBASE}/libexec/rtld-elf
diff --git a/release/packages/ucl/atf-all.ucl b/release/packages/ucl/atf-all.ucl
new file mode 100644
--- /dev/null
+++ b/release/packages/ucl/atf-all.ucl
@@ -0,0 +1,8 @@
+comment = "Automated Testing Framework"
+
+desc = <<EOD
+The Automated Testing Framework (ATF) is a collection of libraries to implement
+test programs in a variety of languages. These libraries all offer similar
+functionality and any test program written with them exposes a consistent user
+interface.
+EOD
diff --git a/release/packages/ucl/kyua-all.ucl b/release/packages/ucl/kyua-all.ucl
new file mode 100644
--- /dev/null
+++ b/release/packages/ucl/kyua-all.ucl
@@ -0,0 +1,20 @@
+comment = "Testing framework for infrastructure software"
+
+desc = <<EOD
+Kyua is a testing framework for infrastructure software, originally designed
+to equip BSD-based operating systems with a test suite. This means that Kyua
+is lightweight and simple, and that Kyua integrates well with various build
+systems and continuous integration frameworks.
+
+Kyua features an expressive test suite definition language, a safe runtime
+engine for test suites and a powerful report generation engine.
+
+Kyua is for both developers and users, from the developer applying a simple
+fix to a library to the system administrator deploying a new release on a
+production machine.
+
+Kyua is able to execute test programs written with a plethora of testing
+libraries and languages. The test program library of choice is ATF, which
+kyua's design originated from. However, framework-less test programs and
+TAP-compliant test programs can also be executed through kyua.
+EOD
diff --git a/release/packages/ucl/tests-all.ucl b/release/packages/ucl/tests-all.ucl
--- a/release/packages/ucl/tests-all.ucl
+++ b/release/packages/ucl/tests-all.ucl
@@ -1,8 +1,31 @@
-comment = "Test Suite"
+comment = "Test suite"
+
desc = <<EOD
-Test Suite
+The test suite, installed in /usr/tests, allows the functionality of the
+installed system to be verified.
EOD
+deps {
+ # Nearly all the tests require atf to run.
+ "atf": {
+ version = "${VERSION}"
+ origin = "base"
+ },
+
+ # The test framework requires Kyua.
+ "kyua": {
+ version = "${VERSION}"
+ origin = "base"
+ },
+
+ # Since the purpose of the tests is to test the base system, the base
+ # system must be installed.
+ "set-base": {
+ version = "${VERSION}"
+ origin = "base"
+ }
+}
+
annotations {
set = tests
}
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -74,7 +74,14 @@
TAG_ARGS= -T ${TAGS:ts,:[*]}
DBG_TAG_ARGS= ${TAG_ARGS},dbg
+# Usually we want to put development files (e.g., static libraries) into a
+# separate -dev packages but for a few cases, like tests, that's not wanted,
+# so allow the caller to disable it by setting NO_DEV_PACKAGE.
+.if !defined(NO_DEV_PACKAGE)
DEV_TAG_ARGS= ${TAG_ARGS},dev
+.else
+DEV_TAG_ARGS= ${TAG_ARGS}
+.endif
.endif # !defined(NO_ROOT)
# ELF hardening knobs
@@ -450,7 +457,11 @@
LINKMODE?= ${LIBMODE}
SYMLINKOWN?= ${LIBOWN}
SYMLINKGRP?= ${LIBGRP}
+.if !defined(NO_DEV_PACKAGE)
LINKTAGS= dev${_COMPAT_TAG}
+.else
+LINKTAGS= ${_COMPAT_TAG}
+.endif
.include <bsd.links.mk>
.if ${MK_MAN} != "no" && !defined(LIBRARIES_ONLY)
diff --git a/share/mk/bsd.test.mk b/share/mk/bsd.test.mk
--- a/share/mk/bsd.test.mk
+++ b/share/mk/bsd.test.mk
@@ -16,6 +16,9 @@
TESTSDIR?= ${TESTSBASE}/${RELDIR:H}
PACKAGE?= tests
+# Prevent creating a -dev package for tests. Sometimes tests include static
+# libraries or other artifacts which are not actually "development" files.
+NO_DEV_PACKAGE=
FILESGROUPS+= ${PACKAGE}FILES
${PACKAGE}FILESPACKAGE= ${PACKAGE}
diff --git a/usr.bin/kyua/Makefile b/usr.bin/kyua/Makefile
--- a/usr.bin/kyua/Makefile
+++ b/usr.bin/kyua/Makefile
@@ -10,7 +10,7 @@
KYUA_SRCDIR= ${SRCTOP}/contrib/kyua
.PATH: ${KYUA_SRCDIR}
-PACKAGE= tests
+PACKAGE= kyua
PROG_CXX= kyua
SRCS= main.cpp
LIBADD= lutok sqlite3 util

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 13, 1:49 AM (7 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26917983
Default Alt Text
D52597.id162314.diff (7 KB)

Event Timeline