From 066a8c691e6751e281e529938c620f183299229a Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Mon, 21 Dec 2020 23:36:31 +0100 Subject: [PATCH] pkgbase: Install atf and kyua in the tests package While here make sure that all tests dirs are taggued correctly. Reviewed by: bapt, emaste Differential Revision: https://reviews.freebsd.org/D27714 --- etc/mtree/BSD.root.dist | 2 +- etc/mtree/BSD.tests.dist | 2 +- etc/mtree/BSD.usr.dist | 14 +++++++------- lib/atf/libatf-c++/Makefile | 1 + lib/atf/libatf-c/Makefile | 1 + libexec/atf/atf-check/Makefile | 1 + libexec/atf/atf-sh/Makefile | 2 ++ share/doc/atf/Makefile | 1 + usr.bin/kyua/Makefile | 6 ++++++ 9 files changed, 21 insertions(+), 9 deletions(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 7e5917c049b9..2cfa18dd5662 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -56,7 +56,7 @@ .. gss .. - kyua + kyua tags=package=tests .. mail .. diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index cb9632570d79..3d50a1943ce4 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -3,7 +3,7 @@ # Please see the file src/etc/mtree/README before making changes to this file. # -/set type=dir uname=root gname=wheel mode=0755 +/set type=dir uname=root gname=wheel mode=0755 tags=package=tests . bin cat diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 1f3a4f5c54cc..f643d5ad269f 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -168,7 +168,7 @@ sbin .. share - atf + atf tags=package=tests .. bsdconfig media @@ -219,9 +219,9 @@ doc IPv6 .. - atf + atf tags=package=tests .. - kyua + kyua tags=package=tests .. legal .. @@ -319,7 +319,7 @@ .. .. .. - kyua + kyua tags=package=tests .. libusb20 .. @@ -460,10 +460,10 @@ .. .. .. - kyua - misc + kyua tags=package=tests + misc tags=package=tests .. - store + store tags=package=tests .. .. locale diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile index cacf87520d2d..10450dff2399 100644 --- a/lib/atf/libatf-c++/Makefile +++ b/lib/atf/libatf-c++/Makefile @@ -28,6 +28,7 @@ .include .include +PACKAGE= tests LIB_CXX= atf-c++ PRIVATELIB= true SHLIB_MAJOR= 2 diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile index 7473cd09b478..78b821b3c64d 100644 --- a/lib/atf/libatf-c/Makefile +++ b/lib/atf/libatf-c/Makefile @@ -44,6 +44,7 @@ ATF_BUILD_CFLAGS:= ${CFLAGS:M-[DILOWf]*} ATF_BUILD_CPPFLAGS:= ${CPPFLAGS:M-[DILOWf]*} ATF_BUILD_CXXFLAGS:= ${CXXFLAGS:M-[DILOWf]*} +PACKAGE= tests LIB= atf-c PRIVATELIB= true SHLIB_MAJOR= 1 diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile index b6ef6778403a..6711d1744430 100644 --- a/libexec/atf/atf-check/Makefile +++ b/libexec/atf/atf-check/Makefile @@ -31,6 +31,7 @@ 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-sh/Makefile b/libexec/atf/atf-sh/Makefile index d04816f8a591..50a18e2f59dd 100644 --- a/libexec/atf/atf-sh/Makefile +++ b/libexec/atf/atf-sh/Makefile @@ -31,6 +31,7 @@ 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 @@ -74,6 +75,7 @@ FILESGROUPS= SUBR SUBRDIR= ${SHAREDIR}/atf SUBR= libatf-sh.subr +SUBRTAGS= package=tests HAS_TESTS= SUBDIR.${MK_TESTS}+= tests diff --git a/share/doc/atf/Makefile b/share/doc/atf/Makefile index 78eb7bc7c607..8eaa15db8edd 100644 --- a/share/doc/atf/Makefile +++ b/share/doc/atf/Makefile @@ -32,5 +32,6 @@ FILESGROUPS= TOP TOPDIR= ${SHAREDIR}/doc/atf TOP= AUTHORS COPYING NEWS README +TOPTAGS= package=tests .include diff --git a/usr.bin/kyua/Makefile b/usr.bin/kyua/Makefile index 2c7ae11c7408..e27c8603f11b 100644 --- a/usr.bin/kyua/Makefile +++ b/usr.bin/kyua/Makefile @@ -6,6 +6,7 @@ .PATH: ${KYUA_SRCDIR} +PACKAGE= tests PROG_CXX= kyua SRCS= main.cpp LIBADD= kyua_cli kyua_drivers kyua_engine kyua_model kyua_store @@ -41,20 +42,25 @@ FILESGROUPS+= EXAMPLES CONFS= kyua.conf-default CONFSDIR= ${KYUA_CONFDIR} CONFSNAME= kyua.conf +CONFSDIRTAGS= package=tests DOCS= AUTHORS CONTRIBUTORS LICENSE DOCSDIR= ${KYUA_DOCDIR} +DOCSTAGS= package=tests EXAMPLES= Kyuafile.top kyua.conf EXAMPLESDIR= ${KYUA_EGDIR} +EXAMPLESTAGS= package=tests .PATH: ${KYUA_SRCDIR}/examples MISC= context.html index.html report.css test_result.html MISCDIR= ${KYUA_MISCDIR} +MISCTAGS= package=tests .PATH: ${KYUA_SRCDIR}/misc STORE= migrate_v1_v2.sql migrate_v2_v3.sql schema_v3.sql STOREDIR= ${KYUA_STOREDIR} +STORETAGS= package=tests .PATH: ${KYUA_SRCDIR}/store CLEANFILES+= ${MAN}