[gentoo-commits] repo/gentoo:master commit in: kde-plasma/milou/files/, kde-plasma/milou/

[gentoo-commits] repo/gentoo:master commit in: kde-plasma/milou/files/, kde-plasma/milou/

[Andreas Sturmlechner]

commit:     45a5d700d9109e4409325360fdf0b27a46e2e145
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 18:35:22 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 09:43:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45a5d700

kde-plasma/milou: Disable test dir

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/milou-5.19.80-disable-manual-tests.patch | 29 ++++++++++++++++++++++
 kde-plasma/milou/milou-5.19.3.ebuild               |  4 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/kde-plasma/milou/files/milou-5.19.80-disable-manual-tests.patch b/kde-plasma/milou/files/milou-5.19.80-disable-manual-tests.patch
new file mode 100644
index 00000000000..a9e3b029f91
--- /dev/null
+++ b/kde-plasma/milou/files/milou-5.19.80-disable-manual-tests.patch
@@ -0,0 +1,29 @@
+From b239834faa093a972bd7ca33296484609f121a3b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 14 Jul 2020 20:24:01 +0200
+Subject: [PATCH] Disable test dir based on BUILD_TESTING or unavailability of
+ Qt5::Test
+
+These tests are manual; an attempt to run them ended in failure.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ lib/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index a739c5c..92dd0be 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -39,4 +39,7 @@ install(TARGETS milou EXPORT MilouLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_A
+ 
+ add_subdirectory(qml)
+ add_subdirectory(previews)
+-add_subdirectory(test)
++
++if(BUILD_TESTING AND TARGET Qt5::Test)
++  add_subdirectory(test)
++endif()
+-- 
+2.27.0
+

diff --git a/kde-plasma/milou/milou-5.19.3.ebuild b/kde-plasma/milou/milou-5.19.3.ebuild
index 4f9eedfc9a4..7dbe1e1668f 100644
--- a/kde-plasma/milou/milou-5.19.3.ebuild
+++ b/kde-plasma/milou/milou-5.19.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ECM_TEST="forceoptional-recursive"
+ECM_TEST="forceoptional"
 KFMIN=5.71.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.14.2
@@ -31,3 +31,5 @@ DEPEND="
 	>=kde-frameworks/plasma-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.19.80-disable-manual-tests.patch" ) # bug 732584