From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 106F9158042 for ; Fri, 25 Oct 2024 21:47:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37B11E0A60; Fri, 25 Oct 2024 21:47:19 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 194D9E0A60 for ; Fri, 25 Oct 2024 21:47:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5888634309B for ; Fri, 25 Oct 2024 21:47:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E766BAE7 for ; Fri, 25 Oct 2024 21:47:16 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1729892692.9d5094fbcab380d8ae5f04b8ea00ee4f726167f3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/bind/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/bind/bind-9.18.29-r2.ebuild X-VCS-Directories: net-dns/bind/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9d5094fbcab380d8ae5f04b8ea00ee4f726167f3 X-VCS-Branch: master Date: Fri, 25 Oct 2024 21:47:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c16f5a40-678d-4634-9841-7746b94b35bb X-Archives-Hash: 41d0fc471521be2733383f121d784064 commit: 9d5094fbcab380d8ae5f04b8ea00ee4f726167f3 Author: Sam James gentoo org> AuthorDate: Fri Oct 25 21:44:52 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Oct 25 21:44:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d5094fb net-dns/bind: backport test fixes to 9.18.29-r2 Backport the test fixes from 511d0f25bfa3cfd3956a83ace532fafaf947dc95. Closes: https://bugs.gentoo.org/942132 Signed-off-by: Sam James gentoo.org> net-dns/bind/bind-9.18.29-r2.ebuild | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/net-dns/bind/bind-9.18.29-r2.ebuild b/net-dns/bind/bind-9.18.29-r2.ebuild index 1f40ca79c839..9836f987042d 100644 --- a/net-dns/bind/bind-9.18.29-r2.ebuild +++ b/net-dns/bind/bind-9.18.29-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit multiprocessing systemd tmpfiles +inherit systemd tmpfiles MY_PV="${PV/_p/-P}" MY_PV="${MY_PV/_rc/rc}" @@ -51,10 +51,19 @@ BDEPEND=" doc? ( dev-python/sphinx ) test? ( dev-util/cmocka - dev-util/kyua ) " +src_prepare() { + default + + # Don't clobber our toolchain defaults + sed -i -e '/FORTIFY_SOURCE=/d' configure || die + + # Test is (notoriously) slow/resource intensive + sed -i -e 's:ISC_TEST_MAIN:int main(void) { exit(77); }:' tests/isc/netmgr_test.c || die +} + src_configure() { local myeconfargs=( --prefix="${EPREFIX}"/usr @@ -73,6 +82,7 @@ src_configure() { $(use_enable fixed-rrset) $(use_enable static-libs static) $(use_enable geoip) + $(use_with test cmocka) $(use_with geoip maxminddb) $(use_with gssapi) $(use_with idn libidn2) @@ -87,7 +97,11 @@ src_configure() { src_test() { # system tests ('emake test') require network configuration for IPs etc # so we run the unit tests instead. - TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit + CI=1 emake unit V=1 + + # libtest is an internal test helper library, it has no tests, + # so suppress the QA warning. + rm libtest/test-suite.log || die } src_install() {