commit: daec723c7d01afb5fcd058e69904cc1dc02ba175 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Wed Jan 21 01:10:18 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=daec723c
[kde-plasma/plasma-desktop] Make tests optional --- .../files/plasma-desktop-9999-tests-optional.patch | 35 ++++++++++++++++++++++ .../plasma-desktop/plasma-desktop-9999.ebuild | 3 ++ 2 files changed, 38 insertions(+) diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-9999-tests-optional.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-9999-tests-optional.patch new file mode 100644 index 0000000..f417286 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-9999-tests-optional.patch @@ -0,0 +1,35 @@ +--- a/CMakeLists.txt 2015-01-21 01:59:46.589187275 +0100 ++++ b/CMakeLists.txt 2015-01-21 02:00:47.260569833 +0100 +@@ -25,7 +25,6 @@ + Widgets + X11Extras + Svg +- Test + Concurrent + ) + +--- a/kcms/lookandfeel/CMakeLists.txt 2015-01-21 01:59:46.643187615 +0100 ++++ b/kcms/lookandfeel/CMakeLists.txt 2015-01-21 02:05:09.909255405 +0100 +@@ -44,6 +44,9 @@ + install(FILES kcm_lookandfeel.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + install(TARGETS kcm_lookandfeel DESTINATION ${PLUGIN_INSTALL_DIR}) + +-add_subdirectory(autotests) ++if(BUILD_TESTING) ++ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) ++ add_subdirectory(autotests) ++endif() + + plasma_install_package(package kcm_lookandfeel kcms kcm_lookandfeel) +--- a/kcms/keyboard/CMakeLists.txt 2015-01-21 01:59:46.629187527 +0100 ++++ b/kcms/keyboard/CMakeLists.txt 2015-01-21 02:08:24.103523804 +0100 +@@ -183,5 +183,7 @@ + + + # Unit tests +- +-add_subdirectory( tests ) ++if(BUILD_TESTING) ++ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) ++ add_subdirectory( tests ) ++endif() diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index 7beb6c2..8a7f22f 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild @@ -5,6 +5,7 @@ EAPI=5 KDE_HANDBOOK="true" +KDE_TEST="true" inherit kde5 DESCRIPTION="KDE Plasma desktop" @@ -104,6 +105,8 @@ DEPEND="${COMMON_DEPEND} fontconfig? ( x11-libs/libXrender ) " +PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package fontconfig Fontconfig)