libappindicator

Merge lp:~cyphermox/libappindicator/fix-tests into lp:libappindicator/13.04

  1. fix-tests
  2. Merge into trunk.13.04
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: 248
Proposed branch: lp:~cyphermox/libappindicator/fix-tests
Merge into: lp:libappindicator/13.04
Diff against target: 623 lines (+65/-271)
15 files modified
acinclude.m4 (+1/-6)
autogen.sh (+1/-0)
configure.ac (+1/-1)
debian/changelog (+3/-2)
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 (+8/-0)
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-tests
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Didier Roche-Tolomelli Needs Fixing
Review via email: mp+139140@code.launchpad.net

Description of the change

Fix tests for gtkdoc; based on Charles' excellent work already (https://code.launchpad.net/~charlesk/libappindicator/lp-1083425/+merge/137267)

Addresses the tests being commented out and fixed DOC_SOURCE_DIR to correctly point to the right code directory given build with an "external" build dir (because of the parallel gtk2 and gtk3 builds).

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

FAILED: Continuous integration, rev:251
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/14/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-ci/./build=pbuilder,distribution=raring,flavor=i386/14/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/14//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

This looks good to me. However, looking at configure in the pbuilder, it seems there is one python extension build-dep missing:

checking for headers required to compile python extensions... not found
configure: error: could not find Python headers
dh_auto_configure: ../../configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-gtk=2 --enable-gtk-doc --disable-scrollkeeper --enable-introspection returned exit code 1
make[1]: *** [doconfiguregtk2-python2.7] Error 2
make[1]: Leaving directory `/tmp/buildd/libappindicator-12.10.1'
make: *** [build] Error 2

Once this is fixed, feel free to approve it :)

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

FAILED: Continuous integration, rev:252
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/15/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-ci/./build=pbuilder,distribution=raring,flavor=i386/15/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/15//rebuild/?

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

FAILED: Continuous integration, rev:255
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/17/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-ci/./build=pbuilder,distribution=raring,flavor=i386/17/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/17//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Concerning the Coverity-raring failure above, I'm going to disable that check temporarily as there are unrelated legit defects.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libappindicator-autolanding/6/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-autolanding/./build=pbuilder,distribution=coverity-raring,flavor=amd64/6/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-autolanding/./build=pbuilder,distribution=raring,flavor=i386/6/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Apologies for this spurious failure--re-approving and should be ok to land. . . .

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libappindicator-autolanding/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-autolanding/./build=pbuilder,distribution=coverity-raring,flavor=amd64/7/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-autolanding/./build=pbuilder,distribution=raring,flavor=i386/7/console

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libappindicator-autolanding/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-autolanding/./build=pbuilder,distribution=coverity-raring,flavor=amd64/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-autolanding/./build=pbuilder,distribution=raring,flavor=i386/9/console

review: Needs Fixing (continuous-integration)

Preview Diff

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

Subscribers

People subscribed via source and target branches