Merge lp://qastaging/~afrantzis/mir/abstract-host-connection into lp://qastaging/mir
Proposed by
Alexandros Frantzis
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Kevin DuBois | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 1568 | ||||
Proposed branch: | lp://qastaging/~afrantzis/mir/abstract-host-connection | ||||
Merge into: | lp://qastaging/mir | ||||
Diff against target: |
923 lines (+331/-245) 15 files modified
src/server/graphics/default_configuration.cpp (+2/-2) src/server/graphics/nested/CMakeLists.txt (+1/-1) src/server/graphics/nested/host_connection.cpp (+0/-32) src/server/graphics/nested/host_connection.h (+38/-12) src/server/graphics/nested/mir_api_wrappers.h (+0/-66) src/server/graphics/nested/mir_client_host_connection.cpp (+169/-0) src/server/graphics/nested/mir_client_host_connection.h (+60/-0) src/server/graphics/nested/nested_display.cpp (+8/-37) src/server/graphics/nested/nested_display.h (+1/-2) src/server/graphics/nested/nested_display_configuration.cpp (+9/-10) src/server/graphics/nested/nested_display_configuration.h (+7/-5) src/server/graphics/nested/nested_output.cpp (+5/-16) src/server/graphics/nested/nested_output.h (+4/-19) src/server/graphics/nested/nested_platform.cpp (+4/-38) tests/unit-tests/graphics/nested/test_nested_display_configuration.cpp (+23/-5) |
||||
To merge this branch: | bzr merge lp://qastaging/~afrantzis/mir/abstract-host-connection | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Carr (community) | Approve | ||
Alan Griffiths | Approve | ||
Kevin DuBois (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
nested: Abstract communication with host server
Description of the change
nested: Abstract communication with host server
Abstract communication with the host server to make it possible to write unit tests for the nested platform.
To post a comment you must log in.
PASSED: Continuous integration, rev:1564 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- ci/1356/ jenkins. qa.ubuntu. com/job/ mir-android- trusty- i386-build/ 1647 jenkins. qa.ubuntu. com/job/ mir-clang- trusty- amd64-build/ 1645 jenkins. qa.ubuntu. com/job/ mir-mediumtests -trusty- touch/1220 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- amd64-ci/ 1088 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- amd64-ci/ 1088/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- armhf-ci/ 1093 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- armhf-ci/ 1093/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- trusty- armhf/1221 jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- trusty- armhf/1221/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -runner- mako/1129 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 6166
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- team-mir- development- branch- ci/1356/ rebuild
http://