Merge lp://qastaging/~cyphermox/libappindicator/fix-test-merge into lp://qastaging/libappindicator/13.04

Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: 248
Proposed branch: lp://qastaging/~cyphermox/libappindicator/fix-test-merge
Merge into: lp://qastaging/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://qastaging/~cyphermox/libappindicator/fix-test-merge
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Indicator Applet Developers Pending
Review via email: mp+144551@code.qastaging.launchpad.net

Description of the change

Merging lp;~mathieu-tl/libappindicator/fix-tests, with the proper conflict fix for the file acinclude.m4.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
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.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches