commit:     8bdf1e8bf09315e64ef7976b1f847342f2240612
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 31 04:33:25 2026 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jan 31 04:37:31 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bdf1e8b

net-misc/freerdp: simplify testing again

This was fixed upstream in version 3.10.0.

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-misc/freerdp/freerdp-9999.ebuild | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/net-misc/freerdp/freerdp-9999.ebuild 
b/net-misc/freerdp/freerdp-9999.ebuild
index ee0df2424745..2b8c8ba2eb78 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2025 Gentoo Authors
+# Copyright 2011-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -120,23 +120,13 @@ option_client() {
        fi
 }
 
-run_for_testing() {
-       if use test; then
-               local BUILD_DIR="${WORKDIR}/${P}_testing"
-               "$@"
-       fi
-}
-
 src_configure() {
        use debug || append-cppflags -DNDEBUG
-       freerdp_configure -DBUILD_TESTING=OFF
-       run_for_testing freerdp_configure -DBUILD_TESTING=ON
-}
-
-freerdp_configure() {
        local mycmakeargs=(
                -Wno-dev
 
+               -DBUILD_TESTING=$(option test)
+
                # https://bugs.gentoo.org/927037
                -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
 
@@ -179,17 +169,10 @@ freerdp_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() {
        # TestBacktrace: bug 930636
        # TestSynchCritical, TestSynchMultipleThreads: bug 951301
@@ -197,7 +180,7 @@ src_test() {
        if has network-sandbox ${FEATURES}; then
                CMAKE_SKIP_TESTS+=( TestConnect )
        fi
-       run_for_testing cmake_src_test
+       cmake_src_test
 }
 
 src_install() {

Reply via email to