Page MenuHomeFreeBSD
Files F163221280

D35604.id.diff
No OneTemporary
Actions

D35604.id.diff
View Options

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
--- 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
--- 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
rename from tests/freebsd_test_suite/Makefile
rename to libexec/atf/atf-pytest-wrapper/Makefile
--- 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
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
--- a/share/mk/atf.test.mk
+++ b/share/mk/atf.test.mk
@@ -145,7 +145,7 @@
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
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -11,7 +11,6 @@
SUBDIR+= etc
SUBDIR+= sys
SUBDIR+= atf_python
-SUBDIR+= freebsd_test_suite
SUBDIR_PARALLEL=

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 22, 4:43 AM (2 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35347702
Default Alt Text
D35604.id.diff (1 KB)

Event Timeline