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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CC94415817D for ; Sun, 23 Jun 2024 00:29:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20E05E2AB1; Sun, 23 Jun 2024 00:29:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 056B1E2AB1 for ; Sun, 23 Jun 2024 00:29:14 +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 1F960340C57 for ; Sun, 23 Jun 2024 00:29:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AEB9E1AE2 for ; Sun, 23 Jun 2024 00:29:11 +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: <1719102516.2ac5f1e9c75aede6464cddfa1296c4ced8822f5e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups/cups-2.4.7-r2.ebuild X-VCS-Directories: net-print/cups/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2ac5f1e9c75aede6464cddfa1296c4ced8822f5e X-VCS-Branch: master Date: Sun, 23 Jun 2024 00:29:11 +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: de44ad1e-bf00-4c22-8994-dcb2c32a7d67 X-Archives-Hash: 008b48908aefc4bfc5ec4e7b00dc9eab commit: 2ac5f1e9c75aede6464cddfa1296c4ced8822f5e Author: Sam James gentoo org> AuthorDate: Sun Jun 23 00:28:36 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 23 00:28:36 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ac5f1e9 net-print/cups: backport test fix to 2.4.7-r2 We can't mkdir twice as it breaks multilib, even though we don't actually run the tests for non-native abi. Signed-off-by: Sam James gentoo.org> net-print/cups/cups-2.4.7-r2.ebuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net-print/cups/cups-2.4.7-r2.ebuild b/net-print/cups/cups-2.4.7-r2.ebuild index 51ce84608e2e..0da25c8b8850 100644 --- a/net-print/cups/cups-2.4.7-r2.ebuild +++ b/net-print/cups/cups-2.4.7-r2.ebuild @@ -213,13 +213,13 @@ multilib_src_compile() { } multilib_src_test() { - # Avoid using /tmp - export CUPS_TESTBASE="${T}"/cups-tests - - mkdir "${T}"/cups-tests || die - # We only build some of CUPS for multilib, so can't run the tests. if multilib_is_native_abi; then + # Avoid using /tmp + export CUPS_TESTBASE="${T}"/cups-tests + + mkdir "${T}"/cups-tests || die + # avoid building *and running* test binaries in src_compile # https://github.com/OpenPrinting/cups/commit/b1d42061e9286f50eefc851ed906d17c6e80c4b0 emake UNITTESTS=unittests