[gentoo-commits] proj/kde:master commit in: kde-plasma/discover/files/, kde-plasma/discover/

[Andreas Sturmlechner]

commit:     3697c46930646b08e6bf13fe7ec5879f16e5b06f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  5 17:21:20 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 17:21:20 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3697c469

kde-plasma/discover: Disable knsbackendtest, needs network connection

Closes: https://bugs.gentoo.org/686392
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/discover/discover-5.15.90.ebuild        | 11 +++++--
 kde-plasma/discover/discover-5.16.49.9999.ebuild   | 11 +++++--
 kde-plasma/discover/discover-9999.ebuild           |  9 +++++
 .../discover/files/discover-5.15.5-tests.patch     | 38 ----------------------
 4 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/kde-plasma/discover/discover-5.15.90.ebuild b/kde-plasma/discover/discover-5.15.90.ebuild
index bd62c7d5af..858302509e 100644
--- a/kde-plasma/discover/discover-5.15.90.ebuild
+++ b/kde-plasma/discover/discover-5.15.90.ebuild
@@ -42,8 +42,6 @@ RDEPEND="${DEPEND}
 	$(add_frameworks_dep kirigami)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.15.5-tests.patch" )
-
 src_prepare() {
 	kde5_src_prepare
 	# we don't need it with PackageKitBackend off
@@ -61,3 +59,12 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+src_test() {
+	# bug 686392: needs network connection
+	local myctestargs=(
+		-E "(knsbackendtest)"
+	)
+
+	kde5_src_test
+}

diff --git a/kde-plasma/discover/discover-5.16.49.9999.ebuild b/kde-plasma/discover/discover-5.16.49.9999.ebuild
index 4b2533e516..0bd40267c0 100644
--- a/kde-plasma/discover/discover-5.16.49.9999.ebuild
+++ b/kde-plasma/discover/discover-5.16.49.9999.ebuild
@@ -42,8 +42,6 @@ RDEPEND="${DEPEND}
 	$(add_frameworks_dep kirigami)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.15.5-tests.patch" )
-
 src_prepare() {
 	kde5_src_prepare
 	# we don't need it with PackageKitBackend off
@@ -61,3 +59,12 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+src_test() {
+	# bug 686392: needs network connection
+	local myctestargs=(
+		-E "(knsbackendtest)"
+	)
+
+	kde5_src_test
+}

diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild
index ae6b410e05..0bd40267c0 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -59,3 +59,12 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+src_test() {
+	# bug 686392: needs network connection
+	local myctestargs=(
+		-E "(knsbackendtest)"
+	)
+
+	kde5_src_test
+}

diff --git a/kde-plasma/discover/files/discover-5.15.5-tests.patch b/kde-plasma/discover/files/discover-5.15.5-tests.patch
deleted file mode 100644
index 131a63b1e9..0000000000
--- a/kde-plasma/discover/files/discover-5.15.5-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 03653a7d75ba8b24e28bc3adf5348ea3d0faf2b0 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@g.o>
-Date: Thu, 16 May 2019 19:39:44 +1000
-Subject: [PATCH] Port knsbackendtest to ecm_add_test
-
-Reviewers: #plasma, apol
-
-Reviewed By: apol
-
-Subscribers: asturmlechner, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D21239
----
- libdiscover/backends/KNSBackend/tests/CMakeLists.txt | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/libdiscover/backends/KNSBackend/tests/CMakeLists.txt b/libdiscover/backends/KNSBackend/tests/CMakeLists.txt
-index 4fabe5ec..e64eb8ca 100644
---- a/libdiscover/backends/KNSBackend/tests/CMakeLists.txt
-+++ b/libdiscover/backends/KNSBackend/tests/CMakeLists.txt
-@@ -1,11 +1,3 @@
- include_directories(..)
- 
--add_executable(knsbackendtest KNSBackendTest.cpp)
--add_test(knsbackendtest knsbackendtest)
--ecm_mark_as_test(knsbackendtest)
--target_link_libraries(knsbackendtest
--    Discover::Common
--    
--    Qt5::Test Qt5::Core
--    KF5::NewStuff KF5::Attica
--)
-+ecm_add_test(KNSBackendTest.cpp TEST_NAME knsbackendtest LINK_LIBRARIES Discover::Common Qt5::Core Qt5::Test KF5::Attica KF5::NewStuff)
--- 
-2.21.0
-