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 556BE1581FB for ; Fri, 30 Aug 2024 17:40:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A420AE29B7; Fri, 30 Aug 2024 17:40:51 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8AA87E29B7 for ; Fri, 30 Aug 2024 17:40:51 +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 84D0534068A for ; Fri, 30 Aug 2024 17:40:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2893AE66 for ; Fri, 30 Aug 2024 17:40:49 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1725039646.0111035412002ce7a102a1f3d93e1f411c16f90c.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/freerdp/freerdp-9999.ebuild X-VCS-Directories: net-misc/freerdp/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 0111035412002ce7a102a1f3d93e1f411c16f90c X-VCS-Branch: master Date: Fri, 30 Aug 2024 17:40:49 +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: bcb81a10-477c-41ba-ba65-7176046f50f8 X-Archives-Hash: 43535960f5c7f1b95ffc098d14e05d02 commit: 0111035412002ce7a102a1f3d93e1f411c16f90c Author: Mike Gilbert gentoo org> AuthorDate: Fri Aug 30 17:35:13 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Aug 30 17:40:46 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01110354 net-misc/freerdp: rework testing Enabling the BUILD_TESTING option causes all symbols to be exported, which is not desirable for installed libraries. Create a separate test build to facilitate running tests without installing the wonky test libraries. Signed-off-by: Mike Gilbert gentoo.org> net-misc/freerdp/freerdp-9999.ebuild | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index 51aab209a2db..5907f28cdfca 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -120,17 +120,27 @@ option_client() { fi } +run_for_testing() { + if use test; then + local BUILD_DIR="${WORKDIR}/${P}_testing" + "$@" + fi +} + src_configure() { # bug #881695 filter-lto + freerdp_configure -DBUILD_TESTING=OFF + run_for_testing freerdp_configure -DBUILD_TESTING=ON +} +freerdp_configure() { local mycmakeargs=( -Wno-dev # https://bugs.gentoo.org/927037 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF - -DBUILD_TESTING=$(option test) -DCHANNEL_URBDRC=$(option usb) -DWITH_AAD=$(option aad) -DWITH_ALSA=$(option alsa) @@ -166,14 +176,21 @@ src_configure() { -DWITH_WAYLAND=$(option_client wayland) -DWITH_WEBVIEW=OFF -DWITH_WINPR_TOOLS=$(option server) + + "$@" ) cmake_src_configure } +src_compile() { + cmake_src_compile + run_for_testing cmake_src_compile +} + src_test() { local myctestargs=( -E TestBacktrace ) has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect ) - cmake_src_test + run_for_testing cmake_src_test } src_install() {