1 |
commit: 5874a2728031228dd169c450e763dd2e93cb288d |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 30 22:14:45 2016 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 30 22:15:14 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5874a272 |
7 |
|
8 |
app-accessibility/at-spi2-atk: re-enable unittests |
9 |
|
10 |
Tests were failing due to missing files in upstream tarball, see [1]. |
11 |
Add missing multilib dependency on libxml2 as it is needed to configure. |
12 |
|
13 |
[1] https://bugzilla.gnome.org/show_bug.cgi?id=770615 |
14 |
|
15 |
Package-Manager: portage-2.3.0 |
16 |
|
17 |
.../at-spi2-atk/at-spi2-atk-2.20.1.ebuild | 12 ++-- |
18 |
.../test-collection.xml | 20 +++++++ |
19 |
.../test-document.xml | 7 +++ |
20 |
.../test-editable-text.xml | 9 +++ |
21 |
.../test-hypertext.xml | 6 ++ |
22 |
.../at-spi2-atk-2.20.0-tests-data/test-image.xml | 7 +++ |
23 |
.../test-selection.xml | 16 +++++ |
24 |
.../at-spi2-atk-2.20.0-tests-data/test-table.xml | 70 ++++++++++++++++++++++ |
25 |
.../at-spi2-atk-2.20.0-tests-data/test-text.xml | 9 +++ |
26 |
.../at-spi2-atk-2.20.0-tests-data/test-value.xml | 6 ++ |
27 |
10 files changed, 158 insertions(+), 4 deletions(-) |
28 |
|
29 |
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.20.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.20.1.ebuild |
30 |
index 262acfa..e848c4f 100644 |
31 |
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.20.1.ebuild |
32 |
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.20.1.ebuild |
33 |
@@ -15,9 +15,6 @@ SLOT="2" |
34 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" |
35 |
IUSE="test" |
36 |
|
37 |
-# tests fail on multilib setups |
38 |
-RESTRICT="test" |
39 |
- |
40 |
COMMON_DEPEND=" |
41 |
>=app-accessibility/at-spi2-core-2.17.90[${MULTILIB_USEDEP}] |
42 |
>=dev-libs/atk-2.15.4[${MULTILIB_USEDEP}] |
43 |
@@ -32,13 +29,20 @@ DEPEND="${COMMON_DEPEND} |
44 |
test? ( >=dev-libs/libxml2-2.9.1 ) |
45 |
" |
46 |
|
47 |
+src_prepare() { |
48 |
+ # Upstream forgot to put this in tarball, upstream #770615 |
49 |
+ cp -n "${FILESDIR}"/${PN}-2.20.0-tests-data/*.xml "${S}"/tests/data/ || die |
50 |
+ |
51 |
+ gnome2_src_prepare |
52 |
+} |
53 |
+ |
54 |
multilib_src_configure() { |
55 |
ECONF_SOURCE=${S} \ |
56 |
gnome2_src_configure --enable-p2p $(use_with test tests) |
57 |
} |
58 |
|
59 |
multilib_src_test() { |
60 |
- dbus-run-session -- emake -j1 check |
61 |
+ emake check TESTS_ENVIRONMENT="dbus-run-session" |
62 |
} |
63 |
|
64 |
multilib_src_compile() { gnome2_src_compile; } |
65 |
|
66 |
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-collection.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-collection.xml |
67 |
new file mode 100644 |
68 |
index 00000000..7086ede |
69 |
--- /dev/null |
70 |
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-collection.xml |
71 |
@@ -0,0 +1,20 @@ |
72 |
+<?xml version="1.0" ?> |
73 |
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label"> |
74 |
+ <accessible description="first child" name="obj1" role="alert"> |
75 |
+ <state state_enum="modal"/> |
76 |
+ <state state_enum="multi-line"/> |
77 |
+ </accessible> |
78 |
+ <accessible description="second child" name="obj2" role="animation"> |
79 |
+ <accessible description="first prechild" name="obj2/1" role="arrow"> |
80 |
+ <relation relation_type="2" target_name="obj2"/> |
81 |
+ <state state_enum="modal"/> |
82 |
+ <state state_enum="multi-line"/> |
83 |
+ </accessible> |
84 |
+ <accessible description="second prechild" name="obj2/2" role="canvas"/> |
85 |
+ </accessible> |
86 |
+ <accessible description="third child" name="obj3" role="check box"> |
87 |
+ <state state_enum="modal"/> |
88 |
+ <state state_enum="multi-line"/> |
89 |
+ <accessible description="first prechild" name="obj3/1" role="check menu item"/> |
90 |
+ </accessible> |
91 |
+</accessible> |
92 |
|
93 |
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-document.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-document.xml |
94 |
new file mode 100644 |
95 |
index 00000000..7363a62 |
96 |
--- /dev/null |
97 |
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-document.xml |
98 |
@@ -0,0 +1,7 @@ |
99 |
+<?xml version="1.0" ?> |
100 |
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label"> |
101 |
+ <accessible description="first child" name="test" role="alert"/> |
102 |
+ <accessible_document description="image child" name="my_document" role="text"> |
103 |
+ <document page_numer="7" page_no="2"/> |
104 |
+ </accessible_document> |
105 |
+</accessible> |
106 |
|
107 |
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-editable-text.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-editable-text.xml |
108 |
new file mode 100644 |
109 |
index 00000000..ae8084c2 |
110 |
--- /dev/null |
111 |
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-editable-text.xml |
112 |
@@ -0,0 +1,9 @@ |
113 |
+<?xml version="1.0" ?> |
114 |
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label"> |
115 |
+ <accessible_editable_text description="first child" name="obj0" role="entry"> |
116 |
+ <text_edit_node text="test text"/> |
117 |
+ </accessible_editable_text> |
118 |
+ <accessible_editable_text description="second child" name="obj1" role="entry"> |
119 |
+ <text_edit_node text="second test text"/> |
120 |
+ </accessible_editable_text> |
121 |
+</accessible> |
122 |
|
123 |
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-hypertext.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-hypertext.xml |
124 |
new file mode 100644 |
125 |
index 00000000..1b6be6d |
126 |
--- /dev/null |
127 |
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-hypertext.xml |
128 |
@@ -0,0 +1,6 @@ |
129 |
+<?xml version="1.0" ?> |
130 |
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label"> |
131 |
+ <accessible_hypertext description="first child" name="obj0" role="alert"> |
132 |
+ <hypertext text="This is article about know downhill portals href='dh-zone.com' href='pinkbike.com'" /> |
133 |
+ </accessible_hypertext> |
134 |
+</accessible> |
135 |
|
136 |
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-image.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-image.xml |
137 |
new file mode 100644 |
138 |
index 00000000..b678ac2 |
139 |
--- /dev/null |
140 |
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-image.xml |
141 |
@@ -0,0 +1,7 @@ |
142 |
+<?xml version="1.0" ?> |
143 |
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label"> |
144 |
+ <accessible description="first child" name="obj1" role="alert"/> |
145 |
+ <accessible_image description="image child" name="obj0" role="image"> |
146 |
+ <image image_description="image description" width="100" height="50" x="500" y="50" image_extents="png" image_locale="image_locale"/> |
147 |
+ </accessible_image> |
148 |
+</accessible> |
149 |
|
150 |
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-selection.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-selection.xml |
151 |
new file mode 100644 |
152 |
index 00000000..2fc1733 |
153 |
--- /dev/null |
154 |
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-selection.xml |
155 |
@@ -0,0 +1,16 @@ |
156 |
+<?xml version="1.0" ?> |
157 |
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label"> |
158 |
+ <accessible_selection description="first child" name="obj1" role="alert"> |
159 |
+ <accessible description="first prechild" name="obj2/1" role="arrow"> |
160 |
+ <state state_enum="selected"/> |
161 |
+ </accessible> |
162 |
+ <accessible description="second prechild" name="obj2/2" role="canvas" selected="1"> |
163 |
+ <state state_enum="selected"/> |
164 |
+ </accessible> |
165 |
+ <accessible description="first prechild" name="obj2/1" role="arrow"/> |
166 |
+ <accessible description="second prechild" name="obj2/2" role="canvas"/> |
167 |
+ <accessible description="first prechild" name="obj3/1" role="check menu item"> |
168 |
+ <state state_enum="selected"/> |
169 |
+ </accessible> |
170 |
+ </accessible_selection> |
171 |
+</accessible> |
172 |
|
173 |
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-table.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-table.xml |
174 |
new file mode 100644 |
175 |
index 00000000..9d6cb50 |
176 |
--- /dev/null |
177 |
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-table.xml |
178 |
@@ -0,0 +1,70 @@ |
179 |
+<?xml version="1.0" ?> |
180 |
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label"> |
181 |
+ <accessible_table description="first_child" name="obj0" role="table"> |
182 |
+ <accessible description="table caption" name="caption name" role="caption"/> |
183 |
+ <accessible description="table summary" name="table summary name" role="heading"/> |
184 |
+ <accessible description="first column" name="col1" role="table column header"> |
185 |
+ <accessible description="first column header" name="column 1 header" role="header"/> |
186 |
+ </accessible> |
187 |
+ <accessible description="second column" name="col2" role="table column header"> |
188 |
+ <state state_enum="selected"/> |
189 |
+ <accessible description="second column header" name="column 2 header" role="header"/> |
190 |
+ </accessible> |
191 |
+ <accessible description="third column" name="col3" role="table column header"> |
192 |
+ <accessible description="thrid column header" name="column 3 header" role="header"/> |
193 |
+ </accessible> |
194 |
+ <accessible description="first row" name="row1" role="table row header"> |
195 |
+ <state state_enum="selected"/> |
196 |
+ <accessible description="first row header" name="row 1 header" role="header"/> |
197 |
+ </accessible> |
198 |
+ <accessible description="second row" name="row2" role="table row header"> |
199 |
+ <accessible description="second row header" name="row 2 header" role="header"/> |
200 |
+ </accessible> |
201 |
+ <accessible description="third row" name="row3" role="table row header"> |
202 |
+ <state state_enum="selected"/> |
203 |
+ <accessible description="third row header" name="row 3 header" role="header"/> |
204 |
+ </accessible> |
205 |
+ <accessible description="fourth row" name="row4" role="table row header"> |
206 |
+ <accessible description="fourth row header" name="row 4 header" role="header"/> |
207 |
+ </accessible> |
208 |
+ <accessible_table_cell description="table cell 1" name="cell 0/0" role="table cell"> |
209 |
+ <table_cell cell_x="0" cell_y="0" row_span="2"/> |
210 |
+ </accessible_table_cell> |
211 |
+ <accessible_table_cell description="table cell 5" name="cell 1/0" role="table cell"> |
212 |
+ <table_cell cell_x="1" cell_y="0" column_span="3"/> |
213 |
+ </accessible_table_cell> |
214 |
+ <accessible_table_cell description="table cell 9" name="cell 2/0" role="table cell"> |
215 |
+ <state state_enum="selected"/> |
216 |
+ <table_cell cell_x="2" cell_y="0"/> |
217 |
+ </accessible_table_cell> |
218 |
+ <accessible_table_cell description="table cell 2" name="cell 0/1" role="table cell"> |
219 |
+ <table_cell cell_x="0" cell_y="1"/> |
220 |
+ </accessible_table_cell> |
221 |
+ <accessible_table_cell description="table cell 6" name="cell 1/1" role="table cell"> |
222 |
+ <table_cell cell_x="1" cell_y="1"/> |
223 |
+ </accessible_table_cell> |
224 |
+ <accessible_table_cell description="table cell 10" name="cell 2/1" role="table cell"> |
225 |
+ <table_cell cell_x="2" cell_y="1"/> |
226 |
+ </accessible_table_cell> |
227 |
+ <accessible_table_cell description="table cell 3" name="cell 0/2" role="table cell"> |
228 |
+ <table_cell cell_x="0" cell_y="2"/> |
229 |
+ </accessible_table_cell> |
230 |
+ <accessible_table_cell description="table cell 7" name="cell 1/2" role="table cell"> |
231 |
+ <table_cell cell_x="1" cell_y="2"/> |
232 |
+ </accessible_table_cell> |
233 |
+ <accessible_table_cell description="table cell 11" name="cell 2/2" role="table cell"> |
234 |
+ <table_cell cell_x="2" cell_y="2"/> |
235 |
+ </accessible_table_cell> |
236 |
+ <accessible_table_cell description="table cell 4" name="cell 0/3" role="table cell"> |
237 |
+ <table_cell cell_x="0" cell_y="3"/> |
238 |
+ </accessible_table_cell> |
239 |
+ <accessible_table_cell description="table cell 8" name="cell 1/3" role="table cell"> |
240 |
+ <table_cell cell_x="1" cell_y="3"/> |
241 |
+ </accessible_table_cell> |
242 |
+ <accessible_table_cell description="table cell 12" name="cell 2/3" role="table cell"> |
243 |
+ <table_cell cell_x="2" cell_y="3"/> |
244 |
+ </accessible_table_cell> |
245 |
+ </accessible_table> |
246 |
+</accessible> |
247 |
+ |
248 |
+ |
249 |
|
250 |
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-text.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-text.xml |
251 |
new file mode 100644 |
252 |
index 00000000..ab72522 |
253 |
--- /dev/null |
254 |
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-text.xml |
255 |
@@ -0,0 +1,9 @@ |
256 |
+<?xml version="1.0" ?> |
257 |
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label"> |
258 |
+ <accessible_text description="first child" name="obj0" role="text"> |
259 |
+ <text_node text="text0 it works!." x="100" y="33" width="110" height="30" bold_text="on" underline_text="off"/> |
260 |
+ </accessible_text> |
261 |
+ <accessible_text description="second child" name="obj1" role="text"> |
262 |
+ <text_node text="First sentence./n Second sentence." x="66" y="44" width="550" height="40" bold_text="off" underline_text="off"/> |
263 |
+ </accessible_text> |
264 |
+</accessible> |
265 |
|
266 |
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-value.xml b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-value.xml |
267 |
new file mode 100644 |
268 |
index 00000000..83172d5 |
269 |
--- /dev/null |
270 |
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-value.xml |
271 |
@@ -0,0 +1,6 @@ |
272 |
+<?xml version="1.0" ?> |
273 |
+<accessible description="Root of the accessible tree" name="root_object" role="accelerator label"> |
274 |
+ <accessible_value description="first child" name="obj0" role="alert"> |
275 |
+ <value_node min="1.1" current="2.1" max="3.1" step="0.1"/> |
276 |
+ </accessible_value> |
277 |
+</accessible> |