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 1F8E5158013 for ; Tue, 5 Dec 2023 05:28:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B49512BC0A6; Tue, 5 Dec 2023 05:26:07 +0000 (UTC) Received: from mail-ot1-x32b.google.com (mail-ot1-x32b.google.com [IPv6:2607:f8b0:4864:20::32b]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 83EB72BC0A3 for ; Tue, 5 Dec 2023 05:26:07 +0000 (UTC) Received: by mail-ot1-x32b.google.com with SMTP id 46e09a7af769-6d875809921so2144491a34.3 for ; Mon, 04 Dec 2023 21:26:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701753966; x=1702358766; darn=lists.gentoo.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=d7OyT/lucExrPKWtlU1tghiJ5CIru1VMAaMCpuoibss=; b=L/ebpbsIg1RKDU+fMb3I6is6PZ9sIzqN+w/PD1/X0wo+B3AYCWPhJ0aMXPpuVwdsf2 QCOl5NNCAVfVaNIx/x7S9gg5dOVAPnYVk6eRMxo2AzOwxUvMDKEj/jDIozu4egI3t/AX yK8ta7SQRC0ldfyx3zqIU/xEQJrTsNtCE7TUnBONFkDZHpBeg4ibM/gMMGg7s1zU8r9p lZRv1SZZd2dnuRSOWQXR3QK7EUCKW3/h+dieKyWdSLQpphX+tdwd7Xqao5JOLP627nlE FSvXgO9dozebCRo+FNoeEP57EQFZ/hYkmcjG12PeSfpipNaghCCA9A5pMMpyORJHMqqa oFxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701753966; x=1702358766; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d7OyT/lucExrPKWtlU1tghiJ5CIru1VMAaMCpuoibss=; b=qdbk2GYxS9DWMk+k9n8QxBy7f0uk9aEG3Z8T0iFUJdV0G3mL08FjRRkRJoI2/P0jAS Wd4J7l9FbyO4hSJyRSD0xdCuxK7QjmlOtlRPnzwj8vY9QKjlZbrz9oWNonM89DRCtIAF +uRgQiGORF56Z3AgtvVySO/ehbp07JnBp7DQQN16FUDM8OzIVMDFWy79pdFqK06KkWNz n3VMl3I4yqisSdTbY22vEeTt+3N9/KJFmLy97qcBJ0WeF2EF8JIxpZtxrJosQMmhBm/d 6k0O9GepJ9J1dlqAwPIX/cIA+ON0E/NCDrMF/2qU+4k+Opk6TyAuDyHnBlyPWWoHR5Z2 Np6g== X-Gm-Message-State: AOJu0YxK3yps8cPPxM4JxB8tnLFR7CIYfcjh4+zajPPCmlBTC7IiroUz uSYxevwHVUrBgzDRNi8Pr2nJ2DbuTbg= X-Google-Smtp-Source: AGHT+IHIp9majH6ad+BfR926Uo1TNHkK/PnLNuCAFgQTtugV18hD39iG4KEXE0JeDculrETY0N3S0A== X-Received: by 2002:a05:6808:9b0:b0:3b8:5f6c:955c with SMTP id e16-20020a05680809b000b003b85f6c955cmr4397278oig.26.1701753966063; Mon, 04 Dec 2023 21:26:06 -0800 (PST) Received: from acleverhostname.attlocal.net (108-200-163-197.lightspeed.bcvloh.sbcglobal.net. [108.200.163.197]) by smtp.gmail.com with ESMTPSA id x19-20020a056808145300b003b6caf2accfsm2081659oiv.22.2023.12.04.21.26.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 21:26:05 -0800 (PST) From: Eli Schwartz To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [RFC PATCH 08/10] net-print/cups: avoid running unittests in src_compile Date: Tue, 5 Dec 2023 00:20:33 -0500 Message-ID: <20231205052550.3150055-9-eschwartz93@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231205052550.3150055-1-eschwartz93@gmail.com> References: <20231205052550.3150055-1-eschwartz93@gmail.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: c4b7e240-66fe-4b84-9d84-c9bb63982d8e X-Archives-Hash: db79398c9bd35a2d320d74b1b8ff319b If USE=test, an option was passed to configure that makes unittest binaries be built, and as a side effect also runs them. But we really do not want to run tests in src_compile, as FEATURES=test might not be set. Crudely hack around this by overriding the autoconf variable that would normally be set by `$(use_enable test unit-tests)`, when running the test invocation itself. As a side effect, this also moves the test-program compilation to src_test. Signed-off-by: Eli Schwartz --- net-print/cups/cups-2.4.7-r2.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net-print/cups/cups-2.4.7-r2.ebuild b/net-print/cups/cups-2.4.7-r2.ebuild index 3f63cd43a70c..d8a193a64337 100644 --- a/net-print/cups/cups-2.4.7-r2.ebuild +++ b/net-print/cups/cups-2.4.7-r2.ebuild @@ -30,8 +30,6 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="acl dbus debug kerberos openssl pam selinux static-libs systemd test usb X xinetd zeroconf" -# As of 2.4.2, they don't actually seem to be interactive (they pass some flags -# by default to input for us), but they fail on some greyscale issue w/ poppler? RESTRICT="!test? ( test )" BDEPEND=" @@ -167,7 +165,6 @@ multilib_src_configure() { $(use_enable kerberos gssapi) $(multilib_native_use_enable pam) $(use_enable static-libs static) - $(use_enable test unit-tests) --with-tls=$(usex openssl openssl gnutls) $(use_with systemd ondemand systemd) $(multilib_native_use_enable usb libusb) @@ -222,7 +219,12 @@ multilib_src_test() { mkdir "${T}"/cups-tests || die # We only build some of CUPS for multilib, so can't run the tests. - multilib_is_native_abi && default + if multilib_is_native_abi; then + # avoid building *and running* test binaries in src_compile + # https://github.com/OpenPrinting/cups/commit/b1d42061e9286f50eefc851ed906d17c6e80c4b0 + emake UNITTESTS=unittests + default + fi } multilib_src_install() { -- 2.41.0