dbus-cpp

Merge lp:~thomas-voss/dbus-cpp/force_gcc_4.7 into lp:dbus-cpp

  1. force_gcc_4.7
  2. Merge into trunk
Proposed by Thomas Voß
Status: Merged
Merged at revision: 44
Proposed branch: lp:~thomas-voss/dbus-cpp/force_gcc_4.7
Merge into: lp:dbus-cpp
Diff against target: 313 lines (+45/-36)
12 files modified
debian/control (+2/-0)
debian/rules (+4/-1)
include/core/dbus/compiler.h (+1/-0)
include/core/dbus/message_router.h (+2/-2)
include/core/dbus/types/variant.h (+3/-3)
src/core/dbus/introspection_parser.cpp (+1/-0)
tests/codec_test.cpp (+9/-7)
tests/executor_test.cpp (+1/-1)
tests/service_test.cpp (+1/-1)
tests/service_watcher_test.cpp (+8/-8)
tests/signal_delivery_test.cpp (+12/-12)
tests/stl_codec_test.cpp (+1/-1)
To merge this branch: bzr merge lp:~thomas-voss/dbus-cpp/force_gcc_4.7
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+204909@code.launchpad.net

Commit message

Force compilation against GCC 4.7.
Account for toolchain differences.

Description of the change

Force compilation against GCC 4.7.
Account for toolchain differences.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:42
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/105/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-amd64-ci/85/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-armhf-ci/84/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-i386-ci/84/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/105/rebuild

review: Needs Fixing (continuous-integration)
lp:~thomas-voss/dbus-cpp/force_gcc_4.7 updated
43. By Thomas Voß

Adjust compiler selection.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:43
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/107/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-amd64-ci/87/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-armhf-ci/86/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-i386-ci/86/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/107/rebuild

review: Needs Fixing (continuous-integration)
lp:~thomas-voss/dbus-cpp/force_gcc_4.7 updated
44. By Thomas Voß

