From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E46DE138A1A for ; Wed, 21 Jan 2015 20:48:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3ED3DE097A; Wed, 21 Jan 2015 20:48:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9CD84E097A for ; Wed, 21 Jan 2015 20:48:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8FA4A3405DB for ; Wed, 21 Jan 2015 20:48:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 245CD1014B for ; Wed, 21 Jan 2015 20:48:20 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1421873263.f3868805653e4f9494f2c64231adc257deaa4342.johu@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-9999-tests-optional.patch kde-frameworks/kio/kio-9999.ebuild X-VCS-Directories: kde-frameworks/kio/ kde-frameworks/kio/files/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: f3868805653e4f9494f2c64231adc257deaa4342 X-VCS-Branch: master Date: Wed, 21 Jan 2015 20:48:20 +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: 6de99cb8-fc47-49a4-b853-f1ef806e2442 X-Archives-Hash: 8df2f81cc7b6f81da26f4464c98b426c commit: f3868805653e4f9494f2c64231adc257deaa4342 Author: Andreas Sturmlechner gmail com> AuthorDate: Tue Jan 20 00:27:17 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Wed Jan 21 20:47:43 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f3868805 [kde-frameworks/kio] Make tests optional --- .../kio/files/kio-9999-tests-optional.patch | 28 ++++++++++++++++++++++ kde-frameworks/kio/kio-9999.ebuild | 7 ++++++ 2 files changed, 35 insertions(+) diff --git a/kde-frameworks/kio/files/kio-9999-tests-optional.patch b/kde-frameworks/kio/files/kio-9999-tests-optional.patch new file mode 100644 index 0000000..ca45d88 --- /dev/null +++ b/kde-frameworks/kio/files/kio-9999-tests-optional.patch @@ -0,0 +1,28 @@ +--- a/CMakeLists.txt 2015-01-21 01:30:56.784894492 +0100 ++++ b/CMakeLists.txt 2015-01-21 01:34:51.192505604 +0100 +@@ -57,7 +57,7 @@ + add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + + set(REQUIRED_QT_VERSION 5.2.0) +-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Network Concurrent Xml Test) ++find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Network Concurrent Xml) + + find_package(GSSAPI) + set_package_properties(GSSAPI PROPERTIES DESCRIPTION "Allows KIO to make use of certain HTTP authentication services" +@@ -85,10 +85,13 @@ + endif() + include(CheckLibraryExists) + add_subdirectory(src) +-add_subdirectory(autotests) + +-if (NOT KIOCORE_ONLY) +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG REQUIRED) ++ add_subdirectory(autotests) ++ if (NOT KIOCORE_ONLY) ++ add_subdirectory(tests) ++ endif() + endif() + + # create a Config.cmake and a ConfigVersion.cmake file and install them diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild index 5de4a75..ace8399 100644 --- a/kde-frameworks/kio/kio-9999.ebuild +++ b/kde-frameworks/kio/kio-9999.ebuild @@ -64,6 +64,13 @@ PDEPEND=" # tests hang RESTRICT="test" +src_prepare() { + # whole patch should be upstreamed, doesn't work in PATCHES + epatch "${FILESDIR}/${PN}-9999-tests-optional.patch" + + kde5_src_prepare +} + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package acl)