libappindicator

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

fix-tests
Merge into trunk.13.04

Proposed by Mathieu Trudel-Lapierre on 2012-12-11

Status:	Merged
Merged at revision:	248
Proposed branch:	lp://staging/~cyphermox/libappindicator/fix-tests
Merge into:	lp://staging/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://staging/~cyphermox/libappindicator/fix-tests
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2013-01-22
Didier Roche-Tolomelli		2012-12-11	Needs Fixing on 2012-12-11
Review via email: mp+139140@code.staging.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).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2012-12-11:

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 on 2012-12-11:

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