From: Carsten Lohrke Date: Sun, 15 Apr 2007 22:48:47 +0000 (+0000) Subject: Care for some tests. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=73ceb356e09a6a7a4dc270ed2344728676834c70;p=gentoo.git Care for some tests. Package-Manager: portage-2.1.2.3 --- diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 0d429b46113b..3f78e7a46abd 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.351 2007/04/14 16:20:33 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.352 2007/04/15 22:48:47 carlo Exp $ + + 15 Apr 2007; Carsten Lohrke kdebase-3.5.6-r1.ebuild: + Care for some tests. 14 Apr 2007; Carsten Lohrke kdebase-3.5.6-r1.ebuild: Fix bug #156758. diff --git a/kde-base/kdebase/kdebase-3.5.6-r1.ebuild b/kde-base/kdebase/kdebase-3.5.6-r1.ebuild index 4ea5cb3e8752..c9aaccb57b41 100644 --- a/kde-base/kdebase/kdebase-3.5.6-r1.ebuild +++ b/kde-base/kdebase/kdebase-3.5.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.6-r1.ebuild,v 1.4 2007/04/14 16:20:33 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.6-r1.ebuild,v 1.5 2007/04/15 22:48:47 carlo Exp $ inherit kde-dist eutils flag-o-matic @@ -92,6 +92,14 @@ src_unpack() { sed -i -e "s:TESTS =.*:TESTS =:" ${S}/kioslave/smtp/Makefile.am || die "sed failed" sed -i -e "s:TESTS =.*:TESTS =:" ${S}/kioslave/trash/Makefile.am || die "sed failed" sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" ${S}/nsplugins/Makefile.am || die "sed failed" + + if ! [[ $(xhost >> /dev/null 2>/dev/null) ]] ; then + einfo "User ${USER} has no X access, disabling some tests." + for ioslave in media remote home system ; do + sed -e "s:check\: test${ioslave}::" -e "s:./test${ioslave}::" \ + -i kioslave/${ioslave}/Makefile.am || die "sed failed" + done + fi } src_compile() {