pkgbase: Move all of ATF into the atf package
Parts of ATF (including the licence and some of the documentation) were for some reason part of the tests package instead of the atf package. Moving them to where they logically belong poses no problem since tests already depends on atf. PR: 294129 MFC after: 1 week Reviewed by: ivy Differential Revision: https://reviews.freebsd.org/D56158
This commit is contained in:
@@ -199,7 +199,7 @@
|
|||||||
sbin
|
sbin
|
||||||
..
|
..
|
||||||
share
|
share
|
||||||
atf tags=package=tests
|
atf tags=package=atf
|
||||||
..
|
..
|
||||||
bhyve
|
bhyve
|
||||||
gdb
|
gdb
|
||||||
@@ -236,7 +236,7 @@
|
|||||||
doc
|
doc
|
||||||
IPv6
|
IPv6
|
||||||
..
|
..
|
||||||
atf tags=package=tests
|
atf tags=package=atf
|
||||||
..
|
..
|
||||||
kyua tags=package=tests
|
kyua tags=package=tests
|
||||||
..
|
..
|
||||||
|
|||||||
@@ -71,7 +71,6 @@ 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
|
||||||
|
|||||||
@@ -24,13 +24,13 @@
|
|||||||
# SUCH DAMAGE.
|
# SUCH DAMAGE.
|
||||||
#
|
#
|
||||||
|
|
||||||
ATF= ${SRCTOP}/contrib/atf
|
ATFTOP= ${SRCTOP}/contrib/atf
|
||||||
.PATH: ${ATF} ${ATF}/doc
|
.PATH: ${ATFTOP} ${ATFTOP}/doc
|
||||||
|
|
||||||
FILESGROUPS= TOP
|
FILESGROUPS= ATF
|
||||||
|
|
||||||
TOPDIR= ${SHAREDIR}/doc/atf
|
ATFDIR= ${SHAREDIR}/doc/atf
|
||||||
TOP= AUTHORS COPYING NEWS README
|
ATF= AUTHORS COPYING NEWS README
|
||||||
TOPTAGS= package=tests
|
ATFPACKAGE= atf
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|||||||
@@ -100,11 +100,11 @@ RUNTIMELINKS=\
|
|||||||
builtin.1 while.1
|
builtin.1 while.1
|
||||||
|
|
||||||
.if ${MK_TESTS} != "no"
|
.if ${MK_TESTS} != "no"
|
||||||
MANGROUPS+= TESTS
|
MANGROUPS+= ATF
|
||||||
ATF= ${SRCTOP}/contrib/atf
|
ATFTOP= ${SRCTOP}/contrib/atf
|
||||||
.PATH: ${ATF}/doc
|
.PATH: ${ATFTOP}/doc
|
||||||
TESTS= atf-test-program.1
|
ATF= atf-test-program.1
|
||||||
TESTSPACKAGE= tests
|
ATFPACKAGE= atf
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|||||||
@@ -1054,11 +1054,11 @@ MAN+= mlx5io.4
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_TESTS} != "no"
|
.if ${MK_TESTS} != "no"
|
||||||
MANGROUPS+= TESTS
|
MANGROUPS+= ATF
|
||||||
ATF= ${SRCTOP}/contrib/atf
|
ATFTOP= ${SRCTOP}/contrib/atf
|
||||||
.PATH: ${ATF}/doc
|
.PATH: ${ATFTOP}/doc
|
||||||
TESTS= atf-test-case.4
|
ATF= atf-test-case.4
|
||||||
TESTSPACKAGE= tests
|
ATFPACKAGE= atf
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_PF} != "no"
|
.if ${MK_PF} != "no"
|
||||||
|
|||||||
Reference in New Issue
Block a user