DBus Test Runner

Merge lp://staging/~dbarth/dbus-test-runner/glib-compat into lp://staging/dbus-test-runner/13.04

glib-compat
Merge into trunk.13.04

Proposed by David Barth on 2013-02-21

Status:	Merged
Approved by:	Mathieu Trudel-Lapierre on 2013-02-25
Approved revision:	59
Merged at revision:	59
Proposed branch:	lp://staging/~dbarth/dbus-test-runner/glib-compat
Merge into:	lp://staging/dbus-test-runner/13.04
Diff against target:	108 lines (+51/-2) 5 files modified libdbustest/bustle.c (+1/-0) libdbustest/glib-compat.h (+43/-0) libdbustest/process.c (+2/-0) libdbustest/service.c (+3/-0) src/dbus-test-runner.c (+2/-2)
To merge this branch:	bzr merge lp://staging/~dbarth/dbus-test-runner/glib-compat
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Mathieu Trudel-Lapierre		2013-02-21	Approve on 2013-02-25
PS Jenkins bot (community)	continuous-integration		Approve on 2013-02-21
Review via email: mp+149847@code.staging.launchpad.net

Commit message

This ensures that dbus-test-runner still builds on 12.04, by wrapping the use of the new g_clear_pointer with a macro on older glibs.

Description of the change

This ensures that dbus-test-runner still builds on 12.04, by wrapping the use of the new g_clear_pointer with a macro on older glibs.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-02-21:

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Ted Gould (ted) wrote on 2013-02-21:

Haven't looked at the Jenkins failures, but the header needs to be added to the Makefile.am. Seems like at the same time we should probably put in g_clear_object(). That's really nice and I'm sure future branches will use it.

Revision history for this message

Mathieu Trudel-Lapierre (cyphermox) wrote on 2013-02-21:

Jenkins fails because of file conflicts, see the diff for libdbustest/service.c. Could you please fix that?

Thanks!

review: Needs Fixing

Revision history for this message

David Barth (dbarth) wrote on 2013-02-21:

Le 21/02/2013 18:11, Mathieu Trudel-Lapierre a écrit :
> Review: Needs Fixing
>
> Jenkins fails because of file conflicts, see the diff for libdbustest/service.c. Could you please fix that?
Uh, that's because the patch was made on 12.10 initially. I'll look into
that.

David

lp://staging/~dbarth/dbus-test-runner/glib-compat updated on 2013-02-21