DBus Menu

Merge lp:~ted/libdbusmenu/arm-fixaroo into lp:libdbusmenu/13.10

  1. arm-fixaroo
  2. Merge into trunk.13.10
Proposed by Ted Gould
Status: Merged
Approved by: Allan LeSage
Approved revision: 457
Merged at revision: 453
Proposed branch: lp:~ted/libdbusmenu/arm-fixaroo
Merge into: lp:libdbusmenu/13.10
Diff against target: 209 lines (+29/-7)
3 files modified
tests/Makefile.am (+25/-3)
tests/test-glib-proxy-client.c (+3/-3)
tests/test-glib-proxy-server.c (+1/-1)
To merge this branch: bzr merge lp:~ted/libdbusmenu/arm-fixaroo
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
DBus Menu Team Pending
Review via email: mp+171154@code.launchpad.net

Commit message

Increase test timeouts to ensure proper results on slower platforms (ARM)

Description of the change

With this it passes on the porter box... let's see what Jenkins thinks!

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:455
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=raring,flavor=amd64/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=raring,flavor=i386/30

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dbusmenu-ci/30/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:455
http://jenkins.qa.ubuntu.com/job/libdbusmenu-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-amd64-ci/12
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libdbusmenu-ci/8/rebuild

review: Needs Fixing (continuous-integration)
lp:~ted/libdbusmenu/arm-fixaroo updated
456. By Ted Gould

Put the gtk-parser test under dbus-test-runner

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:456
http://jenkins.qa.ubuntu.com/job/libdbusmenu-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-amd64-ci/13
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libdbusmenu-ci/9/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:456
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=raring,flavor=amd64/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=raring,flavor=i386/31

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dbusmenu-ci/31/rebuild

review: Approve (continuous-integration)
lp:~ted/libdbusmenu/arm-fixaroo updated
457. By Ted Gould

