| 1 |
commit: 20caf700d502f20281c3d067f7c2fd8d3a143391 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 8 22:44:21 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 8 22:44:21 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=20caf700 |
| 7 |
|
| 8 |
kde-frameworks/kio: Switch KDE_TEST back to forceoptional |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
kde-frameworks/kio/files/kio-5.37.0-tests.patch | 50 +++++++++++++++++++++++++ |
| 13 |
kde-frameworks/kio/kio-5.37.0.ebuild | 9 +++-- |
| 14 |
kde-frameworks/kio/kio-9999.ebuild | 7 ++-- |
| 15 |
3 files changed, 58 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-frameworks/kio/files/kio-5.37.0-tests.patch b/kde-frameworks/kio/files/kio-5.37.0-tests.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000000..4fdb08fc02 |
| 20 |
--- /dev/null |
| 21 |
+++ b/kde-frameworks/kio/files/kio-5.37.0-tests.patch |
| 22 |
@@ -0,0 +1,50 @@ |
| 23 |
+commit dec4afb4145b1c9ccfe3474e26a86716f597910d |
| 24 |
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 25 |
+Date: Tue Aug 8 22:33:08 2017 +0200 |
| 26 |
+ |
| 27 |
+ Use ecm_add_test and benefit from BUILD_TESTING awareness |
| 28 |
+ |
| 29 |
+ Reviewers: #frameworks, kfunk |
| 30 |
+ |
| 31 |
+ Reviewed By: kfunk |
| 32 |
+ |
| 33 |
+ Subscribers: kfunk |
| 34 |
+ |
| 35 |
+ Tags: #frameworks |
| 36 |
+ |
| 37 |
+ Differential Revision: https://phabricator.kde.org/D7213 |
| 38 |
+ |
| 39 |
+diff --git a/src/ioslaves/trash/tests/CMakeLists.txt b/src/ioslaves/trash/tests/CMakeLists.txt |
| 40 |
+index 7adba49b..514fd79c 100644 |
| 41 |
+--- a/src/ioslaves/trash/tests/CMakeLists.txt |
| 42 |
++++ b/src/ioslaves/trash/tests/CMakeLists.txt |
| 43 |
+@@ -11,21 +11,16 @@ set(testtrash_SRCS |
| 44 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/../kiotrashdebug.cpp |
| 45 |
+ ) |
| 46 |
+ |
| 47 |
+-add_executable(testtrash ${testtrash_SRCS}) |
| 48 |
+-ecm_mark_as_test(testtrash) |
| 49 |
+-add_test(NAME testtrash COMMAND testtrash) |
| 50 |
+- |
| 51 |
+-target_link_libraries(testtrash |
| 52 |
+- KF5::I18n |
| 53 |
+- Qt5::DBus |
| 54 |
+- KF5::KIOCore |
| 55 |
+- KF5::Solid |
| 56 |
+- Qt5::Test |
| 57 |
+-) |
| 58 |
+ if(APPLE) |
| 59 |
+- target_link_libraries(testtrash "-framework DiskArbitration -framework CoreFoundation") |
| 60 |
++ set(testtrash_APPLE_LIBS "-framework DiskArbitration -framework CoreFoundation") |
| 61 |
+ endif(APPLE) |
| 62 |
+-ecm_mark_nongui_executable(testtrash) |
| 63 |
++ |
| 64 |
++include(ECMAddTests) |
| 65 |
++ |
| 66 |
++ecm_add_test(${testtrash_SRCS} |
| 67 |
++ TEST_NAME testtrash |
| 68 |
++ LINK_LIBRARIES KF5::I18n Qt5::DBus KF5::KIOCore KF5::Solid Qt5::Test ${testtrash_APPLE_LIBS} |
| 69 |
++) |
| 70 |
+ |
| 71 |
+ ### next target ### |
| 72 |
+ |
| 73 |
|
| 74 |
diff --git a/kde-frameworks/kio/kio-5.37.0.ebuild b/kde-frameworks/kio/kio-5.37.0.ebuild |
| 75 |
index 5bbe22d834..5f3130eaf9 100644 |
| 76 |
--- a/kde-frameworks/kio/kio-5.37.0.ebuild |
| 77 |
+++ b/kde-frameworks/kio/kio-5.37.0.ebuild |
| 78 |
@@ -3,7 +3,7 @@ |
| 79 |
|
| 80 |
EAPI=6 |
| 81 |
|
| 82 |
-KDE_TEST="forceoptional-recursive" |
| 83 |
+KDE_TEST="forceoptional" |
| 84 |
VIRTUALX_REQUIRED="test" |
| 85 |
inherit kde5 |
| 86 |
|
| 87 |
@@ -12,7 +12,7 @@ LICENSE="LGPL-2+" |
| 88 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 89 |
IUSE="acl +handbook kerberos +kwallet X" |
| 90 |
|
| 91 |
-COMMON_DEPEND=" |
| 92 |
+RDEPEND=" |
| 93 |
$(add_frameworks_dep karchive) |
| 94 |
$(add_frameworks_dep kbookmarks) |
| 95 |
$(add_frameworks_dep kcodecs) |
| 96 |
@@ -48,7 +48,7 @@ COMMON_DEPEND=" |
| 97 |
kwallet? ( $(add_frameworks_dep kwallet) ) |
| 98 |
X? ( $(add_qt_dep qtx11extras) ) |
| 99 |
" |
| 100 |
-DEPEND="${COMMON_DEPEND} |
| 101 |
+DEPEND="${RDEPEND} |
| 102 |
$(add_qt_dep qtconcurrent) |
| 103 |
handbook? ( $(add_frameworks_dep kdoctools) ) |
| 104 |
test? ( sys-libs/zlib ) |
| 105 |
@@ -61,7 +61,8 @@ DEPEND="${COMMON_DEPEND} |
| 106 |
PDEPEND=" |
| 107 |
$(add_frameworks_dep kded) |
| 108 |
" |
| 109 |
-RDEPEND="${COMMON_DEPEND}" |
| 110 |
+ |
| 111 |
+PATCHES=( "${FILESDIR}/${P}-tests.patch" ) |
| 112 |
|
| 113 |
# tests hang |
| 114 |
RESTRICT+=" test" |
| 115 |
|
| 116 |
diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild |
| 117 |
index 683897a310..2eb7ab56e6 100644 |
| 118 |
--- a/kde-frameworks/kio/kio-9999.ebuild |
| 119 |
+++ b/kde-frameworks/kio/kio-9999.ebuild |
| 120 |
@@ -3,7 +3,7 @@ |
| 121 |
|
| 122 |
EAPI=6 |
| 123 |
|
| 124 |
-KDE_TEST="forceoptional-recursive" |
| 125 |
+KDE_TEST="forceoptional" |
| 126 |
VIRTUALX_REQUIRED="test" |
| 127 |
inherit kde5 |
| 128 |
|
| 129 |
@@ -12,7 +12,7 @@ LICENSE="LGPL-2+" |
| 130 |
KEYWORDS="" |
| 131 |
IUSE="acl +handbook kerberos +kwallet X" |
| 132 |
|
| 133 |
-COMMON_DEPEND=" |
| 134 |
+RDEPEND=" |
| 135 |
$(add_frameworks_dep karchive) |
| 136 |
$(add_frameworks_dep kbookmarks) |
| 137 |
$(add_frameworks_dep kcodecs) |
| 138 |
@@ -48,7 +48,7 @@ COMMON_DEPEND=" |
| 139 |
kwallet? ( $(add_frameworks_dep kwallet) ) |
| 140 |
X? ( $(add_qt_dep qtx11extras) ) |
| 141 |
" |
| 142 |
-DEPEND="${COMMON_DEPEND} |
| 143 |
+DEPEND="${RDEPEND} |
| 144 |
$(add_qt_dep qtconcurrent) |
| 145 |
handbook? ( $(add_frameworks_dep kdoctools) ) |
| 146 |
test? ( sys-libs/zlib ) |
| 147 |
@@ -61,7 +61,6 @@ DEPEND="${COMMON_DEPEND} |
| 148 |
PDEPEND=" |
| 149 |
$(add_frameworks_dep kded) |
| 150 |
" |
| 151 |
-RDEPEND="${COMMON_DEPEND}" |
| 152 |
|
| 153 |
# tests hang |
| 154 |
RESTRICT+=" test" |
Archives