From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-388085-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1R96Tr-0000F8-2N
	for garchives@archives.gentoo.org; Thu, 29 Sep 2011 02:36:11 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 2534521C02B;
	Thu, 29 Sep 2011 02:36:03 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id D620021C02B
	for <gentoo-commits@lists.gentoo.org>; Thu, 29 Sep 2011 02:36:02 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 382D01B401A
	for <gentoo-commits@lists.gentoo.org>; Thu, 29 Sep 2011 02:36:02 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 8E55480042
	for <gentoo-commits@lists.gentoo.org>; Thu, 29 Sep 2011 02:36:01 +0000 (UTC)
From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" <tetromino@gmail.com>
Message-ID: <d49fe2573fb89f1ea80864edcdc5aff64efd3107.tetromino@gentoo>
Subject: [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/
X-VCS-Repository: proj/gnome
X-VCS-Files: dev-libs/glib/glib-9999.ebuild
X-VCS-Directories: dev-libs/glib/
X-VCS-Committer: tetromino
X-VCS-Committer-Name: Alexandre Restovtsev
X-VCS-Revision: d49fe2573fb89f1ea80864edcdc5aff64efd3107
Date: Thu, 29 Sep 2011 02:36:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: 6dfe4b41ff4d04b2a77ecf88ba91b2fe

commit:     d49fe2573fb89f1ea80864edcdc5aff64efd3107
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep 28 23:44:00 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Sep 29 02:19:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D=
commit;h=3Dd49fe257

dev-libs/glib: fix tests (bug #384853)

Require python-2 to run tests, and disable tests that need pygobject and
dbus-python to prevent circular dependencies. Fixes bug #384853.

Also, hard disable the /gdbus/connection/life-cycle test, since it fails
around 1/3 of the time I try to run it.

---
 dev-libs/glib/glib-9999.ebuild |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebu=
ild
index fcd1a7e..46f0e9d 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=3D"4"
=20
 inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-uti=
ls virtualx
+# Do not inherit python.eclass to avoid python runtime dependency; #3775=
49
 if [[ ${PV} =3D 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -37,6 +38,7 @@ DEPEND=3D"${RDEPEND}
 		~app-text/docbook-xml-dtd-4.1.2 )
 	systemtap? ( >=3Ddev-util/systemtap-1.3 )
 	test? (
+		=3Ddev-lang/python-2*
 		>=3Ddev-util/gdbus-codegen-2.30.0
 		>=3Dsys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2"
@@ -84,6 +86,27 @@ src_prepare() {
 			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.=
c || die
 			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.=
c || die
 		fi
+
+		# Disable flaky gdbus/connection/life-cycle test; bug #384853
+		sed -i -e "/connection\/life-cycle/d" gio/tests/gdbus-connection.c || =
die
+
+		# Disable tests requiring dbus-python and pygobject; bugs #349236, #37=
7549, #384853
+		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/p=
ygobject:2' ; then
+			ewarn "Some tests will be skipped due to dev-python/dbus-python or de=
v-python/pygobject:2"
+			ewarn "not being present on your system, think on installing them to =
get these tests run."
+			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
+			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-s=
low.c || die
+			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
+			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-wel=
l-known-name.c || die
+			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspect=
ion.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
+			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threadin=
g.c || die
+			# needed to prevent gdbus-threading from asserting
+			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
+		else
+			# use python2 for the test server
+			sed -i -e 's:/usr/bin/env python$:/usr/bin/env python2:' gio/tests/gd=
bus-testserver.py || die
+		fi
 	fi
=20
 	# gdbus-codegen is a separate package
@@ -92,6 +115,9 @@ src_prepare() {
 	# disable pyc compiling
 	ln -sfn $(type -P true) py-compile
=20
+	# python2 needed for gtester-report
+	sed -e 's:/usr/bin/env python$:/usr/bin/env python2:' -i glib/gtester-r=
eport || die
+
 	# Needed for the punt-python-check patch, disabling timeout test
 	# Also needed to prevent croscompile failures, see bug #267603
 	# Also needed for the no-gdbus-codegen patch