Disabling the gtk-parser test as we won't be able to debug it

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:456
http://jenkins.qa.ubuntu.com/job/libdbusmenu-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-amd64-ci/14
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-armhf-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libdbusmenu-ci/10/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:457
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=raring,flavor=amd64/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=raring,flavor=i386/32

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dbusmenu-ci/32/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:456
http://jenkins.qa.ubuntu.com/job/libdbusmenu-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-saucy-armhf-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libdbusmenu-ci/11/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am 2013-06-18 22:28:55 +0000
+++ tests/Makefile.am 2013-06-24 20:27:27 +0000
@@ -28,8 +28,12 @@
28 test-gtk-label \28 test-gtk-label \
29 test-gtk-shortcut \29 test-gtk-shortcut \
30 test-gtk-reorder \30 test-gtk-reorder \
31 test-gtk-remove \31 test-gtk-remove
32 test-gtk-parser-test32# This is failing on Jenkins ARM but no where else that we
33# can get debug output. So we're going to disable it for now
34# as we have unity-gtk-module doing the majority of our GTK
35# menu parsing today.
36# test-gtk-parser-test
33# Not working with GTK3 and a critical grab that is in37# Not working with GTK3 and a critical grab that is in
34# the GTK3 code.38# the GTK3 code.
35# test-gtk-submenu 39# test-gtk-submenu
@@ -155,6 +159,7 @@
155 @echo "#!/bin/bash" > $@159 @echo "#!/bin/bash" > $@
156 @echo export UBUNTU_MENUPROXY="" >> $@160 @echo export UBUNTU_MENUPROXY="" >> $@
157 @echo export G_DEBUG=fatal_criticals >> $@161 @echo export G_DEBUG=fatal_criticals >> $@
162 @echo export G_MESSAGES_DEBUG=all >> $@
158 @echo $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> $@163 @echo $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> $@
159 @chmod +x $@164 @chmod +x $@
160165
@@ -174,6 +179,7 @@
174 @echo "#!/bin/bash" > $@179 @echo "#!/bin/bash" > $@
175 @echo export UBUNTU_MENUPROXY="" >> $@180 @echo export UBUNTU_MENUPROXY="" >> $@
176 @echo export G_DEBUG=fatal_criticals >> $@181 @echo export G_DEBUG=fatal_criticals >> $@
182 @echo export G_MESSAGES_DEBUG=all >> $@
177 @echo $(DBUS_RUNNER) --task ./test-glib-events-client --task-name Client --task ./test-glib-events-server --task-name Server --ignore-return >> $@183 @echo $(DBUS_RUNNER) --task ./test-glib-events-client --task-name Client --task ./test-glib-events-server --task-name Server --ignore-return >> $@
178 @chmod +x $@184 @chmod +x $@
179185
@@ -193,6 +199,7 @@
193 @echo "#!/bin/bash" > $@199 @echo "#!/bin/bash" > $@
194 @echo export UBUNTU_MENUPROXY="" >> $@200 @echo export UBUNTU_MENUPROXY="" >> $@
195 @echo export G_DEBUG=fatal_criticals >> $@201 @echo export G_DEBUG=fatal_criticals >> $@
202 @echo export G_MESSAGES_DEBUG=all >> $@
196 @echo $(DBUS_RUNNER) --task ./test-glib-events-nogroup-client --task-name Client --task ./test-glib-events-server --task-name Server --ignore-return >> $@203 @echo $(DBUS_RUNNER) --task ./test-glib-events-nogroup-client --task-name Client --task ./test-glib-events-server --task-name Server --ignore-return >> $@
197 @chmod +x $@204 @chmod +x $@
198205
@@ -208,6 +215,7 @@
208 @echo "#!/bin/bash" > $@215 @echo "#!/bin/bash" > $@
209 @echo export UBUNTU_MENUPROXY="" >> $@216 @echo export UBUNTU_MENUPROXY="" >> $@
210 @echo export G_DEBUG=fatal_criticals >> $@217 @echo export G_DEBUG=fatal_criticals >> $@
218 @echo export G_MESSAGES_DEBUG=all >> $@
211 @echo $(XVFB_RUN) >> $@219 @echo $(XVFB_RUN) >> $@
212 @echo $(DBUS_RUNNER) --task ./test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter test-json-01.output.json --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@220 @echo $(DBUS_RUNNER) --task ./test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter test-json-01.output.json --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@
213 @echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@221 @echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@
@@ -239,6 +247,7 @@
239 @echo "#!/bin/bash" > $@247 @echo "#!/bin/bash" > $@
240 @echo export UBUNTU_MENUPROXY="" >> $@248 @echo export UBUNTU_MENUPROXY="" >> $@
241 @echo export G_DEBUG=fatal_criticals >> $@249 @echo export G_DEBUG=fatal_criticals >> $@
250 @echo export G_MESSAGES_DEBUG=all >> $@
242 @echo $(XVFB_RUN) >> $@251 @echo $(XVFB_RUN) >> $@
243 @echo $(DBUS_RUNNER) --task $(builddir)/test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter /dev/null --task libtool --parameter --mode=execute --parameter $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@252 @echo $(DBUS_RUNNER) --task $(builddir)/test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter /dev/null --task libtool --parameter --mode=execute --parameter $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@
244 @chmod +x $@253 @chmod +x $@
@@ -258,6 +267,7 @@
258# in the grabbing code on GTK3. Since we can't add events to the stack267# in the grabbing code on GTK3. Since we can't add events to the stack
259# we can't remove this error from getting thrown :-(268# we can't remove this error from getting thrown :-(
260# @echo export G_DEBUG=fatal_criticals >> $@269# @echo export G_DEBUG=fatal_criticals >> $@
270 @echo export G_MESSAGES_DEBUG=all >> $@
261 @echo $(DBUS_RUNNER) --task ./test-glib-submenu-client --task-name Client --task ./test-glib-submenu-server --task-name Server --ignore-return >> $@271 @echo $(DBUS_RUNNER) --task ./test-glib-submenu-client --task-name Client --task ./test-glib-submenu-server --task-name Server --ignore-return >> $@
262 @chmod +x $@272 @chmod +x $@
263273
@@ -279,6 +289,7 @@
279 @echo "#!/bin/bash" > $@289 @echo "#!/bin/bash" > $@
280 @echo export UBUNTU_MENUPROXY="" >> $@290 @echo export UBUNTU_MENUPROXY="" >> $@
281 @echo export G_DEBUG=fatal_criticals >> $@291 @echo export G_DEBUG=fatal_criticals >> $@
292 @echo export G_MESSAGES_DEBUG=all >> $@
282 @echo $(DBUS_RUNNER) --task gtester --task-name test --parameter --verbose --parameter -k --parameter -o --parameter $(OBJECT_XML_REPORT) --parameter ./test-glib-objects >> $@293 @echo $(DBUS_RUNNER) --task gtester --task-name test --parameter --verbose --parameter -k --parameter -o --parameter $(OBJECT_XML_REPORT) --parameter ./test-glib-objects >> $@
283 @chmod +x $@294 @chmod +x $@
284295
@@ -296,6 +307,7 @@
296 @echo "#!/bin/bash" > $@307 @echo "#!/bin/bash" > $@
297 @echo export UBUNTU_MENUPROXY="" >> $@308 @echo export UBUNTU_MENUPROXY="" >> $@
298 @echo export G_DEBUG=fatal_criticals >> $@309 @echo export G_DEBUG=fatal_criticals >> $@
310 @echo export G_MESSAGES_DEBUG=all >> $@
299 @echo $(DBUS_RUNNER) --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return >> $@311 @echo $(DBUS_RUNNER) --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return >> $@
300 @chmod +x $@312 @chmod +x $@
301313
@@ -315,6 +327,7 @@
315 @echo "#!/bin/bash" > $@327 @echo "#!/bin/bash" > $@
316 @echo export UBUNTU_MENUPROXY="" >> $@328 @echo export UBUNTU_MENUPROXY="" >> $@
317 @echo export G_DEBUG=fatal_criticals >> $@329 @echo export G_DEBUG=fatal_criticals >> $@
330 @echo export G_MESSAGES_DEBUG=all >> $@
318 @echo $(DBUS_RUNNER) --task ./test-glib-proxy-client --task-name Client --task ./test-glib-proxy-server --task-name Server --ignore-return \\ >> $@331 @echo $(DBUS_RUNNER) --task ./test-glib-proxy-client --task-name Client --task ./test-glib-proxy-server --task-name Server --ignore-return \\ >> $@
319 @echo --task ./test-glib-proxy-proxy --parameter test.proxy.first_proxy --parameter test.proxy.second_proxy --task-name Proxy01 --ignore-return \\ >> $@332 @echo --task ./test-glib-proxy-proxy --parameter test.proxy.first_proxy --parameter test.proxy.second_proxy --task-name Proxy01 --ignore-return \\ >> $@
320 @echo --task ./test-glib-proxy-proxy --parameter test.proxy.second_proxy --parameter test.proxy.third_proxy --task-name Proxy02 --ignore-return \\ >> $@333 @echo --task ./test-glib-proxy-proxy --parameter test.proxy.second_proxy --parameter test.proxy.third_proxy --task-name Proxy02 --ignore-return \\ >> $@
@@ -368,6 +381,7 @@
368 @echo "#!/bin/bash" > $@381 @echo "#!/bin/bash" > $@
369 @echo export UBUNTU_MENUPROXY="" >> $@382 @echo export UBUNTU_MENUPROXY="" >> $@
370 @echo export G_DEBUG=fatal_criticals >> $@383 @echo export G_DEBUG=fatal_criticals >> $@
384 @echo export G_MESSAGES_DEBUG=all >> $@
371 @echo $(XVFB_RUN) >> $@385 @echo $(XVFB_RUN) >> $@
372 @echo $(DBUS_RUNNER) --task gtester --task-name test --parameter --verbose --parameter -k --parameter -o --parameter $(GTK_OBJECT_XML_REPORT) --parameter ./test-gtk-objects >> $@386 @echo $(DBUS_RUNNER) --task gtester --task-name test --parameter --verbose --parameter -k --parameter -o --parameter $(GTK_OBJECT_XML_REPORT) --parameter ./test-gtk-objects >> $@
373 @chmod +x $@387 @chmod +x $@
@@ -388,8 +402,9 @@
388 @echo "#!/bin/bash" > $@402 @echo "#!/bin/bash" > $@
389 @echo export UBUNTU_MENUPROXY="" >> $@403 @echo export UBUNTU_MENUPROXY="" >> $@
390 @echo export G_DEBUG=fatal_criticals >> $@404 @echo export G_DEBUG=fatal_criticals >> $@
405 @echo export G_MESSAGES_DEBUG=all >> $@
391 @echo $(XVFB_RUN) >> $@406 @echo $(XVFB_RUN) >> $@
392 @echo gtester --verbose -k -o $(GTK_PARSER_XML_REPORT) ./test-gtk-parser >> $@407 @echo $(DBUS_RUNNER) --task gtester --task-name test --parameter --verbose --parameter -k --parameter -o --parameter $(GTK_PARSER_XML_REPORT) --parameter $(builddir)/test-gtk-parser >> $@
393 @chmod +x $@408 @chmod +x $@
394409
395test_gtk_parser_SOURCES = test-gtk-parser.c410test_gtk_parser_SOURCES = test-gtk-parser.c
@@ -406,6 +421,7 @@
406 @echo "#!/bin/bash" > $@421 @echo "#!/bin/bash" > $@
407 @echo export UBUNTU_MENUPROXY="" >> $@422 @echo export UBUNTU_MENUPROXY="" >> $@
408 @echo export G_DEBUG=fatal_criticals >> $@423 @echo export G_DEBUG=fatal_criticals >> $@
424 @echo export G_MESSAGES_DEBUG=all >> $@
409 @echo $(XVFB_RUN) >> $@425 @echo $(XVFB_RUN) >> $@
410 @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> $@426 @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> $@
411 @chmod +x $@427 @chmod +x $@
@@ -426,6 +442,7 @@
426 @echo "#!/bin/bash" > $@442 @echo "#!/bin/bash" > $@
427 @echo export UBUNTU_MENUPROXY="" >> $@443 @echo export UBUNTU_MENUPROXY="" >> $@
428 @echo export G_DEBUG=fatal_criticals >> $@444 @echo export G_DEBUG=fatal_criticals >> $@
445 @echo export G_MESSAGES_DEBUG=all >> $@
429 @echo $(XVFB_RUN) >> $@446 @echo $(XVFB_RUN) >> $@
430 @echo $(DBUS_RUNNER) --task ./test-gtk-shortcut-client --task-name Client --task ./test-gtk-shortcut-server --task-name Server --ignore-return >> $@447 @echo $(DBUS_RUNNER) --task ./test-gtk-shortcut-client --task-name Client --task ./test-gtk-shortcut-server --task-name Server --ignore-return >> $@
431 @chmod +x $@448 @chmod +x $@
@@ -446,6 +463,7 @@
446 @echo "#!/bin/bash" > $@463 @echo "#!/bin/bash" > $@
447 @echo export UBUNTU_MENUPROXY="" >> $@464 @echo export UBUNTU_MENUPROXY="" >> $@
448 @echo export G_DEBUG=fatal_criticals >> $@465 @echo export G_DEBUG=fatal_criticals >> $@
466 @echo export G_MESSAGES_DEBUG=all >> $@
449 @echo $(XVFB_RUN) >> $@467 @echo $(XVFB_RUN) >> $@
450 @echo $(DBUS_RUNNER) --task $(srcdir)/test-gtk-shortcut-client.py --task-name Client --task ./test-gtk-shortcut-server --task-name Server --ignore-return >> $@468 @echo $(DBUS_RUNNER) --task $(srcdir)/test-gtk-shortcut-client.py --task-name Client --task ./test-gtk-shortcut-server --task-name Server --ignore-return >> $@
451 @chmod +x $@469 @chmod +x $@
@@ -461,6 +479,7 @@
461 @echo "#!/bin/bash" > $@479 @echo "#!/bin/bash" > $@
462 @echo export UBUNTU_MENUPROXY="" >> $@480 @echo export UBUNTU_MENUPROXY="" >> $@
463 @echo export G_DEBUG=fatal_criticals >> $@481 @echo export G_DEBUG=fatal_criticals >> $@
482 @echo export G_MESSAGES_DEBUG=all >> $@
464 @echo $(XVFB_RUN) >> $@483 @echo $(XVFB_RUN) >> $@
465 @echo $(DBUS_RUNNER) --task ./test-gtk-remove-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> $@484 @echo $(DBUS_RUNNER) --task ./test-gtk-remove-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> $@
466 @chmod +x $@485 @chmod +x $@
@@ -477,6 +496,7 @@
477 @echo "#!/bin/bash" > $@496 @echo "#!/bin/bash" > $@
478 @echo export UBUNTU_MENUPROXY="" >> $@497 @echo export UBUNTU_MENUPROXY="" >> $@
479 @echo export G_DEBUG=fatal_criticals >> $@498 @echo export G_DEBUG=fatal_criticals >> $@
499 @echo export G_MESSAGES_DEBUG=all >> $@
480 @echo $(XVFB_RUN) >> $@500 @echo $(XVFB_RUN) >> $@
481 @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-reorder-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> $@501 @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-reorder-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> $@
482 @chmod +x $@502 @chmod +x $@
@@ -493,6 +513,7 @@
493 @echo "#!/bin/bash" > $@513 @echo "#!/bin/bash" > $@
494 @echo export UBUNTU_MENUPROXY="" >> $@514 @echo export UBUNTU_MENUPROXY="" >> $@
495 @echo export G_DEBUG=fatal_criticals >> $@515 @echo export G_DEBUG=fatal_criticals >> $@
516 @echo export G_MESSAGES_DEBUG=all >> $@
496 @echo $(XVFB_RUN) >> $@517 @echo $(XVFB_RUN) >> $@
497 @echo $(DBUS_RUNNER) --task ./test-gtk-submenu-client --task-name Client --task ./test-gtk-submenu-server --task-name Server --ignore-return >> $@518 @echo $(DBUS_RUNNER) --task ./test-gtk-submenu-client --task-name Client --task ./test-gtk-submenu-server --task-name Server --ignore-return >> $@
498 @chmod +x $@519 @chmod +x $@
@@ -513,6 +534,7 @@
513 @echo "#!/bin/bash" > $@534 @echo "#!/bin/bash" > $@
514 @echo export UBUNTU_MENUPROXY="" >> $@535 @echo export UBUNTU_MENUPROXY="" >> $@
515 @echo export G_DEBUG=fatal_criticals >> $@536 @echo export G_DEBUG=fatal_criticals >> $@
537 @echo export G_MESSAGES_DEBUG=all >> $@
516 @echo $(XVFB_RUN) >> $@538 @echo $(XVFB_RUN) >> $@
517 @echo cd $(srcdir)/dbusmenu-gtk >> $@539 @echo cd $(srcdir)/dbusmenu-gtk >> $@
518 @echo /usr/lib/at-spi/at-spi-registryd \& >> $@540 @echo /usr/lib/at-spi/at-spi-registryd \& >> $@
519541
=== modified file 'tests/test-glib-proxy-client.c'
--- tests/test-glib-proxy-client.c 2013-01-21 16:04:47 +0000
+++ tests/test-glib-proxy-client.c 2013-06-24 20:27:27 +0000
@@ -123,7 +123,7 @@
123 g_source_remove(verify_timer);123 g_source_remove(verify_timer);
124 }124 }
125125
126 verify_timer = g_timeout_add (3000, layout_verify_timer, client);126 verify_timer = g_timeout_add_seconds (5, layout_verify_timer, client);
127 return;127 return;
128}128}
129129
@@ -143,7 +143,7 @@
143 } else {143 } else {
144 /* Extend our death */144 /* Extend our death */
145 g_source_remove(death_timer);145 g_source_remove(death_timer);
146 death_timer = g_timeout_add_seconds(4, timer_func, data);146 death_timer = g_timeout_add_seconds(10, timer_func, data);
147 }147 }
148148
149 if (layouts[layouton+1].id == -1) {149 if (layouts[layouton+1].id == -1) {
@@ -162,7 +162,7 @@
162 DbusmenuClient * client = dbusmenu_client_new("test.proxy.first_proxy", "/org/test");162 DbusmenuClient * client = dbusmenu_client_new("test.proxy.first_proxy", "/org/test");
163 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);163 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
164164
165 death_timer = g_timeout_add_seconds(4, timer_func, client);165 death_timer = g_timeout_add_seconds(10, timer_func, client);
166166
167 mainloop = g_main_loop_new(NULL, FALSE);167 mainloop = g_main_loop_new(NULL, FALSE);
168 g_main_loop_run(mainloop);168 g_main_loop_run(mainloop);
169169
=== modified file 'tests/test-glib-proxy-server.c'
--- tests/test-glib-proxy-server.c 2013-01-21 16:04:47 +0000
+++ tests/test-glib-proxy-server.c 2013-06-24 20:27:27 +0000
@@ -95,7 +95,7 @@
95 if (death_timer != 0) {95 if (death_timer != 0) {
96 g_source_remove(death_timer);96 g_source_remove(death_timer);
97 }97 }
98 death_timer = g_timeout_add_seconds(4, timer_func, data);98 death_timer = g_timeout_add_seconds(10, timer_func, data);
9999
100 return;100 return;
101}101}

Subscribers

People subscribed via source and target branches

to all changes: