From 2714b71a17939615ea358389a9a95df01ca02ac2 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 9 Jul 2019 13:16:41 -0700 Subject: [PATCH] x11-libs/pixman: Limit test suite $(makeopts_jobs) threads Otherwise we would run as many OpenMP threads as there are CPU cores and ignore MAKEOPTS. Since we're running tests in parallel *and* the tests spawn multiple threads, we will still exceed $(makeopts_jobs) threads total, but I don't think that can be helped. Closes: https://bugs.gentoo.org/688926 Signed-off-by: Matt Turner --- x11-libs/pixman/pixman-0.38.4.ebuild | 4 ++-- x11-libs/pixman/pixman-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x11-libs/pixman/pixman-0.38.4.ebuild b/x11-libs/pixman/pixman-0.38.4.ebuild index b5fcceac957..9f87fe1ca1d 100644 --- a/x11-libs/pixman/pixman-0.38.4.ebuild +++ b/x11-libs/pixman/pixman-0.38.4.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" fi -inherit ${GIT_ECLASS} meson multilib-minimal toolchain-funcs +inherit ${GIT_ECLASS} meson multilib-minimal multiprocessing toolchain-funcs DESCRIPTION="Low-level pixel manipulation routines" HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" @@ -54,7 +54,7 @@ multilib_src_compile() { } multilib_src_test() { - meson test -v -C "${BUILD_DIR}" -t 100 + OMP_NUM_THREADS=$(makeopts_jobs) meson test -v -C "${BUILD_DIR}" -t 100 } multilib_src_install() { diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild index 0e6923456a8..81648e1e3f7 100644 --- a/x11-libs/pixman/pixman-9999.ebuild +++ b/x11-libs/pixman/pixman-9999.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" fi -inherit ${GIT_ECLASS} meson multilib-minimal toolchain-funcs +inherit ${GIT_ECLASS} meson multilib-minimal multiprocessing toolchain-funcs DESCRIPTION="Low-level pixel manipulation routines" HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" @@ -54,7 +54,7 @@ multilib_src_compile() { } multilib_src_test() { - meson test -v -C "${BUILD_DIR}" -t 100 + OMP_NUM_THREADS=$(makeopts_jobs) meson test -v -C "${BUILD_DIR}" -t 100 } multilib_src_install() { -- 2.21.0