Revert changes to binary package version.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/109/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-amd64-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-armhf-ci/88/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-i386-ci/88/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/109/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2014-02-03 11:05:50 +0000
+++ debian/control 2014-02-06 11:19:51 +0000
@@ -5,6 +5,8 @@
5 dbus,5 dbus,
6 debhelper (>= 9),6 debhelper (>= 9),
7 doxygen,7 doxygen,
8 gcc-4.7,
9 g++-4.7,
8 google-mock,10 google-mock,
9 libboost-filesystem-dev,11 libboost-filesystem-dev,
10 libboost-system-dev,12 libboost-system-dev,
1113
=== modified file 'debian/rules'
--- debian/rules 2014-01-30 08:08:49 +0000
+++ debian/rules 2014-02-06 11:19:51 +0000
@@ -4,7 +4,10 @@
4# Uncomment this to turn on verbose mode.4# Uncomment this to turn on verbose mode.
5export DH_VERBOSE=15export DH_VERBOSE=1
66
7DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)7include /usr/share/dpkg/default.mk
8
9export CC=$(DEB_HOST_MULTIARCH)-gcc-4.7
10export CXX=$(DEB_HOST_MULTIARCH)-g++-4.7
811
9export DPKG_GENSYMBOLS_CHECK_LEVEL=412export DPKG_GENSYMBOLS_CHECK_LEVEL=4
1013
1114
=== modified file 'include/core/dbus/compiler.h'
--- include/core/dbus/compiler.h 2013-11-27 18:57:42 +0000
+++ include/core/dbus/compiler.h 2014-02-06 11:19:51 +0000
@@ -23,6 +23,7 @@
2323
24#include <memory>24#include <memory>
25#include <set>25#include <set>
26#include <stdexcept>
26#include <string>27#include <string>
27#include <vector>28#include <vector>
2829
2930
=== modified file 'include/core/dbus/message_router.h'
--- include/core/dbus/message_router.h 2014-01-30 19:09:10 +0000
+++ include/core/dbus/message_router.h 2014-02-06 11:19:51 +0000
@@ -94,9 +94,9 @@
94 ul.unlock();94 ul.unlock();
95 handler(msg);95 handler(msg);
96 return true;96 return true;
97 } else {
98 return false;
99 }97 }
98
99 return false;
100 }100 }
101101
102private:102private:
103103
=== modified file 'include/core/dbus/types/variant.h'
--- include/core/dbus/types/variant.h 2014-01-20 22:04:16 +0000
+++ include/core/dbus/types/variant.h 2014-02-06 11:19:51 +0000
@@ -59,7 +59,7 @@
59 template<typename T>59 template<typename T>
60 static inline Variant encode(T t)60 static inline Variant encode(T t)
61 {61 {
62 auto encoder = [t](dbus::Message::Writer& writer)62 Encoder encoder = [t](dbus::Message::Writer& writer)
63 {63 {
64 Codec<T>::encode_argument(writer, t);64 Codec<T>::encode_argument(writer, t);
65 };65 };
@@ -74,7 +74,7 @@
74 template<typename T>74 template<typename T>
75 static inline Variant decode(T& t)75 static inline Variant decode(T& t)
76 {76 {
77 auto decoder = [&t](dbus::Message::Reader& reader)77 Decoder decoder = [&t](dbus::Message::Reader& reader)
78 {78 {
79 Codec<T>::decode_argument(reader, t);79 Codec<T>::decode_argument(reader, t);
80 };80 };
@@ -94,7 +94,7 @@
94 };94 };
95 }95 }
9696
97 inline Variant(const Variant& rhs) = default;97 inline Variant(const Variant&) = default;
9898
99 inline Variant(Variant&& rhs)99 inline Variant(Variant&& rhs)
100 : encoder(std::move(rhs.encoder)),100 : encoder(std::move(rhs.encoder)),
101101
=== modified file 'src/core/dbus/introspection_parser.cpp'
--- src/core/dbus/introspection_parser.cpp 2013-11-27 18:57:42 +0000
+++ src/core/dbus/introspection_parser.cpp 2014-02-06 11:19:51 +0000
@@ -22,6 +22,7 @@
2222
23#include <iostream>23#include <iostream>
24#include <map>24#include <map>
25#include <stdexcept>
2526
26namespace core27namespace core
27{28{
2829
=== modified file 'tests/codec_test.cpp'
--- tests/codec_test.cpp 2014-01-21 11:32:57 +0000
+++ tests/codec_test.cpp 2014-02-06 11:19:51 +0000
@@ -396,7 +396,8 @@
396 counter++;396 counter++;
397 }397 }
398398
399 EXPECT_EQ(5, counter);399 unsigned int expected_value{5};
400 EXPECT_EQ(expected_value, counter);
400}401}
401402
402TEST(Properties, DictionaryMappingToVariantsIsEncodedCorrectlyWithMap)403TEST(Properties, DictionaryMappingToVariantsIsEncodedCorrectlyWithMap)
@@ -421,10 +422,11 @@
421 std::map<std::string, dbus::types::Variant> map;422 std::map<std::string, dbus::types::Variant> map;
422 reader >> map;423 reader >> map;
423424
424 EXPECT_EQ(5, map.size());425 unsigned int expected_value{5};
425 EXPECT_EQ(1, map.at("key1").as<std::uint32_t>());426 EXPECT_EQ(expected_value, map.size());
426 EXPECT_EQ(2, map.at("key2").as<std::uint32_t>());427 EXPECT_EQ(std::uint32_t(1), map.at("key1").as<std::uint32_t>());
427 EXPECT_EQ(3, map.at("key3").as<std::uint32_t>());428 EXPECT_EQ(std::uint32_t(2), map.at("key2").as<std::uint32_t>());
428 EXPECT_EQ(4, map.at("key4").as<std::uint32_t>());429 EXPECT_EQ(std::uint32_t(3), map.at("key3").as<std::uint32_t>());
429 EXPECT_EQ(5, map.at("key5").as<std::uint32_t>());430 EXPECT_EQ(std::uint32_t(4), map.at("key4").as<std::uint32_t>());
431 EXPECT_EQ(std::uint32_t(5), map.at("key5").as<std::uint32_t>());
430}432}
431433
=== modified file 'tests/executor_test.cpp'
--- tests/executor_test.cpp 2014-01-14 14:24:29 +0000
+++ tests/executor_test.cpp 2014-02-06 11:19:51 +0000
@@ -101,7 +101,7 @@
101 bus->install_executor(dbus::asio::make_executor(bus));101 bus->install_executor(dbus::asio::make_executor(bus));
102 std::thread t{[bus](){bus->run();}};102 std::thread t{[bus](){bus->run();}};
103 103
104 EXPECT_EQ(1, cross_process_sync.wait_for_signal_ready_for(std::chrono::milliseconds{500}));104 EXPECT_EQ(std::uint32_t(1), cross_process_sync.wait_for_signal_ready_for(std::chrono::milliseconds{500}));
105105
106 auto stub_service = dbus::Service::use_service(bus, dbus::traits::Service<test::Service>::interface_name());106 auto stub_service = dbus::Service::use_service(bus, dbus::traits::Service<test::Service>::interface_name());
107 auto stub = stub_service->object_for_path(dbus::types::ObjectPath("/this/is/unlikely/to/exist/Service"));107 auto stub = stub_service->object_for_path(dbus::types::ObjectPath("/this/is/unlikely/to/exist/Service"));
108108
=== modified file 'tests/service_test.cpp'
--- tests/service_test.cpp 2014-01-14 15:19:46 +0000
+++ tests/service_test.cpp 2014-02-06 11:19:51 +0000
@@ -108,7 +108,7 @@
108 auto bus = session_bus();108 auto bus = session_bus();
109 bus->install_executor(core::dbus::asio::make_executor(bus));109 bus->install_executor(core::dbus::asio::make_executor(bus));
110 std::thread t{[bus](){ bus->run(); }};110 std::thread t{[bus](){ bus->run(); }};
111 EXPECT_EQ(1, cps1.wait_for_signal_ready_for(std::chrono::milliseconds{500}));111 EXPECT_EQ(std::uint32_t(1), cps1.wait_for_signal_ready_for(std::chrono::milliseconds{500}));
112112
113 auto stub_service = dbus::Service::use_service(bus, dbus::traits::Service<test::Service>::interface_name());113 auto stub_service = dbus::Service::use_service(bus, dbus::traits::Service<test::Service>::interface_name());
114 auto stub = stub_service->object_for_path(dbus::types::ObjectPath("/this/is/unlikely/to/exist/Service"));114 auto stub = stub_service->object_for_path(dbus::types::ObjectPath("/this/is/unlikely/to/exist/Service"));
115115
=== modified file 'tests/service_watcher_test.cpp'
--- tests/service_watcher_test.cpp 2014-01-27 14:45:59 +0000
+++ tests/service_watcher_test.cpp 2014-02-06 11:19:51 +0000
@@ -65,7 +65,7 @@
65 {65 {
66 core::testing::SigTermCatcher sc;66 core::testing::SigTermCatcher sc;
6767
68 EXPECT_EQ(1,68 EXPECT_EQ(std::uint32_t(1),
69 client_is_listening_for_service_registration.wait_for_signal_ready_for(69 client_is_listening_for_service_registration.wait_for_signal_ready_for(
70 std::chrono::milliseconds{500}));70 std::chrono::milliseconds{500}));
7171
@@ -122,11 +122,11 @@
122 if (t.joinable())122 if (t.joinable())
123 t.join();123 t.join();
124124
125 EXPECT_EQ(1, owner_changed.size());125 EXPECT_EQ(std::uint32_t(1), owner_changed.size());
126 EXPECT_FALSE(owner_changed.at(0).first.empty());126 EXPECT_FALSE(owner_changed.at(0).first.empty());
127 EXPECT_TRUE(owner_changed.at(0).second.empty());127 EXPECT_TRUE(owner_changed.at(0).second.empty());
128 EXPECT_EQ(1, service_registered);128 EXPECT_EQ(std::uint32_t(1), service_registered);
129 EXPECT_EQ(0, service_unregistered);129 EXPECT_EQ(std::uint32_t(0), service_unregistered);
130130
131 return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;131 return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
132 };132 };
@@ -145,7 +145,7 @@
145145
146 // Ensure that the client is listening for unregistration before we even146 // Ensure that the client is listening for unregistration before we even
147 // start the service.147 // start the service.
148 EXPECT_EQ(1,148 EXPECT_EQ(std::uint32_t(1),
149 client_is_listening_for_service_unregistration.wait_for_signal_ready_for(149 client_is_listening_for_service_unregistration.wait_for_signal_ready_for(
150 std::chrono::milliseconds{500}));150 std::chrono::milliseconds{500}));
151151
@@ -198,11 +198,11 @@
198 if (t.joinable())198 if (t.joinable())
199 t.join();199 t.join();
200200
201 EXPECT_EQ(1, owner_changed.size());201 EXPECT_EQ(std::uint32_t(1), owner_changed.size());
202 EXPECT_TRUE(owner_changed.at(0).first.empty());202 EXPECT_TRUE(owner_changed.at(0).first.empty());
203 EXPECT_FALSE(owner_changed.at(0).second.empty());203 EXPECT_FALSE(owner_changed.at(0).second.empty());
204 EXPECT_EQ(0, service_registered);204 EXPECT_EQ(std::uint32_t(0), service_registered);
205 EXPECT_EQ(1, service_unregistered);205 EXPECT_EQ(std::uint32_t(1), service_unregistered);
206206
207 return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;207 return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
208 };208 };
209209
=== modified file 'tests/signal_delivery_test.cpp'
--- tests/signal_delivery_test.cpp 2014-01-30 10:57:01 +0000
+++ tests/signal_delivery_test.cpp 2014-02-06 11:19:51 +0000
@@ -77,7 +77,7 @@
77 std::thread t{[bus](){ bus->run(); }};77 std::thread t{[bus](){ bus->run(); }};
7878
79 server_is_running.try_signal_ready_for(std::chrono::milliseconds{1000});79 server_is_running.try_signal_ready_for(std::chrono::milliseconds{1000});
80 EXPECT_EQ(1,80 EXPECT_EQ(std::uint32_t(1),
81 client_has_setup_signals_and_connections.wait_for_signal_ready_for(81 client_has_setup_signals_and_connections.wait_for_signal_ready_for(
82 std::chrono::milliseconds{500}));82 std::chrono::milliseconds{500}));
8383
@@ -113,7 +113,7 @@
113 test::Service::Interfaces::Foo::Signals::Dummy::ArgumentType received2 = -1;113 test::Service::Interfaces::Foo::Signals::Dummy::ArgumentType received2 = -1;
114114
115 // server ready115 // server ready
116 EXPECT_EQ(1,116 EXPECT_EQ(std::uint32_t(1),
117 server_is_running.wait_for_signal_ready_for(std::chrono::milliseconds{500}));117 server_is_running.wait_for_signal_ready_for(std::chrono::milliseconds{500}));
118118
119 auto stub_service = dbus::Service::use_service(bus, dbus::traits::Service<test::Service>::interface_name());119 auto stub_service = dbus::Service::use_service(bus, dbus::traits::Service<test::Service>::interface_name());
@@ -141,8 +141,8 @@
141 if (t.joinable())141 if (t.joinable())
142 t.join();142 t.join();
143143
144 EXPECT_EQ(received1, 1);144 EXPECT_EQ(std::uint32_t(1), received1);
145 EXPECT_EQ(received2, 2);145 EXPECT_EQ(std::uint32_t(2), received2);
146146
147 return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;147 return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
148 };148 };
@@ -170,7 +170,7 @@
170 std::thread t{[bus](){ bus->run(); }};170 std::thread t{[bus](){ bus->run(); }};
171171
172 server_is_running.try_signal_ready_for(std::chrono::milliseconds{1000});172 server_is_running.try_signal_ready_for(std::chrono::milliseconds{1000});
173 EXPECT_EQ(1,173 EXPECT_EQ(std::uint32_t(1),
174 client_has_setup_signals_and_connections.wait_for_signal_ready_for(174 client_has_setup_signals_and_connections.wait_for_signal_ready_for(
175 std::chrono::milliseconds{500}));175 std::chrono::milliseconds{500}));
176176
@@ -204,7 +204,7 @@
204 test::Service::Interfaces::Foo::Signals::Bar::ArgumentType received2 = -1;204 test::Service::Interfaces::Foo::Signals::Bar::ArgumentType received2 = -1;
205205
206 // server ready206 // server ready
207 EXPECT_EQ(1,207 EXPECT_EQ(std::uint32_t(1),
208 server_is_running.wait_for_signal_ready_for(std::chrono::milliseconds{500}));208 server_is_running.wait_for_signal_ready_for(std::chrono::milliseconds{500}));
209209
210 auto stub_service = dbus::Service::use_service(bus, dbus::traits::Service<test::Service>::interface_name());210 auto stub_service = dbus::Service::use_service(bus, dbus::traits::Service<test::Service>::interface_name());
@@ -231,8 +231,8 @@
231 if (t.joinable())231 if (t.joinable())
232 t.join();232 t.join();
233233
234 EXPECT_EQ(received1, 1);234 EXPECT_EQ(std::uint32_t(1), received1);
235 EXPECT_EQ(received2, 2);235 EXPECT_EQ(std::uint32_t(2), received2);
236236
237 return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;237 return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
238 };238 };
@@ -260,7 +260,7 @@
260 std::thread t{[bus](){ bus->run(); }};260 std::thread t{[bus](){ bus->run(); }};
261261
262 server_is_running.try_signal_ready_for(std::chrono::milliseconds{1000});262 server_is_running.try_signal_ready_for(std::chrono::milliseconds{1000});
263 EXPECT_EQ(1,263 EXPECT_EQ(std::uint32_t(1),
264 client_has_setup_signals_and_connections.wait_for_signal_ready_for(264 client_has_setup_signals_and_connections.wait_for_signal_ready_for(
265 std::chrono::milliseconds{500}));265 std::chrono::milliseconds{500}));
266266
@@ -296,7 +296,7 @@
296 test::Service::Interfaces::Foo::Signals::Dummy::ArgumentType received2 = -1;296 test::Service::Interfaces::Foo::Signals::Dummy::ArgumentType received2 = -1;
297297
298 // server ready298 // server ready
299 EXPECT_EQ(1,299 EXPECT_EQ(std::uint32_t(1),
300 server_is_running.wait_for_signal_ready_for(std::chrono::milliseconds{500}));300 server_is_running.wait_for_signal_ready_for(std::chrono::milliseconds{500}));
301301
302 auto stub_service = dbus::Service::use_service(bus, dbus::traits::Service<test::Service>::interface_name());302 auto stub_service = dbus::Service::use_service(bus, dbus::traits::Service<test::Service>::interface_name());
@@ -323,8 +323,8 @@
323 if (t.joinable())323 if (t.joinable())
324 t.join();324 t.join();
325325
326 EXPECT_EQ(received1, 1);326 EXPECT_EQ(std::uint32_t(1), received1);
327 EXPECT_EQ(received2, 1);327 EXPECT_EQ(std::uint32_t(1), received2);
328328
329 return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;329 return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
330 };330 };
331331
=== modified file 'tests/stl_codec_test.cpp'
--- tests/stl_codec_test.cpp 2014-01-20 22:04:16 +0000
+++ tests/stl_codec_test.cpp 2014-02-06 11:19:51 +0000
@@ -89,7 +89,7 @@
89 std::map<std::string, dbus::types::Variant> result;89 std::map<std::string, dbus::types::Variant> result;
90 msg->reader() >> result;90 msg->reader() >> result;
9191
92 EXPECT_EQ(5, result.size());92 EXPECT_EQ(std::uint32_t(5), result.size());
9393
94 for (const auto& element : result)94 for (const auto& element : result)
95 {95 {

Subscribers

People subscribed via source and target branches