Fix test suite (bug #552346).

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

6 files changed, 69 insertions, 5 deletions

diff --git a/app-accessibility/at-spi2-atk/ChangeLog b/app-accessibility/at-spi2-atk/ChangeLog
index ca1bc63f38d2..2778f5e4d7f1 100644
--- a/app-accessibility/at-spi2-atk/ChangeLog
+++ b/app-accessibility/at-spi2-atk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/at-spi2-atk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.74 2015/06/18 04:29:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.75 2015/06/18 05:29:21 tetromino Exp $
+
+  18 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  at-spi2-atk-2.16.0-r1.ebuild, +files/at-spi2-atk-2.16.0-tests-data/test.xml,
+  +files/at-spi2-atk-2.16.0-tests-data/test-accessible.xml,
+  +files/at-spi2-atk-2.16.0-tests-data/test-action.xml,
+  +files/at-spi2-atk-2.16.0-tests-data/test-component.xml:
+  Fix test suite (bug #552346).
 
 *at-spi2-atk-2.16.0-r1 (18 Jun 2015)
 
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
index b87fc74b2d31..128b8d68237d 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild,v 1.1 2015/06/18 04:29:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild,v 1.2 2015/06/18 05:29:21 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2 multilib-minimal virtualx
+inherit autotools eutils gnome2 multilib-minimal
 
 DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
 HOMEPAGE="http://live.gnome.org/Accessibility"
@@ -42,6 +42,8 @@ src_prepare() {
 	# Upstream forgot to put this in tarball :/
 	# https://bugzilla.gnome.org/show_bug.cgi?id=751138
 	cp -n "${FILESDIR}"/${PN}-2.16.0-atk_suite.h tests/atk_suite.h || die
+	mkdir tests/data/ || die
+	cp -n "${FILESDIR}"/${PN}-2.16.0-tests-data/*.xml tests/data/ || die
 
 	eautoreconf
 	gnome2_src_prepare
@@ -53,9 +55,8 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
-	# droute test requires session bus; ignore it
 	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
+	dbus-run-session -- emake check
 }
 
 multilib_src_compile() { gnome2_src_compile; }
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-tests-data/test-accessible.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-tests-data/test-accessible.xml
new file mode 100644
index 000000000000..26728ddfd6f2
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-tests-data/test-accessible.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label">
+	<accessible description="first child" name="obj1" role="alert">
+		<state state_enum="modal"/>
+		<state state_enum="multi-line"/>
+	</accessible>
+	<accessible description="second child" name="obj2" role="animation">
+		<accessible description="first prechild" name="obj2/1" role="arrow">
+			<relation relation_type="2" target_name="obj2"/>
+		</accessible>
+		<accessible description="second prechild" name="obj2/2" role="canvas"/>
+	</accessible>
+	<accessible description="third child" name="obj3" role="check box">
+		<accessible description="first prechild" name="obj3/1" role="check menu item"/>
+	</accessible>
+</accessible>
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-tests-data/test-action.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-tests-data/test-action.xml
new file mode 100644
index 000000000000..41ddf00760e3
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-tests-data/test-action.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label">
+	<accessible description="first child" name="obj1" role="alert"/>
+	<accessible_action description="second child" name="obj2" role="application">
+		<action action_name="action1" action_description="action1 description" key_binding="action1 key binding"/>
+		<action action_name="action2" action_description="action2 description" key_binding="action2 key binding"/>
+	</accessible_action>
+	<accessible_action description="third child" name="obj3" role="push button">
+		<action action_name="action1" action_description="action1 description" key_binding="action1 key binding"/>
+	</accessible_action>
+</accessible>
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-tests-data/test-component.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-tests-data/test-component.xml
new file mode 100644
index 000000000000..80929b0cf7a0
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-tests-data/test-component.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label">
+	<accessible_component description="second child" name="obj2" role="application">
+		<component x="350" y="200" width="0" height="0" layer="2" zorder="1" alpha="1.5"/>
+	</accessible_component>
+	<accessible_component description="third child" name="obj3" role="push button">
+		<component x="250" y="250" width="350" height="200" layer="3" zorder="2" alpha="2.5"/>
+		<accessible_component description="third child a" name="aobj3" role="push button">
+			<component x="250" y="250" width="350" height="200" layer="4" zorder="3" alpha="3.5"/>
+		</accessible_component>
+	</accessible_component>
+	<accessible description="second child" name="obj2" role="application" />
+</accessible>
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-tests-data/test.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-tests-data/test.xml
new file mode 100644
index 000000000000..26728ddfd6f2
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-tests-data/test.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label">
+	<accessible description="first child" name="obj1" role="alert">
+		<state state_enum="modal"/>
+		<state state_enum="multi-line"/>
+	</accessible>
+	<accessible description="second child" name="obj2" role="animation">
+		<accessible description="first prechild" name="obj2/1" role="arrow">
+			<relation relation_type="2" target_name="obj2"/>
+		</accessible>
+		<accessible description="second prechild" name="obj2/2" role="canvas"/>
+	</accessible>
+	<accessible description="third child" name="obj3" role="check box">
+		<accessible description="first prechild" name="obj3/1" role="check menu item"/>
+	</accessible>
+</accessible>