summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-01-14 22:13:12 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-01-14 22:13:12 +0000
commitd02cbcab038575b203aa9dd379bef3c706eeee16 (patch)
tree7f35637be6251dfa293d3bc12602e0df20756742 /dev-libs/libdbusmenu-qt
parentFixed masking of virtualbox packages (diff)
downloadgentoo-2-d02cbcab038575b203aa9dd379bef3c706eeee16.tar.gz
gentoo-2-d02cbcab038575b203aa9dd379bef3c706eeee16.tar.bz2
gentoo-2-d02cbcab038575b203aa9dd379bef3c706eeee16.zip
Fix tests (bug 315215)
(Portage version: 2.1.9.31/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/libdbusmenu-qt')
-rw-r--r--dev-libs/libdbusmenu-qt/ChangeLog8
-rw-r--r--dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.6.4.ebuild22
2 files changed, 18 insertions, 12 deletions
diff --git a/dev-libs/libdbusmenu-qt/ChangeLog b/dev-libs/libdbusmenu-qt/ChangeLog
index 615cb9df30bd..604a75a8ed62 100644
--- a/dev-libs/libdbusmenu-qt/ChangeLog
+++ b/dev-libs/libdbusmenu-qt/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libdbusmenu-qt
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.13 2010/11/09 15:08:55 tampakrap Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.14 2011/01/14 22:13:12 dilfridge Exp $
+
+ 14 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ libdbusmenu-qt-0.6.4.ebuild:
+ Fix tests (bug 315215)
*libdbusmenu-qt-0.6.4 (09 Nov 2010)
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.6.4.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.6.4.ebuild
index 4090110e1cd0..d6e2b338764b 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.6.4.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.6.4.ebuild,v 1.1 2010/11/09 15:08:55 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.6.4.ebuild,v 1.2 2011/01/14 22:13:12 dilfridge Exp $
EAPI="3"
@@ -19,9 +19,6 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
IUSE="debug"
-# Bug #315215, require X server running
-RESTRICT="test"
-
RDEPEND="
>=x11-libs/qt-core-${QT_DEPEND}:4
>=x11-libs/qt-gui-${QT_DEPEND}:4[dbus]
@@ -42,8 +39,13 @@ src_configure() {
cmake-utils_src_configure
}
-# Still broken
-#src_test() {
-# export maketype="cmake-utils_src_test"
-# virtualmake "$@"
-#}
+src_test() {
+ pushd "${CMAKE_BUILD_DIR}/tests" > /dev/null
+ local ctestargs
+ [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+ export maketype="ctest ${ctestargs}"
+ virtualmake || die "Tests failed."
+
+ popd > /dev/null
+}