From fe07031dfb04ac810a67a77a30e2452eb346cb61 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 19 Aug 2023 17:39:29 +0100 Subject: [PATCH] sys-apps/portage: use xdist, epytest-style formatting Signed-off-by: Sam James --- sys-apps/portage/portage-3.0.50.ebuild | 9 +++++++-- sys-apps/portage/portage-9999.ebuild | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/sys-apps/portage/portage-3.0.50.ebuild b/sys-apps/portage/portage-3.0.50.ebuild index ec4db2e48278b..752d29f038559 100644 --- a/sys-apps/portage/portage-3.0.50.ebuild +++ b/sys-apps/portage/portage-3.0.50.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( pypy3 python3_{10..12} ) PYTHON_REQ_USE='bzip2(+),threads(+)' TMPFILES_OPTIONAL=1 -inherit meson linux-info python-r1 tmpfiles +inherit meson linux-info multiprocessing python-r1 tmpfiles DESCRIPTION="The package management and distribution system for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" @@ -37,7 +37,10 @@ BDEPEND=" $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] ' python3_12) - test? ( dev-vcs/git ) + test? ( + dev-vcs/git + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) " DEPEND=" ${PYTHON_DEPS} @@ -153,6 +156,8 @@ src_compile() { } src_test() { + local -x PYTEST_ADDOPTS="-vv -ra -l -o console_output_style=count -n $(makeopts_jobs) --dist=worksteal" + python_foreach_impl meson_src_test --no-rebuild --verbose } diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index ec4db2e48278b..752d29f038559 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( pypy3 python3_{10..12} ) PYTHON_REQ_USE='bzip2(+),threads(+)' TMPFILES_OPTIONAL=1 -inherit meson linux-info python-r1 tmpfiles +inherit meson linux-info multiprocessing python-r1 tmpfiles DESCRIPTION="The package management and distribution system for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" @@ -37,7 +37,10 @@ BDEPEND=" $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] ' python3_12) - test? ( dev-vcs/git ) + test? ( + dev-vcs/git + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) " DEPEND=" ${PYTHON_DEPS} @@ -153,6 +156,8 @@ src_compile() { } src_test() { + local -x PYTEST_ADDOPTS="-vv -ra -l -o console_output_style=count -n $(makeopts_jobs) --dist=worksteal" + python_foreach_impl meson_src_test --no-rebuild --verbose }