testing: move atf-pytest-wrapper to /usr/libexec

Move pytest wrapper to the collection of the other atf wrappers
 in libexec. It solves the problem of combining bits & pieces from
 bsd.test.mk and bgs.prog.mk to address "test binary, but not the
 suite binary".

Reviewed by:	kp
Differential Revision: https://reviews.freebsd.org/D35604
MFC after:	2 weeks
This commit is contained in:
Alexander V. Chernikov 2022-06-26 11:46:37 +00:00
parent fdfeaa66b5
commit 924226fba1
6 changed files with 5 additions and 7 deletions

View file

@ -421,6 +421,8 @@
atf
atf-check
..
atf-pytest-wrapper
..
atf-sh
..
..

View file

@ -25,6 +25,6 @@
#
# $FreeBSD$
SUBDIR= atf-check atf-sh tests
SUBDIR= atf-check atf-pytest-wrapper atf-sh tests
.include <bsd.subdir.mk>

View file

@ -1,13 +1,10 @@
.include <src.opts.mk>
.include <bsd.init.mk>
PACKAGE= tests
PROG_CXX= atf_pytest_wrapper
SRCS= atf_pytest_wrapper.cpp
CXXSTD= c++17
MAN=
BINDIR=
.include <bsd.own.mk>
DESTDIR=${TESTSBASE}
.include <bsd.prog.mk>

View file

@ -145,7 +145,7 @@ CLEANFILES+= ${_T} ${_T}.tmp
ATF_TESTS_PYTEST_SED_${_T}?= # empty
ATF_TESTS_PYTEST_SRC_${_T}?= ${.CURDIR}/${_T:S,.xtmp$,,}
${_T}:
echo "#!${TESTSBASE}/atf_pytest_wrapper -P ${TESTSBASE}" > ${.TARGET}.tmp
echo "#! /usr/libexec/atf_pytest_wrapper -P ${TESTSBASE}" > ${.TARGET}.tmp
.if empty(ATF_TESTS_PYTEST_SED_${_T})
cat ${ATF_TESTS_PYTEST_SRC_${_T}} >>${.TARGET}.tmp
.else

View file

@ -11,7 +11,6 @@ KYUAFILE= yes
SUBDIR+= etc
SUBDIR+= sys
SUBDIR+= atf_python
SUBDIR+= freebsd_test_suite
SUBDIR_PARALLEL=