diff options
Diffstat (limited to 'dev-db/redis/redis-6.2.7-r1.ebuild')
| -rw-r--r-- | dev-db/redis/redis-6.2.7-r1.ebuild | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/dev-db/redis/redis-6.2.7-r1.ebuild b/dev-db/redis/redis-6.2.7-r1.ebuild index daabb56d3c64..a15818f6a3db 100644 --- a/dev-db/redis/redis-6.2.7-r1.ebuild +++ b/dev-db/redis/redis-6.2.7-r1.ebuild @@ -14,7 +14,7 @@ LUA_COMPAT=( lua5-1 luajit ) # Upstream have deviated too far from vanilla Lua, adding their own APIs # like lua_enablereadonlytable, but we still need the eclass and such # for bug #841422. -inherit autotools flag-o-matic systemd toolchain-funcs lua-single tmpfiles +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" @@ -23,7 +23,7 @@ SRC_URI="https://download.redis.io/releases/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="+jemalloc ssl systemd tcmalloc test" +IUSE="+jemalloc selinux ssl systemd tcmalloc test" RESTRICT="!test? ( test )" COMMON_DEPEND=" @@ -38,6 +38,7 @@ RDEPEND=" ${COMMON_DEPEND} acct-group/redis acct-user/redis + selinux? ( sec-policy/selinux-redis ) " BDEPEND=" @@ -66,9 +67,6 @@ PATCHES=( src_prepare() { default - # unstable on jemalloc - > tests/unit/memefficiency.tcl || die - # Copy lua modules into build dir #cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die #cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die @@ -134,18 +132,24 @@ src_compile() { } src_test() { - # Known to fail with FEATURES=usersandbox - if has usersandbox ${FEATURES}; then - ewarn "You are emerging ${P} with 'usersandbox' enabled." \ - "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" + local runtestargs=( + --clients "$(makeopts_jobs)" # see bug #649868 + ) + + if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then + ewarn "unit/oom-score-adj test will be skipped." \ + "It is known to fail with FEATURES usersandbox or -userpriv. See bug #756382." + + # unit/oom-score-adj was introduced in version 6.2.0 + runtestargs+=( --skipunit unit/oom-score-adj ) # see bug #756382 fi if use ssl; then - ./utils/gen-test-certs.sh - ./runtest --tls - else - ./runtest + edo ./utils/gen-test-certs.sh + runtestargs+=( --tls ) fi + + edo ./runtest "${runtestargs[@]}" } src_install() { |