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 55AA21396D0 for ; Tue, 8 Aug 2017 23:49:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 836E41FC005; Tue, 8 Aug 2017 23:49:53 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 51D171FC005 for ; Tue, 8 Aug 2017 23:49:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 25273341A38 for ; Tue, 8 Aug 2017 23:49:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BED7875F7 for ; Tue, 8 Aug 2017 23:49:50 +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: <1502232261.20caf700d502f20281c3d067f7c2fd8d3a143391.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/files/, kde-frameworks/kio/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/kio/files/kio-5.37.0-tests.patch kde-frameworks/kio/kio-5.37.0.ebuild kde-frameworks/kio/kio-9999.ebuild X-VCS-Directories: kde-frameworks/kio/ kde-frameworks/kio/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 20caf700d502f20281c3d067f7c2fd8d3a143391 X-VCS-Branch: master Date: Tue, 8 Aug 2017 23:49:50 +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-Archives-Salt: 24df6259-8075-4b5a-b821-77d269fc3759 X-Archives-Hash: 294331c49769ccac18b0b739ec3c8596 commit: 20caf700d502f20281c3d067f7c2fd8d3a143391 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Aug 8 22:44:21 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 8 22:44:21 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=20caf700 kde-frameworks/kio: Switch KDE_TEST back to forceoptional Package-Manager: Portage-2.3.6, Repoman-2.3.1 kde-frameworks/kio/files/kio-5.37.0-tests.patch | 50 +++++++++++++++++++++++++ kde-frameworks/kio/kio-5.37.0.ebuild | 9 +++-- kde-frameworks/kio/kio-9999.ebuild | 7 ++-- 3 files changed, 58 insertions(+), 8 deletions(-) diff --git a/kde-frameworks/kio/files/kio-5.37.0-tests.patch b/kde-frameworks/kio/files/kio-5.37.0-tests.patch new file mode 100644 index 0000000000..4fdb08fc02 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.37.0-tests.patch @@ -0,0 +1,50 @@ +commit dec4afb4145b1c9ccfe3474e26a86716f597910d +Author: Andreas Sturmlechner +Date: Tue Aug 8 22:33:08 2017 +0200 + + Use ecm_add_test and benefit from BUILD_TESTING awareness + + Reviewers: #frameworks, kfunk + + Reviewed By: kfunk + + Subscribers: kfunk + + Tags: #frameworks + + Differential Revision: https://phabricator.kde.org/D7213 + +diff --git a/src/ioslaves/trash/tests/CMakeLists.txt b/src/ioslaves/trash/tests/CMakeLists.txt +index 7adba49b..514fd79c 100644 +--- a/src/ioslaves/trash/tests/CMakeLists.txt ++++ b/src/ioslaves/trash/tests/CMakeLists.txt +@@ -11,21 +11,16 @@ set(testtrash_SRCS + ${CMAKE_CURRENT_SOURCE_DIR}/../kiotrashdebug.cpp + ) + +-add_executable(testtrash ${testtrash_SRCS}) +-ecm_mark_as_test(testtrash) +-add_test(NAME testtrash COMMAND testtrash) +- +-target_link_libraries(testtrash +- KF5::I18n +- Qt5::DBus +- KF5::KIOCore +- KF5::Solid +- Qt5::Test +-) + if(APPLE) +- target_link_libraries(testtrash "-framework DiskArbitration -framework CoreFoundation") ++ set(testtrash_APPLE_LIBS "-framework DiskArbitration -framework CoreFoundation") + endif(APPLE) +-ecm_mark_nongui_executable(testtrash) ++ ++include(ECMAddTests) ++ ++ecm_add_test(${testtrash_SRCS} ++ TEST_NAME testtrash ++ LINK_LIBRARIES KF5::I18n Qt5::DBus KF5::KIOCore KF5::Solid Qt5::Test ${testtrash_APPLE_LIBS} ++) + + ### next target ### + diff --git a/kde-frameworks/kio/kio-5.37.0.ebuild b/kde-frameworks/kio/kio-5.37.0.ebuild index 5bbe22d834..5f3130eaf9 100644 --- a/kde-frameworks/kio/kio-5.37.0.ebuild +++ b/kde-frameworks/kio/kio-5.37.0.ebuild @@ -3,7 +3,7 @@ EAPI=6 -KDE_TEST="forceoptional-recursive" +KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5 @@ -12,7 +12,7 @@ LICENSE="LGPL-2+" KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="acl +handbook kerberos +kwallet X" -COMMON_DEPEND=" +RDEPEND=" $(add_frameworks_dep karchive) $(add_frameworks_dep kbookmarks) $(add_frameworks_dep kcodecs) @@ -48,7 +48,7 @@ COMMON_DEPEND=" kwallet? ( $(add_frameworks_dep kwallet) ) X? ( $(add_qt_dep qtx11extras) ) " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} $(add_qt_dep qtconcurrent) handbook? ( $(add_frameworks_dep kdoctools) ) test? ( sys-libs/zlib ) @@ -61,7 +61,8 @@ DEPEND="${COMMON_DEPEND} PDEPEND=" $(add_frameworks_dep kded) " -RDEPEND="${COMMON_DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-tests.patch" ) # tests hang RESTRICT+=" test" diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild index 683897a310..2eb7ab56e6 100644 --- a/kde-frameworks/kio/kio-9999.ebuild +++ b/kde-frameworks/kio/kio-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -KDE_TEST="forceoptional-recursive" +KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5 @@ -12,7 +12,7 @@ LICENSE="LGPL-2+" KEYWORDS="" IUSE="acl +handbook kerberos +kwallet X" -COMMON_DEPEND=" +RDEPEND=" $(add_frameworks_dep karchive) $(add_frameworks_dep kbookmarks) $(add_frameworks_dep kcodecs) @@ -48,7 +48,7 @@ COMMON_DEPEND=" kwallet? ( $(add_frameworks_dep kwallet) ) X? ( $(add_qt_dep qtx11extras) ) " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} $(add_qt_dep qtconcurrent) handbook? ( $(add_frameworks_dep kdoctools) ) test? ( sys-libs/zlib ) @@ -61,7 +61,6 @@ DEPEND="${COMMON_DEPEND} PDEPEND=" $(add_frameworks_dep kded) " -RDEPEND="${COMMON_DEPEND}" # tests hang RESTRICT+=" test"