Merge lp:~cyphermox/libappindicator/fix-test-merge into lp:libappindicator/13.04
- fix-test-merge
- Merge into trunk.13.04
Status: | Merged |
---|---|
Merged at revision: | 248 |
Proposed branch: | lp:~cyphermox/libappindicator/fix-test-merge |
Merge into: | lp:libappindicator/13.04 |
Diff against target: |
624 lines (+70/-273) 14 files modified
autogen.sh (+1/-0) configure.ac (+1/-1) debian/changelog (+8/-9) debian/rules (+9/-3) docs/reference/Makefile.am (+10/-12) docs/reference/tmpl/libappindicator-unused.sgml (+0/-42) gtk-doc.local.make (+0/-194) tests/Makefile.am (+9/-1) tests/test-libappindicator-dbus-client.c (+0/-2) tests/test-libappindicator-fallback-item.c (+1/-1) tests/test-libappindicator-fallback-watcher.c (+2/-3) tests/test-libappindicator-status-client.c (+1/-3) tests/test-libappindicator.c (+28/-0) tests/test-simple-app.c (+0/-2) |
To merge this branch: | bzr merge lp:~cyphermox/libappindicator/fix-test-merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Indicator Applet Developers | Pending | ||
Review via email: mp+144551@code.launchpad.net |
Commit message
Description of the change
Merging lp;~mathieu-
PS Jenkins bot (ps-jenkins) wrote : | # |
- 249. By Mathieu Trudel-Lapierre
-
Increase dbus-test-runner timeout to 5 minutes to give tests enough time to start up and run on buildds, especially on slow architectures.
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:249
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:249
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
Preview Diff
1 | === modified file 'autogen.sh' |
2 | --- autogen.sh 2010-12-02 20:37:25 +0000 |
3 | +++ autogen.sh 2013-01-23 19:18:20 +0000 |
4 | @@ -7,6 +7,7 @@ |
5 | exit 1 |
6 | } |
7 | |
8 | +gtkdocize || exit 1 |
9 | USE_GNOME2_MACROS=1 \ |
10 | USE_COMMON_DOC_BUILD=yes \ |
11 | gnome-autogen.sh --enable-gtk-doc $@ |
12 | |
13 | === modified file 'configure.ac' |
14 | --- configure.ac 2012-07-11 19:19:21 +0000 |
15 | +++ configure.ac 2013-01-23 19:18:20 +0000 |
16 | @@ -33,7 +33,7 @@ |
17 | # GTK Doc |
18 | ########################### |
19 | |
20 | -GTK_DOC_CHECK([1.9]) |
21 | +GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) |
22 | |
23 | |
24 | ########################### |
25 | |
26 | === modified file 'debian/changelog' |
27 | --- debian/changelog 2013-01-17 21:25:50 +0000 |
28 | +++ debian/changelog 2013-01-23 19:18:20 +0000 |
29 | @@ -1,11 +1,6 @@ |
30 | libappindicator (12.10.1-0ubuntu2) UNRELEASED; urgency=low |
31 | |
32 | - * acinclude.m4: Fix python multi-arch include issues. |
33 | - |
34 | - -- Chris J Arges <chris.j.arges@canonical.com> Thu, 17 Jan 2013 15:25:28 -0600 |
35 | - |
36 | -libappindicator (12.10.1-0ubuntu1) UNRELEASED; urgency=low |
37 | - |
38 | + [ Mathieu Trudel-Lapierre ] |
39 | * debian/control: |
40 | - Update style: use trailing commas at the end of dependency lists. |
41 | - Reorganize Build-Depends for clarity. |
42 | @@ -21,11 +16,15 @@ |
43 | - Add and export DPKG_GENSYMBOLS_CHECK_LEVEL. |
44 | - Override dh_autoreconf to run autogen.sh and not call configure. |
45 | - Override dh_auto_test to run tests per-flavor. |
46 | - - Temporarily disable tests. |
47 | * debian/*.install: |
48 | - Update paths for multiarch and for use with dh9 (remove debian/tmp...) |
49 | - |
50 | - -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Mon, 26 Nov 2012 11:02:18 -0500 |
51 | + * Fix gtkdoc tests and building of the documentation given a separate build |
52 | + directory. |
53 | + |
54 | + [ Chris J Arges ] |
55 | + * acinclude.m4: Fix python multi-arch include issues. |
56 | + |
57 | + -- Chris J Arges <chris.j.arges@canonical.com> Thu, 17 Jan 2013 15:25:28 -0600 |
58 | |
59 | libappindicator (12.10.0-0ubuntu1) quantal; urgency=low |
60 | |
61 | |
62 | === modified file 'debian/rules' |
63 | --- debian/rules 2012-12-04 17:01:40 +0000 |
64 | +++ debian/rules 2013-01-23 19:18:20 +0000 |
65 | @@ -20,6 +20,7 @@ |
66 | # Note: No cli here so that the pbuilder stuff works |
67 | clean: |
68 | dh_clean |
69 | + dh_autoreconf_clean |
70 | |
71 | override_dh_autoreconf: |
72 | NOCONFIGURE=1 dh_autoreconf ./autogen.sh |
73 | @@ -72,14 +73,19 @@ |
74 | override_dh_auto_test: $(FLAVORS:%=dotest-%) |
75 | |
76 | dotest-%: |
77 | - #dh_auto_test --builddirectory=build/$* |
78 | + ps -ef |
79 | + env |
80 | + dh_auto_test --builddirectory=build/$* -- |
81 | + |
82 | |
83 | dotest-gtk2: $(PY_VERSIONS:%=dotestgtk2-%) |
84 | # GTK2 flavor test was run on a per-python-version basis. |
85 | |
86 | dotestgtk2-%: |
87 | - #PYTHON=`which $*` \ |
88 | - # dh_auto_test --builddirectory=build/gtk2 |
89 | + ps -ef |
90 | + env |
91 | + PYTHON=`which $*` \ |
92 | + dh_auto_test --builddirectory=build/gtk2 -- |
93 | |
94 | override_dh_auto_clean: |
95 | dh_auto_clean |
96 | |
97 | === modified file 'docs/reference/Makefile.am' |
98 | --- docs/reference/Makefile.am 2011-02-11 04:03:01 +0000 |
99 | +++ docs/reference/Makefile.am 2013-01-23 19:18:20 +0000 |
100 | @@ -30,7 +30,7 @@ |
101 | # gtk-doc will search all .c & .h files beneath here for inline comments |
102 | # documenting the functions and macros. |
103 | # e.g. DOC_SOURCE_DIR=../../../gtk |
104 | -DOC_SOURCE_DIR=../../src |
105 | +DOC_SOURCE_DIR=$(top_srcdir)/src |
106 | |
107 | # Extra options to pass to gtkdoc-scangobj. Not normally needed. |
108 | SCANGOBJ_OPTIONS=--nogtkinit --type-init-func="g_type_init()" |
109 | @@ -102,7 +102,7 @@ |
110 | GTKDOC_LIBS=$(top_builddir)/src/$(APPINDICATORLIB) $(LIBRARY_LIBS) |
111 | |
112 | # This includes the standard gtk-doc make rules, copied by gtkdocize. |
113 | -include $(top_srcdir)/gtk-doc.local.make |
114 | +include $(top_srcdir)/gtk-doc.make |
115 | |
116 | # Other files to distribute |
117 | # e.g. EXTRA_DIST += version.xml.in |
118 | @@ -113,13 +113,11 @@ |
119 | # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt |
120 | #DISTCLEANFILES += |
121 | |
122 | -# Comment this out if you want your docs-status tested during 'make check' |
123 | -TESTS = gtkdoc-in-srcdir |
124 | - |
125 | -gtkdoc-in-srcdir: Makefile.am |
126 | - @echo "#!/bin/sh" > $@ |
127 | - @echo "cd \"$(srcdir)\"" >> $@ |
128 | - @echo "$(GTKDOC_CHECK)" >> $@ |
129 | - @chmod +x $@ |
130 | -DISTCLEANFILES = gtkdoc-in-srcdir |
131 | - |
132 | +# Comment this out if you want 'make check' to test you doc status |
133 | +# and run some sanity checks |
134 | +if ENABLE_GTK_DOC |
135 | + TESTS_ENVIRONMENT = cd $(srcdir) && \ |
136 | + DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \ |
137 | + SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) |
138 | +TESTS = $(GTKDOC_CHECK) |
139 | +endif |
140 | |
141 | === removed directory 'docs/reference/tmpl' |
142 | === removed file 'docs/reference/tmpl/libappindicator-unused.sgml' |
143 | --- docs/reference/tmpl/libappindicator-unused.sgml 2011-02-24 04:21:55 +0000 |
144 | +++ docs/reference/tmpl/libappindicator-unused.sgml 1970-01-01 00:00:00 +0000 |
145 | @@ -1,42 +0,0 @@ |
146 | -<!-- ##### MACRO APP_INDICATOR_SIGNAL_NEW_ACCESSIBLE_DESC ##### --> |
147 | -<para> |
148 | - |
149 | -</para> |
150 | - |
151 | - |
152 | -<!-- ##### SIGNAL AppIndicator::new-accessible-desc ##### --> |
153 | -<para> |
154 | - |
155 | -</para> |
156 | - |
157 | -@appindicator: the object which received the signal. |
158 | -@arg1: |
159 | - |
160 | -<!-- ##### ARG AppIndicator:accessible-desc ##### --> |
161 | -<para> |
162 | - |
163 | -</para> |
164 | - |
165 | - |
166 | -<!-- ##### ARG AppIndicator:icon-path ##### --> |
167 | -<para> |
168 | - |
169 | -</para> |
170 | - |
171 | - |
172 | -<!-- ##### FUNCTION app_indicator_get_accessible_desc ##### --> |
173 | -<para> |
174 | - |
175 | -</para> |
176 | - |
177 | -@self: |
178 | -@Returns: |
179 | - |
180 | -<!-- ##### FUNCTION app_indicator_set_accessible_desc ##### --> |
181 | -<para> |
182 | - |
183 | -</para> |
184 | - |
185 | -@self: |
186 | -@accessible_desc: |
187 | - |
188 | |
189 | === removed file 'gtk-doc.local.make' |
190 | --- gtk-doc.local.make 2009-12-08 21:03:27 +0000 |
191 | +++ gtk-doc.local.make 1970-01-01 00:00:00 +0000 |
192 | @@ -1,194 +0,0 @@ |
193 | -# -*- mode: makefile -*- |
194 | - |
195 | -#################################### |
196 | -# Everything below here is generic # |
197 | -#################################### |
198 | - |
199 | -if GTK_DOC_USE_LIBTOOL |
200 | -GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
201 | -GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) |
202 | -GTKDOC_RUN = $(LIBTOOL) --mode=execute |
203 | -else |
204 | -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
205 | -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) |
206 | -GTKDOC_RUN = sh -c |
207 | -endif |
208 | - |
209 | -# We set GPATH here; this gives us semantics for GNU make |
210 | -# which are more like other make's VPATH, when it comes to |
211 | -# whether a source that is a target of one rule is then |
212 | -# searched for in VPATH/GPATH. |
213 | -# |
214 | -GPATH = $(srcdir) |
215 | - |
216 | -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) |
217 | - |
218 | -EXTRA_DIST = \ |
219 | - $(content_files) \ |
220 | - $(HTML_IMAGES) \ |
221 | - $(DOC_MAIN_SGML_FILE) |
222 | - |
223 | -DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ |
224 | - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp |
225 | - |
226 | -SCANOBJ_FILES = \ |
227 | - $(DOC_MODULE).args \ |
228 | - $(DOC_MODULE).hierarchy \ |
229 | - $(DOC_MODULE).interfaces \ |
230 | - $(DOC_MODULE).prerequisites \ |
231 | - $(DOC_MODULE).signals |
232 | - |
233 | -REPORT_FILES = \ |
234 | - $(DOC_MODULE)-undocumented.txt \ |
235 | - $(DOC_MODULE)-undeclared.txt \ |
236 | - $(DOC_MODULE)-unused.txt |
237 | - |
238 | -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) |
239 | - |
240 | -if ENABLE_GTK_DOC |
241 | -all-local: html-build.stamp |
242 | -else |
243 | -all-local: |
244 | -endif |
245 | - |
246 | -docs: html-build.stamp |
247 | - |
248 | -$(REPORT_FILES): sgml-build.stamp |
249 | - |
250 | -#### scan #### |
251 | - |
252 | -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) |
253 | - @echo 'gtk-doc: Scanning header files' |
254 | - @-chmod -R u+w $(srcdir) |
255 | - cd $(srcdir) && \ |
256 | - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) |
257 | - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ |
258 | - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ |
259 | - else \ |
260 | - cd $(srcdir) ; \ |
261 | - for i in $(SCANOBJ_FILES) ; do \ |
262 | - test -f $$i || touch $$i ; \ |
263 | - done \ |
264 | - fi |
265 | - touch scan-build.stamp |
266 | - |
267 | -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp |
268 | - @true |
269 | - |
270 | -#### templates #### |
271 | - |
272 | -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt |
273 | - @echo 'gtk-doc: Rebuilding template files' |
274 | - @-chmod -R u+w $(srcdir) |
275 | - cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) |
276 | - touch tmpl-build.stamp |
277 | - |
278 | -tmpl.stamp: tmpl-build.stamp |
279 | - @true |
280 | - |
281 | -tmpl/*.sgml: |
282 | - @true |
283 | - |
284 | - |
285 | -#### xml #### |
286 | - |
287 | -sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) |
288 | - @echo 'gtk-doc: Building XML' |
289 | - @-chmod -R u+w $(srcdir) |
290 | - cd $(srcdir) && \ |
291 | - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) |
292 | - touch sgml-build.stamp |
293 | - |
294 | -sgml.stamp: sgml-build.stamp |
295 | - @true |
296 | - |
297 | -#### html #### |
298 | - |
299 | -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) |
300 | - @echo 'gtk-doc: Building HTML' |
301 | - @-chmod -R u+w $(srcdir) |
302 | - rm -rf $(srcdir)/html |
303 | - mkdir $(srcdir)/html |
304 | - mkhtml_options=""; \ |
305 | - gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ |
306 | - if test "$(?)" = "0"; then \ |
307 | - mkhtml_options=--path="$(srcdir)"; \ |
308 | - fi |
309 | - cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) |
310 | - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) |
311 | - @echo 'gtk-doc: Fixing cross-references' |
312 | - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) |
313 | - touch html-build.stamp |
314 | - |
315 | -############## |
316 | - |
317 | -clean-local: |
318 | - rm -f *~ *.bak |
319 | - rm -rf .libs |
320 | - |
321 | -distclean-local: |
322 | - cd $(srcdir) && \ |
323 | - rm -rf xml $(REPORT_FILES) \ |
324 | - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt |
325 | - |
326 | -maintainer-clean-local: clean |
327 | - cd $(srcdir) && rm -rf xml html |
328 | - |
329 | -install-data-local: |
330 | - installfiles=`echo $(srcdir)/html/*`; \ |
331 | - if test "$$installfiles" = '$(srcdir)/html/*'; \ |
332 | - then echo '-- Nothing to install' ; \ |
333 | - else \ |
334 | - if test -n "$(DOC_MODULE_VERSION)"; then \ |
335 | - installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ |
336 | - else \ |
337 | - installdir="$(DESTDIR)$(TARGET_DIR)"; \ |
338 | - fi; \ |
339 | - $(mkinstalldirs) $${installdir} ; \ |
340 | - for i in $$installfiles; do \ |
341 | - echo '-- Installing '$$i ; \ |
342 | - $(INSTALL_DATA) $$i $${installdir}; \ |
343 | - done; \ |
344 | - if test -n "$(DOC_MODULE_VERSION)"; then \ |
345 | - mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ |
346 | - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ |
347 | - mv -f $${installdir}/$(DOC_MODULE).devhelp \ |
348 | - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ |
349 | - fi; \ |
350 | - ! which gtkdoc-rebase >/dev/null 2>&1 || \ |
351 | - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ |
352 | - fi |
353 | - |
354 | -uninstall-local: |
355 | - if test -n "$(DOC_MODULE_VERSION)"; then \ |
356 | - installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ |
357 | - else \ |
358 | - installdir="$(DESTDIR)$(TARGET_DIR)"; \ |
359 | - fi; \ |
360 | - rm -rf $${installdir} |
361 | - |
362 | -# |
363 | -# Require gtk-doc when making dist |
364 | -# |
365 | -if ENABLE_GTK_DOC |
366 | -dist-check-gtkdoc: |
367 | -else |
368 | -dist-check-gtkdoc: |
369 | - @echo "*** gtk-doc must be installed and enabled in order to make dist" |
370 | - @false |
371 | -endif |
372 | - |
373 | -dist-hook: dist-check-gtkdoc dist-hook-local |
374 | - mkdir $(distdir)/tmpl |
375 | - mkdir $(distdir)/xml |
376 | - mkdir $(distdir)/html |
377 | - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl |
378 | - -cp $(srcdir)/xml/*.xml $(distdir)/xml |
379 | - -cp $(srcdir)/html/* $(distdir)/html |
380 | - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ |
381 | - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ |
382 | - cd $(distdir) && rm -f $(DISTCLEANFILES) |
383 | - ! which gtkdoc-rebase >/dev/null 2>&1 || \ |
384 | - gtkdoc-rebase --online --relative --html-dir=$(distdir)/html |
385 | - |
386 | -.PHONY : dist-hook-local docs |
387 | |
388 | === modified file 'tests/Makefile.am' |
389 | --- tests/Makefile.am 2011-02-11 04:14:28 +0000 |
390 | +++ tests/Makefile.am 2013-01-23 19:18:20 +0000 |
391 | @@ -137,6 +137,8 @@ |
392 | |
393 | test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am |
394 | @echo "#!/bin/bash" > $@ |
395 | + @echo export DISPLAY= >> $@ |
396 | + @echo killall at-spi2-registryd >> $@ |
397 | @echo . $(srcdir)/run-xvfb.sh >> $@ |
398 | @echo $(DBUS_RUNNER) --task ./test-libappindicator-fallback-watcher --task-name Watcher --ignore-return --task ./test-libappindicator-fallback-item --task-name Item >> $@ |
399 | @chmod +x $@ |
400 | @@ -152,6 +154,8 @@ |
401 | |
402 | libappindicator-tests: libappindicator-tests-gtester Makefile.am |
403 | @echo "#!/bin/bash" > $@ |
404 | + @echo export DISPLAY= >> $@ |
405 | + @echo killall at-spi2-registryd >> $@ |
406 | @echo . $(srcdir)/run-xvfb.sh >> $@ |
407 | @echo export UBUNTU_MENUPROXY= >> $@ |
408 | @echo $(DBUS_RUNNER) --task ./libappindicator-tests-gtester >> $@ |
409 | @@ -166,10 +170,12 @@ |
410 | DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) libappindicator-tests-gtester |
411 | |
412 | |
413 | -DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf |
414 | +DBUS_RUNNER=dbus-test-runner -m 300 --dbus-config /usr/share/dbus-test-runner/session.conf |
415 | |
416 | test-libappindicator-dbus: test-libappindicator-dbus-client test-libappindicator-dbus-server Makefile.am |
417 | @echo "#!/bin/bash" > test-libappindicator-dbus |
418 | + @echo export DISPLAY= >> $@ |
419 | + @echo killall at-spi2-registryd >> $@ |
420 | @echo . $(srcdir)/run-xvfb.sh >> $@ |
421 | @echo $(DBUS_RUNNER) --task ./test-libappindicator-dbus-client --task-name Client --task ./test-libappindicator-dbus-server --task-name Server --ignore-return >> test-libappindicator-dbus |
422 | @chmod +x test-libappindicator-dbus |
423 | @@ -179,6 +185,8 @@ |
424 | |
425 | test-libappindicator-status: test-libappindicator-status-client test-libappindicator-status-server Makefile.am |
426 | @echo "#!/bin/bash" > test-libappindicator-status |
427 | + @echo export DISPLAY= >> $@ |
428 | + @echo killall at-spi2-registryd >> $@ |
429 | @echo . $(srcdir)/run-xvfb.sh >> $@ |
430 | @echo $(DBUS_RUNNER) --task ./test-libappindicator-status-client --task-name Client --task ./test-libappindicator-status-server --task-name Server --ignore-return >> test-libappindicator-status |
431 | @chmod +x test-libappindicator-status |
432 | |
433 | === modified file 'tests/test-libappindicator-dbus-client.c' |
434 | --- tests/test-libappindicator-dbus-client.c 2010-12-08 16:54:16 +0000 |
435 | +++ tests/test-libappindicator-dbus-client.c 2013-01-23 19:18:20 +0000 |
436 | @@ -204,8 +204,6 @@ |
437 | gint |
438 | main (gint argc, gchar * argv[]) |
439 | { |
440 | - g_type_init(); |
441 | - |
442 | GError * error = NULL; |
443 | DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); |
444 | if (error != NULL) { |
445 | |
446 | === modified file 'tests/test-libappindicator-fallback-item.c' |
447 | --- tests/test-libappindicator-fallback-item.c 2010-06-11 17:34:09 +0000 |
448 | +++ tests/test-libappindicator-fallback-item.c 2013-01-23 19:18:20 +0000 |
449 | @@ -138,7 +138,7 @@ |
450 | GtkWidget * menu = gtk_menu_new(); |
451 | app_indicator_set_menu(APP_INDICATOR(item), GTK_MENU(menu)); |
452 | |
453 | - g_timeout_add_seconds(2, kill_func, NULL); |
454 | + g_timeout_add_seconds(20, kill_func, NULL); |
455 | |
456 | mainloop = g_main_loop_new(NULL, FALSE); |
457 | g_main_loop_run(mainloop); |
458 | |
459 | === modified file 'tests/test-libappindicator-fallback-watcher.c' |
460 | --- tests/test-libappindicator-fallback-watcher.c 2010-06-11 17:35:21 +0000 |
461 | +++ tests/test-libappindicator-fallback-watcher.c 2013-01-23 19:18:20 +0000 |
462 | @@ -58,8 +58,6 @@ |
463 | int |
464 | main (int argv, char ** argc) |
465 | { |
466 | - g_type_init(); |
467 | - |
468 | g_debug("Waiting to init."); |
469 | |
470 | |
471 | @@ -77,6 +75,7 @@ |
472 | while (!has_owner && owner_count < 10000) { |
473 | org_freedesktop_DBus_name_has_owner(bus_proxy, "org.test", &has_owner, NULL); |
474 | owner_count++; |
475 | + g_usleep(500000); |
476 | } |
477 | |
478 | if (owner_count == 10000) { |
479 | @@ -104,7 +103,7 @@ |
480 | |
481 | /* This is the final kill function. It really shouldn't happen |
482 | unless we get an error. */ |
483 | - g_timeout_add(2000, kill_func, NULL); |
484 | + g_timeout_add_seconds(20, kill_func, NULL); |
485 | |
486 | g_debug("Entering Mainloop"); |
487 | |
488 | |
489 | === modified file 'tests/test-libappindicator-status-client.c' |
490 | --- tests/test-libappindicator-status-client.c 2010-03-02 20:31:37 +0000 |
491 | +++ tests/test-libappindicator-status-client.c 2013-01-23 19:18:20 +0000 |
492 | @@ -109,8 +109,6 @@ |
493 | gint |
494 | main (gint argc, gchar * argv[]) |
495 | { |
496 | - g_type_init(); |
497 | - |
498 | GError * error = NULL; |
499 | DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); |
500 | if (error != NULL) { |
501 | @@ -137,7 +135,7 @@ |
502 | dbus_bus_add_match(dbus_g_connection_get_connection(session_bus), "type='signal',interface='" NOTIFICATION_ITEM_DBUS_IFACE "',member='NewStatus'", NULL); |
503 | |
504 | watchdog_hit = TRUE; |
505 | - g_timeout_add(1000, kill_func, NULL); |
506 | + g_timeout_add_seconds(20, kill_func, NULL); |
507 | |
508 | mainloop = g_main_loop_new(NULL, FALSE); |
509 | g_main_loop_run(mainloop); |
510 | |
511 | === modified file 'tests/test-libappindicator.c' |
512 | --- tests/test-libappindicator.c 2012-01-29 03:42:34 +0000 |
513 | +++ tests/test-libappindicator.c 2013-01-23 19:18:20 +0000 |
514 | @@ -28,6 +28,16 @@ |
515 | #include <libdbusmenu-glib/menuitem.h> |
516 | #include <libdbusmenu-glib/server.h> |
517 | |
518 | +static gboolean |
519 | +allow_warnings (const gchar *log_domain, GLogLevelFlags log_level, |
520 | + const gchar *message, gpointer user_data) |
521 | +{ |
522 | + // By default, gtest will fail a test on even a warning message. |
523 | + // But since some of our sub-libraries are noisy (especially at-spi2), |
524 | + // only fail on critical or worse. |
525 | + return ((log_level & G_LOG_LEVEL_MASK) <= G_LOG_LEVEL_CRITICAL); |
526 | +} |
527 | + |
528 | void |
529 | test_libappindicator_prop_signals_status_helper (AppIndicator * ci, gchar * status, gboolean * signalactivated) |
530 | { |
531 | @@ -45,6 +55,8 @@ |
532 | void |
533 | test_libappindicator_prop_signals (void) |
534 | { |
535 | + g_test_log_set_fatal_handler (allow_warnings, NULL); |
536 | + |
537 | AppIndicator * ci = app_indicator_new ("test-app-indicator", |
538 | "indicator-messages", |
539 | APP_INDICATOR_CATEGORY_APPLICATION_STATUS); |
540 | @@ -115,6 +127,8 @@ |
541 | void |
542 | test_libappindicator_init_set_props (void) |
543 | { |
544 | + g_test_log_set_fatal_handler (allow_warnings, NULL); |
545 | + |
546 | AppIndicator * ci = app_indicator_new ("my-id", |
547 | "my-name", |
548 | APP_INDICATOR_CATEGORY_APPLICATION_STATUS); |
549 | @@ -139,6 +153,8 @@ |
550 | void |
551 | test_libappindicator_init_with_props (void) |
552 | { |
553 | + g_test_log_set_fatal_handler (allow_warnings, NULL); |
554 | + |
555 | AppIndicator * ci = app_indicator_new ("my-id", |
556 | "my-name", |
557 | APP_INDICATOR_CATEGORY_APPLICATION_STATUS); |
558 | @@ -161,6 +177,8 @@ |
559 | void |
560 | test_libappindicator_init (void) |
561 | { |
562 | + g_test_log_set_fatal_handler (allow_warnings, NULL); |
563 | + |
564 | AppIndicator * ci = app_indicator_new ("my-id", "my-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS); |
565 | g_assert(ci != NULL); |
566 | g_object_unref(G_OBJECT(ci)); |
567 | @@ -170,6 +188,8 @@ |
568 | void |
569 | test_libappindicator_set_label (void) |
570 | { |
571 | + g_test_log_set_fatal_handler (allow_warnings, NULL); |
572 | + |
573 | AppIndicator * ci = app_indicator_new ("my-id", |
574 | "my-name", |
575 | APP_INDICATOR_CATEGORY_APPLICATION_STATUS); |
576 | @@ -232,6 +252,8 @@ |
577 | void |
578 | test_libappindicator_set_menu (void) |
579 | { |
580 | + g_test_log_set_fatal_handler (allow_warnings, NULL); |
581 | + |
582 | AppIndicator * ci = app_indicator_new ("my-id", |
583 | "my-name", |
584 | APP_INDICATOR_CATEGORY_APPLICATION_STATUS); |
585 | @@ -301,6 +323,8 @@ |
586 | void |
587 | test_libappindicator_label_signals (void) |
588 | { |
589 | + g_test_log_set_fatal_handler (allow_warnings, NULL); |
590 | + |
591 | gint label_signals_count = 0; |
592 | AppIndicator * ci = app_indicator_new ("my-id", |
593 | "my-name", |
594 | @@ -352,6 +376,8 @@ |
595 | void |
596 | test_libappindicator_desktop_menu (void) |
597 | { |
598 | + g_test_log_set_fatal_handler (allow_warnings, NULL); |
599 | + |
600 | AppIndicator * ci = app_indicator_new ("my-id-desktop-menu", |
601 | "my-name", |
602 | APP_INDICATOR_CATEGORY_APPLICATION_STATUS); |
603 | @@ -388,6 +414,8 @@ |
604 | void |
605 | test_libappindicator_desktop_menu_bad (void) |
606 | { |
607 | + g_test_log_set_fatal_handler (allow_warnings, NULL); |
608 | + |
609 | AppIndicator * ci = app_indicator_new ("my-id-desktop-menu-bad", |
610 | "my-name", |
611 | APP_INDICATOR_CATEGORY_APPLICATION_STATUS); |
612 | |
613 | === modified file 'tests/test-simple-app.c' |
614 | --- tests/test-simple-app.c 2010-04-29 16:31:36 +0000 |
615 | +++ tests/test-simple-app.c 2013-01-23 19:18:20 +0000 |
616 | @@ -31,8 +31,6 @@ |
617 | int |
618 | main (int argc, char ** argv) |
619 | { |
620 | - g_type_init(); |
621 | - |
622 | DbusmenuServer * dms = dbusmenu_server_new("/menu"); |
623 | DbusmenuMenuitem * dmi = dbusmenu_menuitem_new(); |
624 | dbusmenu_menuitem_property_set(dmi, "label", "Bob"); |
FAILED: Continuous integration, rev:248 jenkins. qa.ubuntu. com/job/ libappindicator -ci/18/ jenkins. qa.ubuntu. com/job/ libappindicator -ci/./build= pbuilder, distribution= coverity- raring, flavor= amd64/18/ console jenkins. qa.ubuntu. com/job/ libappindicator -ci/./build= pbuilder, distribution= raring, flavor= i386/18/ console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: jenkins. qa.ubuntu. com/job/ libappindicator -ci/18/ /rebuild/?
http://