From f6b9b40e3c3a58e89a1866d335334d7b210ae3fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Van=C4=9Bk?= Date: Thu, 9 Jun 2022 16:37:39 +0200 Subject: dev-db/redis: limit a number of test clients to MAKEOPTS jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change makes tests to respect user MAKEOPTS jobs preference rather than running 16 test clients by default. Closes: https://bugs.gentoo.org/649868 Signed-off-by: Petr Vaněk Signed-off-by: Sam James --- dev-db/redis/redis-6.0.16.ebuild | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'dev-db/redis/redis-6.0.16.ebuild') diff --git a/dev-db/redis/redis-6.0.16.ebuild b/dev-db/redis/redis-6.0.16.ebuild index 604f29310e71..b9de6505f930 100644 --- a/dev-db/redis/redis-6.0.16.ebuild +++ b/dev-db/redis/redis-6.0.16.ebuild @@ -11,7 +11,7 @@ EAPI=7 # because lua_open became lua_newstate in 5.2 LUA_COMPAT=( lua5-1 luajit ) -inherit autotools edo flag-o-matic lua-single systemd tmpfiles toolchain-funcs +inherit autotools edo flag-o-matic lua-single multiprocessing systemd tmpfiles toolchain-funcs DESCRIPTION="A persistent caching system, key-value and data structures database" HOMEPAGE="https://redis.io" @@ -133,6 +133,10 @@ src_compile() { } src_test() { + local runtestargs=( + --clients "$(makeopts_jobs)" # see bug #649868 + ) + # Known to fail with FEATURES=usersandbox if has usersandbox ${FEATURES}; then ewarn "You are emerging ${P} with 'usersandbox' enabled." \ @@ -141,10 +145,10 @@ src_test() { if use ssl; then edo ./utils/gen-test-certs.sh - edo ./runtest --tls - else - edo ./runtest + runtestargs+=( --tls ) fi + + edo ./runtest "${runtestargs[@]}" } src_install() { -- cgit v1.2.3