From nobody Sun Jun 26 13:28:38 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3DA4F8734F4; Sun, 26 Jun 2022 13:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LWBWq16Tfz3BtL; Sun, 26 Jun 2022 13:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656250119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tyASI0YOcMcxjGvQ2wiDCel8YK9ZvQRY+DHbH2TAfao=; b=ZIyEs0EA22DNzkQ9ZDF3yjxTkag1uOCy93IjcDZgqyPsxR1YrTvSgLZWxyLYxLJLeyzuVR 3jfTWbMfYDTkQ1UtOnnjaOTZPNKP/XyclmnxtG33PXQDHHc5WqMX+KfbBnrQfXVm6TA5DO 8SPYRLkIfs6BIyGdfnPK9wefhmWwajDK78GKR/K/QNF7N7utdpHae5+6WkQV1Yz7mwJPyZ tTXj8MGEAMYi0umX2FuuEGBD5heb8Vde/Dk3kwQPeuIfV+O/G24dorj7CKtZHvHCbuhWCj VscYQB16ZZyflUtFlNxZaTUN9sWsyvGVK5IRMy0opWLBLXKtla5exEK/RYV3zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 068EA16CE8; Sun, 26 Jun 2022 13:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25QDScjA071691; Sun, 26 Jun 2022 13:28:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25QDSc27071690; Sun, 26 Jun 2022 13:28:38 GMT (envelope-from git) Date: Sun, 26 Jun 2022 13:28:38 GMT Message-Id: <202206261328.25QDSc27071690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 924226fba12c - main - testing: move atf-pytest-wrapper to /usr/libexec List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 924226fba12cc9a228c73b956e1b7fa24c60b055 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656250119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tyASI0YOcMcxjGvQ2wiDCel8YK9ZvQRY+DHbH2TAfao=; b=v9xDOgcwXDQh0mdqQMmB/vXIgH8W0f6HDSVqlQV6SZWsZfPz/OEeHRYxmhiH/3Np8mKrBt Y/DBEDzxnsFh4TYNU2smDHNGPkZV/8kR3yfvBMoQRpptcAoqKK5u1N0F2CBCFqmQlYZAdn lKMfz5z39xQO6hYmgT/iQqrF0Wcbai99PRgoGQYLWpPF5+TO3i8h0g2pxkBSD3+mX2vVm6 68yAlpid2wXvzaLZESTObfmJwfoLhp6NN94qXM9dp9al6Hy1AbDvAayMX7MwcWZFpquLWr s9xzORlX0gH3HVltvWrs38x53qom7IKd0y/QLSUMdihK8P7NaGcDITKXcwCIjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656250119; a=rsa-sha256; cv=none; b=W2LLJoZYb7tDP2/R1/PY/QXVBpIJWM6rn43FyiciNd67Z37XM2sFmd9UU5OtDKS/ZEGcDc uTZkOgI3FRby+QOW/TSUkD2/1PB571iK7LY2+Az9M6XCM7+RTyduFiwZQCH21UYXrd5/i4 OVBAIFR788cIvg944snEbLIszfPnq5CIl34/HjOJMvzO9gAbHqaL43hORE5uwRFUbAhp+U nZuS7eP2+oXuzRFsQTDeL9ZJxY0sZm9tyOFXD3Z5iNGuWa7M6xNxajPS9+qlppInL4Wdjy 57GvSVjF9A0ydpwm8IbwMg3KCO75BfQouFxv05G1efUwD9rNrp+vNefVSaaZlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=924226fba12cc9a228c73b956e1b7fa24c60b055 commit 924226fba12cc9a228c73b956e1b7fa24c60b055 Author: Alexander V. Chernikov AuthorDate: 2022-06-26 11:46:37 +0000 Commit: Alexander V. Chernikov 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 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 +.include PACKAGE= tests PROG_CXX= atf_pytest_wrapper SRCS= atf_pytest_wrapper.cpp CXXSTD= c++17 MAN= -BINDIR= - -.include -DESTDIR=${TESTSBASE} .include 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=