From nobody Fri Jan 13 21:25:27 2023 X-Original-To: dev-commits-src-branches@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 4NtvbC41n6z2ql0d; Fri, 13 Jan 2023 21:25:27 +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 4NtvbC2z7lz42Mv; Fri, 13 Jan 2023 21:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645127; 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=xnc+qxih/q+gqyGf7umGTwRghwpLahfFwKMKKgbtUzU=; b=D0eztzVnZjj0LcFl+UtZvinHi1rXme1+f2CEpqykI4Ar/iZaFVKFbGnYMuyBZREUyz9wvt 8WEXINtSvKBkBReu4QaCiievgmj6g59lLNCyN1Hjjd/zFh9qGP1Ute1gxDmITdYlvSi8YO oQFjab2rrGKUSAaG6MLY+z+VR5wDL5XWVh8n9knIgZTBn6ml0N102qYka5Qr1trE6VZC9w qix6Znt44524ZSEWMXdVR9T2xHWqMj6DfUBXDvyEDRdNSIpCMe1WnqyQjRYUOKhJgY2KIp 9RlYxlewv4VgFQQN+hY3Dnbj5wvoQBOKwwY1umozQ1RQOGSbub6BQ4pdm7+Rwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645127; 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=xnc+qxih/q+gqyGf7umGTwRghwpLahfFwKMKKgbtUzU=; b=YBs29XEyA/t6SHrnwFNrQ2+c6/as05z2UAM+LbusdW48A74JAUa1RtETTyhZl2gYgc1AZ6 fu/KHCatGTWKDViqVGWwLZRAHcjS7Tv6rKFF8ZyneiGBSwaWzD5bsRmRJQgz2auA0/fAh5 2CRXG2Y6o/ix4UJcXe/uW232vDpoi5f6IgVfrYBP66fL+78BmQefwJ14n9pGk1xZtX+wpn WTdDPh3e1E3RgDA0ICGojnkLJYXpTQVj2AcM3aorIQ+VZd3z6l20aomJidyGbl9UbmOJ0/ 64UUMjWP8D3uPLqAIdNgWDnlt+EbhVkHN9QdODvTtQkT4ViM/NN8LDrVNyX1Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673645127; a=rsa-sha256; cv=none; b=kCGkacBiyy8tBpyX8o4eV2W/TFTGuepjZVw0uHU30Cl89wvHDMrZeQruD54wORM41lZGXr kP/nNDqaZl+yEyfa5/HWWu5HYYnhfi1d7kV1Yw9a3tUywX/4GMYA82B6GYSrZ3bBW16PdY kt4gJcXb06mwtGXsYwa6EeZu9Ct1BDYXGar8cGflhuTLqxhqaLoKFmLS/IHL6tqVFukBQF 14aqiU5edgzr+R7fwmrtT88MCe/YeK6yuuCr5dShrOtkn26MQTpc1d9PyP6pF5noHq0lFC 9lgnAPZ/XNpTuhJRsn4kTXzAkZMalbWmTfTfp5XvO1P/QxYB639nPQh5UFN4oQ== 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 4NtvbC1QYdzN2N; Fri, 13 Jan 2023 21:25:27 +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 30DLPRD3041865; Fri, 13 Jan 2023 21:25:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DLPRQA041864; Fri, 13 Jan 2023 21:25:27 GMT (envelope-from git) Date: Fri, 13 Jan 2023 21:25:27 GMT Message-Id: <202301132125.30DLPRQA041864@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 8a923023113f - stable/13 - testing: move atf-pytest-wrapper to /usr/libexec List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 8a923023113f10af96fd783877dd1f1eb8515e3e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=8a923023113f10af96fd783877dd1f1eb8515e3e commit 8a923023113f10af96fd783877dd1f1eb8515e3e Author: Alexander V. Chernikov AuthorDate: 2022-06-26 11:46:37 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-13 21:24:10 +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 (cherry picked from commit 924226fba12cc9a228c73b956e1b7fa24c60b055) --- 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 7195b6566636..475b9571d8e9 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=