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
This commit is contained in:
Emmanuel Vadot 2020-12-21 23:36:31 +01:00 committed by Emmanuel Vadot
parent b0995124cd
commit 066a8c691e
9 changed files with 21 additions and 9 deletions

View File

@ -56,7 +56,7 @@
.. ..
gss gss
.. ..
kyua kyua tags=package=tests
.. ..
mail mail
.. ..

View File

@ -3,7 +3,7 @@
# Please see the file src/etc/mtree/README before making changes to this file. # 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 bin
cat cat

View File

@ -168,7 +168,7 @@
sbin sbin
.. ..
share share
atf atf tags=package=tests
.. ..
bsdconfig bsdconfig
media media
@ -219,9 +219,9 @@
doc doc
IPv6 IPv6
.. ..
atf atf tags=package=tests
.. ..
kyua kyua tags=package=tests
.. ..
legal legal
.. ..
@ -319,7 +319,7 @@
.. ..
.. ..
.. ..
kyua kyua tags=package=tests
.. ..
libusb20 libusb20
.. ..
@ -460,10 +460,10 @@
.. ..
.. ..
.. ..
kyua kyua tags=package=tests
misc misc tags=package=tests
.. ..
store store tags=package=tests
.. ..
.. ..
locale locale

View File

@ -28,6 +28,7 @@
.include <src.opts.mk> .include <src.opts.mk>
.include <bsd.init.mk> .include <bsd.init.mk>
PACKAGE= tests
LIB_CXX= atf-c++ LIB_CXX= atf-c++
PRIVATELIB= true PRIVATELIB= true
SHLIB_MAJOR= 2 SHLIB_MAJOR= 2

View File

@ -44,6 +44,7 @@ ATF_BUILD_CFLAGS:= ${CFLAGS:M-[DILOWf]*}
ATF_BUILD_CPPFLAGS:= ${CPPFLAGS:M-[DILOWf]*} ATF_BUILD_CPPFLAGS:= ${CPPFLAGS:M-[DILOWf]*}
ATF_BUILD_CXXFLAGS:= ${CXXFLAGS:M-[DILOWf]*} ATF_BUILD_CXXFLAGS:= ${CXXFLAGS:M-[DILOWf]*}
PACKAGE= tests
LIB= atf-c LIB= atf-c
PRIVATELIB= true PRIVATELIB= true
SHLIB_MAJOR= 1 SHLIB_MAJOR= 1

View File

@ -31,6 +31,7 @@
ATF= ${SRCTOP}/contrib/atf ATF= ${SRCTOP}/contrib/atf
.PATH: ${ATF}/atf-sh .PATH: ${ATF}/atf-sh
PACKAGE= tests
PROG_CXX= atf-check PROG_CXX= atf-check
SRCS= atf-check.cpp SRCS= atf-check.cpp
MAN= atf-check.1 MAN= atf-check.1

View File

@ -31,6 +31,7 @@
ATF= ${SRCTOP}/contrib/atf ATF= ${SRCTOP}/contrib/atf
.PATH: ${ATF}/atf-sh .PATH: ${ATF}/atf-sh
PACKAGE= tests
PROG_CXX= atf-sh PROG_CXX= atf-sh
SRCS= atf-sh.cpp SRCS= atf-sh.cpp
MAN= atf-sh.1 atf-sh.3 MAN= atf-sh.1 atf-sh.3
@ -74,6 +75,7 @@ FILESGROUPS= SUBR
SUBRDIR= ${SHAREDIR}/atf SUBRDIR= ${SHAREDIR}/atf
SUBR= libatf-sh.subr SUBR= libatf-sh.subr
SUBRTAGS= package=tests
HAS_TESTS= HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests SUBDIR.${MK_TESTS}+= tests

View File

@ -32,5 +32,6 @@ FILESGROUPS= TOP
TOPDIR= ${SHAREDIR}/doc/atf TOPDIR= ${SHAREDIR}/doc/atf
TOP= AUTHORS COPYING NEWS README TOP= AUTHORS COPYING NEWS README
TOPTAGS= package=tests
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -6,6 +6,7 @@
.PATH: ${KYUA_SRCDIR} .PATH: ${KYUA_SRCDIR}
PACKAGE= tests
PROG_CXX= kyua PROG_CXX= kyua
SRCS= main.cpp SRCS= main.cpp
LIBADD= kyua_cli kyua_drivers kyua_engine kyua_model kyua_store LIBADD= kyua_cli kyua_drivers kyua_engine kyua_model kyua_store
@ -41,20 +42,25 @@ FILESGROUPS+= EXAMPLES
CONFS= kyua.conf-default CONFS= kyua.conf-default
CONFSDIR= ${KYUA_CONFDIR} CONFSDIR= ${KYUA_CONFDIR}
CONFSNAME= kyua.conf CONFSNAME= kyua.conf
CONFSDIRTAGS= package=tests
DOCS= AUTHORS CONTRIBUTORS LICENSE DOCS= AUTHORS CONTRIBUTORS LICENSE
DOCSDIR= ${KYUA_DOCDIR} DOCSDIR= ${KYUA_DOCDIR}
DOCSTAGS= package=tests
EXAMPLES= Kyuafile.top kyua.conf EXAMPLES= Kyuafile.top kyua.conf
EXAMPLESDIR= ${KYUA_EGDIR} EXAMPLESDIR= ${KYUA_EGDIR}
EXAMPLESTAGS= package=tests
.PATH: ${KYUA_SRCDIR}/examples .PATH: ${KYUA_SRCDIR}/examples
MISC= context.html index.html report.css test_result.html MISC= context.html index.html report.css test_result.html
MISCDIR= ${KYUA_MISCDIR} MISCDIR= ${KYUA_MISCDIR}
MISCTAGS= package=tests
.PATH: ${KYUA_SRCDIR}/misc .PATH: ${KYUA_SRCDIR}/misc
STORE= migrate_v1_v2.sql migrate_v2_v3.sql schema_v3.sql STORE= migrate_v1_v2.sql migrate_v2_v3.sql schema_v3.sql
STOREDIR= ${KYUA_STOREDIR} STOREDIR= ${KYUA_STOREDIR}
STORETAGS= package=tests
.PATH: ${KYUA_SRCDIR}/store .PATH: ${KYUA_SRCDIR}/store
CLEANFILES+= ${MAN} CLEANFILES+= ${MAN}