[gentoo-commits] repo/gentoo:master commit in: kde-apps/kcontacts/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kcontacts/

[Andreas Sturmlechner]

commit:     c7e9d311bc03c7a2b319ffa327a5f50a37b4f269
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 13:18:04 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 13:20:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7e9d311

kde-apps/kcontacts: Fix tests

Thanks-to: Jonathan Lovelace <kingjon3377 <AT> gmail.com>
Gentoo-bug: 608560

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 kde-apps/kcontacts/kcontacts-17.04.2.ebuild | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kde-apps/kcontacts/kcontacts-17.04.2.ebuild b/kde-apps/kcontacts/kcontacts-17.04.2.ebuild
index 6cbb84171ef..b0fcdf5759c 100644
--- a/kde-apps/kcontacts/kcontacts-17.04.2.ebuild
+++ b/kde-apps/kcontacts/kcontacts-17.04.2.ebuild
@@ -32,3 +32,9 @@ src_prepare() {
 		-e "/ecm_add_tests/ s/picturetest\.cpp //" \
 		autotests/CMakeLists.txt || die
 }
+
+src_test() {
+	mkdir -p "${HOME}/.local/share/kf5/kcontacts" || die
+	cp "${S}/src/countrytransl.map" "${HOME}/.local/share/kf5/kcontacts/" || die
+	kde5_src_test
+}

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kcontacts/

[Andreas Sturmlechner]

commit:     679104be66f340f91900edb9d13c007833101f43
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 15 17:19:00 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 15 17:46:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=679104be

kde-apps/kcontacts: Disable failing kcontacts-addresstest

Upstream commit f306867fc6f76220eeab939d548e917ac3b17bd7

Closes: https://bugs.gentoo.org/625988
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/kcontacts/kcontacts-18.08.3.ebuild | 13 ++++---------
 kde-apps/kcontacts/kcontacts-18.12.0.ebuild | 15 ++++-----------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/kde-apps/kcontacts/kcontacts-18.08.3.ebuild b/kde-apps/kcontacts/kcontacts-18.08.3.ebuild
index f12bd1a008f..7c758a9e8b6 100644
--- a/kde-apps/kcontacts/kcontacts-18.08.3.ebuild
+++ b/kde-apps/kcontacts/kcontacts-18.08.3.ebuild
@@ -23,17 +23,12 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 "
 
-src_prepare() {
-	kde5_src_prepare
-
-	# FIXME: Fails test because access to /dev/dri/card0 is denied
-	sed -i \
-		-e "/ecm_add_tests/ s/picturetest\.cpp //" \
-		autotests/CMakeLists.txt || die
-}
-
 src_test() {
 	mkdir -p "${HOME}/.local/share/kf5/kcontacts" || die
 	cp "${S}/src/countrytransl.map" "${HOME}/.local/share/kf5/kcontacts/" || die
+	# bug #566648 (access to /dev/dri/card0 denied)
+	local myctestargs=(
+		-E "(kcontacts-picturetest)"
+	)
 	kde5_src_test
 }

diff --git a/kde-apps/kcontacts/kcontacts-18.12.0.ebuild b/kde-apps/kcontacts/kcontacts-18.12.0.ebuild
index 43629f6fffa..4a670d9b6da 100644
--- a/kde-apps/kcontacts/kcontacts-18.12.0.ebuild
+++ b/kde-apps/kcontacts/kcontacts-18.12.0.ebuild
@@ -23,17 +23,10 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 "
 
-src_prepare() {
-	kde5_src_prepare
-
-	# FIXME: Fails test because access to /dev/dri/card0 is denied
-	sed -i \
-		-e "/ecm_add_tests/ s/picturetest\.cpp //" \
-		autotests/CMakeLists.txt || die
-}
-
 src_test() {
-	mkdir -p "${HOME}/.local/share/kf5/kcontacts" || die
-	cp "${S}/src/countrytransl.map" "${HOME}/.local/share/kf5/kcontacts/" || die
+	# bug #566648 (access to /dev/dri/card0 denied), bug #625988
+	local myctestargs=(
+		-E "(kcontacts-addresstest|kcontacts-picturetest)"
+	)
 	kde5_src_test
 }