git: 924226fba12c - main - testing: move atf-pytest-wrapper to /usr/libexec

The branch main has been updated by melifaro:

URL: https://cgit.FreeBSD.org/src/commit/?id=924226fba12cc9a228c73b956e1b7fa24c60b055

commit 924226fba12cc9a228c73b956e1b7fa24c60b055
Author:     Alexander V. Chernikov <melifaro@FreeBSD.org>
AuthorDate: 2022-06-26 11:46:37 +0000
Commit:     Alexander V. Chernikov <melifaro@FreeBSD.org>
CommitDate: 2022-06-26 13:25:47 +0000

    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
---
 etc/mtree/BSD.tests.dist                                             | 2 ++
 libexec/atf/Makefile                                                 | 2 +-
 .../freebsd_test_suite => libexec/atf/atf-pytest-wrapper}/Makefile   | 5 +----
 .../atf/atf-pytest-wrapper}/atf_pytest_wrapper.cpp                   | 0
 share/mk/atf.test.mk                                                 | 2 +-
 tests/Makefile                                                       | 1 -
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index cb9efe38de3a..d62f0ea49eb7 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -421,6 +421,8 @@
         atf
             atf-check
             ..
+            atf-pytest-wrapper
+            ..
             atf-sh
             ..
         ..
diff --git a/libexec/atf/Makefile b/libexec/atf/Makefile
index db7554d9ddaa..77819aeff697 100644
--- a/libexec/atf/Makefile
+++ b/libexec/atf/Makefile
@@ -25,6 +25,6 @@
 #
 # $FreeBSD$
 
-SUBDIR=	atf-check atf-sh tests
+SUBDIR=	atf-check atf-pytest-wrapper atf-sh tests
 
 .include <bsd.subdir.mk>
diff --git a/tests/freebsd_test_suite/Makefile b/libexec/atf/atf-pytest-wrapper/Makefile
similarity index 73%
rename from tests/freebsd_test_suite/Makefile
rename to libexec/atf/atf-pytest-wrapper/Makefile
index c929ca2880eb..e4dc0f8a5fd1 100644
--- a/tests/freebsd_test_suite/Makefile
+++ b/libexec/atf/atf-pytest-wrapper/Makefile
@@ -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>
diff --git a/tests/freebsd_test_suite/atf_pytest_wrapper.cpp b/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp
similarity index 100%
rename from tests/freebsd_test_suite/atf_pytest_wrapper.cpp
rename to libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp
diff --git a/share/mk/atf.test.mk b/share/mk/atf.test.mk
index c00c00bc9b3d..6321f7618d05 100644
--- a/share/mk/atf.test.mk
+++ b/share/mk/atf.test.mk
@@ -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
diff --git a/tests/Makefile b/tests/Makefile
index cfd065d61539..b406b8dc6c17 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -11,7 +11,6 @@ KYUAFILE= yes
 SUBDIR+= etc
 SUBDIR+= sys
 SUBDIR+= atf_python
-SUBDIR+= freebsd_test_suite
 
 SUBDIR_PARALLEL=