lp:~thomas-voss/dbus-cpp/fix-race-and-add-tests

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:dbus-cpp at revision 46

PS Jenkins bot: Approve (continuous-integration) on 2014-03-10

Pete Woods (community): Approve on 2014-03-07

Antti Kaijanmäki (community): Approve on 2014-03-07

Diff: 3199 lines (+734/-2143)

19 files modified

debian/libdbus-cpp2.symbols.32bit (+203/-904)
debian/libdbus-cpp2.symbols.64bit (+203/-757)
debian/libdbus-cpp2.symbols.coverage (+5/-0)
debian/rules (+6/-0)
include/core/dbus/impl/object.h (+18/-31)
include/core/dbus/object.h (+12/-1)
include/core/dbus/pending_call.h (+0/-6)
src/core/dbus/CMakeLists.txt (+6/-0)
src/core/dbus/asio/executor.cpp (+36/-25)
src/core/dbus/asio_executor.cpp (+0/-376)
src/core/dbus/bus.cpp (+11/-1)
src/core/dbus/dbus.cpp (+1/-0)
src/core/dbus/pending_call_impl.h (+52/-30)
symbols.map (+16/-0)
tests/bus_test.cpp (+17/-4)
tests/dbus_test.cpp (+7/-3)
tests/executor_test.cpp (+135/-0)
tests/signal_delivery_test.cpp (+5/-3)
tests/test_service.h (+1/-2)

api

Superseded for merging into lp:~phablet-team/dbus-cpp/soname_bump

Ubuntu Phablet Team: Pending requested 2014-03-05

Diff: 1062 lines (+298/-481)

13 files modified

include/core/dbus/impl/object.h (+18/-31)
include/core/dbus/object.h (+12/-1)
include/core/dbus/pending_call.h (+0/-6)
src/core/dbus/asio/executor.cpp (+36/-25)
src/core/dbus/asio_executor.cpp (+0/-376)
src/core/dbus/bus.cpp (+11/-1)
src/core/dbus/dbus.cpp (+1/-0)
src/core/dbus/pending_call_impl.h (+56/-30)
tests/bus_test.cpp (+19/-4)
tests/dbus_test.cpp (+7/-3)
tests/executor_test.cpp (+135/-0)
tests/signal_delivery_test.cpp (+2/-2)
tests/test_service.h (+1/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

61. By Thomas Voß on 2014-03-10

Move stripping of -fstack-protector before include.

60. By Thomas Voß on 2014-03-10

Make sure that -fstack-protector is stripped from the compiler flags to avoid build failures on arm64.

59. By Thomas Voß on 2014-03-05

Add missing coverage-specific symbols for armhf.

58. By Thomas Voß on 2014-03-05

Add specific symbols file for coverage builds, only containing optional symbols.

57. By Thomas Voß on 2014-03-05

Adjust symbol file for 32bit platforms to account for difference in size of integer types.

56. By Thomas Voß on 2014-03-05

Add a linker script to force the linker to only export symbols that are in namespace core::dbus::*.
Adjust symbol files accordingly.

55. By Thomas Voß on 2014-03-05

Add missing symbols for coverage build.

54. By Thomas Voß on 2014-03-05

Fix racyness in signal-delivery test.

53. By Thomas Voß on 2014-03-05

Remove obsolete std::this_thread::sleep_for in tests/bus_test.cpp.

52. By Thomas Voß on 2014-03-05

Cleanup whitespace.