Merge lp://staging/~charlesk/dbus-test-runner/support-gtestdbus-and-dbusmock-templates into lp://staging/dbus-test-runner/15.10
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~charlesk/dbus-test-runner/support-gtestdbus-and-dbusmock-templates |
| Merge into: | lp://staging/dbus-test-runner/15.10 |
| Diff against target: |
1683 lines (+389/-560) 21 files modified
Makefile.am (+0/-1) configure.ac (+0/-1) data/Makefile.am (+0/-5) data/session.conf (+0/-42) data/system.conf (+0/-42) debian/libdbustest1.symbols (+2/-3) libdbustest/Makefile.am (+2/-4) libdbustest/bustle.c (+4/-4) libdbustest/dbus-mock.c (+66/-16) libdbustest/dbus-mock.h (+1/-0) libdbustest/process.c (+7/-7) libdbustest/service.c (+293/-379) libdbustest/service.h (+3/-7) libdbustest/task.c (+2/-2) libdbustest/watchdog.c (+2/-2) po/Makefile.in.in (+5/-6) src/Makefile.am (+0/-1) src/dbus-test-runner.c (+0/-16) tests/Makefile.am (+2/-2) tests/test-libdbustest-mock.c (+0/-14) tests/test-libdbustest.c (+0/-6) |
| To merge this branch: | bzr merge lp://staging/~charlesk/dbus-test-runner/support-gtestdbus-and-dbusmock-templates |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
| Ted Gould | Pending | ||
|
Review via email:
|
|||
Commit message
Add support for dbusmock templates and for working with externally-managed DBuses and GTestDBuses.
Description of the change
Add support for dbusmock templates and for working with externally-managed DBuses and GTestDBuses.
| Ted Gould (ted) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
Unmerged revisions
- 113. By Charles Kerr
-
we're removing some public functions and adding others, so bump both ABI and API
- 112. By Charles Kerr
-
copyediting: tidy up the new comments a little
- 111. By Charles Kerr
-
remove unused macro
- 110. By Charles Kerr
-
and while we're in the neighborhood, update DbusTestService to use G_DEFINE_
TYPE_WITH_ PRIVATE - 109. By Charles Kerr
-
revert dbus_test_
service_ new() to take an address argument, as with the current ABI - 108. By Charles Kerr
-
in libdbustest/, get the mock class working with the new template property
- 107. By Charles Kerr
-
in debian/
libdbustest1. symbols, add dbus_test_ dbus_mock_ new_from_ template( ) - 106. By Charles Kerr
-
in libdbustest, add new method dbus_test_
dbus_mock_ new_from_ template( ) - 105. By Charles Kerr
-
in libdbustest/
service. c, copyediting -- make whitespace of new code more consistent with existing code - 104. By Charles Kerr
-
remove now-unused method dbus_test_
service_ set_keep_ environment( )
Quick review, some comments below