1 |
leonardop 07/09/18 11:27:25 |
2 |
|
3 |
Added: at-spi-1.18.1-tests.patch |
4 |
Log: |
5 |
Added patch to fix tests (bug #188036) |
6 |
(Portage version: 2.1.3.9) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 gnome-extra/at-spi/files/at-spi-1.18.1-tests.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/at-spi/files/at-spi-1.18.1-tests.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/at-spi/files/at-spi-1.18.1-tests.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: at-spi-1.18.1-tests.patch |
15 |
=================================================================== |
16 |
diff -NurdpB at-spi-1.18.1/atk-bridge/bridge.c at-spi-1.18.1-patched/atk-bridge/bridge.c |
17 |
--- at-spi-1.18.1/atk-bridge/bridge.c 2007-04-09 02:34:37.000000000 -0500 |
18 |
+++ at-spi-1.18.1-patched/atk-bridge/bridge.c 2007-09-18 05:08:39.000000000 -0500 |
19 |
@@ -430,10 +430,23 @@ spi_atk_bridge_get_registry (void) |
20 |
|
21 |
if (ev._major != CORBA_NO_EXCEPTION) |
22 |
{ |
23 |
+ gchar *err_desc = NULL; |
24 |
+ const CORBA_char *id = CORBA_exception_id (&ev); |
25 |
+ |
26 |
+ if (strcmp(id, "IDL:Bonobo/GeneralError:1.0") == 0) |
27 |
+ { |
28 |
+ Bonobo_GeneralError* ge = CORBA_exception_value (&ev); |
29 |
+ err_desc = g_strdup_printf ("bonobo activation problem: %s", |
30 |
+ ge->description); |
31 |
+ } |
32 |
+ |
33 |
g_error ("Accessibility app error: exception during " |
34 |
- "registry activation from id: %s\n", |
35 |
- CORBA_exception_id (&ev)); |
36 |
+ "registry activation from id: %s\n" |
37 |
+ "Error description: %s\n", id, err_desc == NULL ? "-" : err_desc); |
38 |
+ |
39 |
CORBA_exception_free (&ev); |
40 |
+ if (err_desc != NULL) |
41 |
+ g_free (err_desc); |
42 |
} |
43 |
|
44 |
if (registry_died && registry) { |
45 |
diff -NurdpB at-spi-1.18.1/test/Makefile.am at-spi-1.18.1-patched/test/Makefile.am |
46 |
--- at-spi-1.18.1/test/Makefile.am 2007-04-09 01:37:04.000000000 -0500 |
47 |
+++ at-spi-1.18.1-patched/test/Makefile.am 2007-09-18 04:45:04.000000000 -0500 |
48 |
@@ -39,9 +39,8 @@ INCLUDES = -I$(top_srcdir) \ |
49 |
|
50 |
LDADD = ../libspi/libspi.la ../cspi/libcspi.la ../login-helper/libloginhelper.la $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS) |
51 |
|
52 |
-TESTS = test-simple |
53 |
+TESTS = run-tests |
54 |
|
55 |
TESTS_ENVIRONMENT = \ |
56 |
- LD_LIBRARY_PATH=$(top_builddir)/libspi/.libs/:$(top_builddir)/cspi/.libs/ \ |
57 |
- PATH=$(top_builddir)/registryd/.libs |
58 |
+ REGISTRYD=$(top_builddir)/registryd/at-spi-registryd /bin/sh |
59 |
|
60 |
diff -NurdpB at-spi-1.18.1/test/run-tests at-spi-1.18.1-patched/test/run-tests |
61 |
--- at-spi-1.18.1/test/run-tests 1969-12-31 19:00:00.000000000 -0500 |
62 |
+++ at-spi-1.18.1-patched/test/run-tests 2007-09-18 05:56:32.000000000 -0500 |
63 |
@@ -0,0 +1,18 @@ |
64 |
+#! /bin/sh |
65 |
+ |
66 |
+../libtool --mode=execute $REGISTRYD & |
67 |
+regd_pid=$! |
68 |
+ |
69 |
+while true; do |
70 |
+ sleep 1 |
71 |
+ q=`bonobo-activation-run-query "has(repo_ids, 'IDL:Accessibility/Registry:1.0') && _active"` |
72 |
+ echo $q | fgrep -q 'number of results: 0' || break |
73 |
+done |
74 |
+ |
75 |
+./test-simple |
76 |
+exit_code=$? |
77 |
+ |
78 |
+kill $regd_pid |
79 |
+wait $regd_pid |
80 |
+ |
81 |
+exit $exit_code |
82 |
diff -NurdpB at-spi-1.18.1/test/test-simple.c at-spi-1.18.1-patched/test/test-simple.c |
83 |
--- at-spi-1.18.1/test/test-simple.c 2007-04-09 01:37:04.000000000 -0500 |
84 |
+++ at-spi-1.18.1-patched/test/test-simple.c 2007-09-18 05:08:39.000000000 -0500 |
85 |
@@ -714,7 +714,7 @@ test_keylisteners (void) |
86 |
key_listener = SPI_createAccessibleKeystrokeListener ( |
87 |
key_listener_cb, &stroke); |
88 |
|
89 |
- test_keyset = SPI_createAccessibleKeySet (1, "=", NULL, NULL); |
90 |
+ test_keyset = SPI_createAccessibleKeySet (1, "t", NULL, NULL); |
91 |
|
92 |
g_assert (SPI_registerAccessibleKeystrokeListener ( |
93 |
key_listener, |
94 |
@@ -725,11 +725,11 @@ test_keylisteners (void) |
95 |
|
96 |
for (i = 0; i < 3; i++) { |
97 |
memset (&stroke, 0, sizeof (AccessibleKeystroke)); |
98 |
- g_assert (SPI_generateKeyboardEvent ('=', NULL, SPI_KEY_SYM)); |
99 |
+ g_assert (SPI_generateKeyboardEvent ('t', NULL, SPI_KEY_SYM)); |
100 |
while (!(key_press_received)) |
101 |
g_main_context_iteration (NULL, TRUE); |
102 |
fprintf (stderr, "p [%s]", stroke.keystring); |
103 |
- g_assert (!strcmp (stroke.keystring, "=")); |
104 |
+ g_assert (!strcmp (stroke.keystring, "t")); |
105 |
while (!(key_release_received)) |
106 |
g_main_context_iteration (NULL, TRUE); |
107 |
fprintf (stderr, "r [%s]", stroke.keystring); |
108 |
|
109 |
|
110 |
|
111 |
-- |
112 |
gentoo-commits@g.o mailing list |