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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0E2B8138334 for ; Wed, 5 Jun 2019 19:06:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33435E0824; Wed, 5 Jun 2019 19:06:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 06279E0824 for ; Wed, 5 Jun 2019 19:06:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 27759345797 for ; Wed, 5 Jun 2019 19:06:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11278608 for ; Wed, 5 Jun 2019 19:06:40 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1559755280.3697c46930646b08e6bf13fe7ec5879f16e5b06f.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/discover/files/, kde-plasma/discover/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/discover/discover-5.15.90.ebuild kde-plasma/discover/discover-5.16.49.9999.ebuild kde-plasma/discover/discover-9999.ebuild kde-plasma/discover/files/discover-5.15.5-tests.patch X-VCS-Directories: kde-plasma/discover/files/ kde-plasma/discover/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3697c46930646b08e6bf13fe7ec5879f16e5b06f X-VCS-Branch: master Date: Wed, 5 Jun 2019 19:06:40 +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: 2dfdee25-e6d6-47c3-9c8a-ff5b3cb905d1 X-Archives-Hash: fe6d70a89fdff651f627d0ea5793d2cd commit: 3697c46930646b08e6bf13fe7ec5879f16e5b06f Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jun 5 17:21:20 2019 +0000 Commit: Andreas Sturmlechner gentoo 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 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 -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 -