commit: f3868805653e4f9494f2c64231adc257deaa4342 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Tue Jan 20 00:27:17 2015 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> 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)