unity-mir

Merge lp://qastaging/~alan-griffiths/unity-mir/compatibility-with-mir-changes into lp://qastaging/unity-mir

compatibility-with-mir-changes
Merge into trunk

Proposed by Alan Griffiths on 2014-03-27

Status:	Rejected
Rejected by:	Gerry Boland on 2014-05-20
Proposed branch:	lp://qastaging/~alan-griffiths/unity-mir/compatibility-with-mir-changes
Merge into:	lp://qastaging/unity-mir
Diff against target:	1243 lines (+363/-116) (has conflicts) 24 files modified src/modules/Unity/Application/application.cpp (+5/-5) src/modules/Unity/Application/application.h (+4/-4) src/modules/Unity/Application/application_manager.cpp (+15/-10) src/modules/Unity/Application/application_manager.h (+10/-8) src/modules/Unity/Application/applicationscreenshotprovider.cpp (+1/-1) src/modules/Unity/Application/inputarea.cpp (+4/-0) src/modules/Unity/Application/mirsurface.cpp (+2/-2) src/modules/Unity/Application/mirsurface.h (+3/-3) src/modules/Unity/Application/mirsurfacemanager.cpp (+13/-5) src/modules/Unity/Application/mirsurfacemanager.h (+6/-6) src/unity-mir/CMakeLists.txt (+8/-0) src/unity-mir/focussetter.cpp (+4/-3) src/unity-mir/focussetter.h (+7/-4) src/unity-mir/initialsurfaceplacementstrategy.cpp (+7/-1) src/unity-mir/initialsurfaceplacementstrategy.h (+13/-4) src/unity-mir/sessionlistener.cpp (+19/-11) src/unity-mir/sessionlistener.h (+15/-10) src/unity-mir/shellserverconfiguration.cpp (+35/-7) src/unity-mir/shellserverconfiguration.h (+22/-2) src/unity-mir/surfacecoordinator.cpp.OTHER (+86/-0) src/unity-mir/surfacecoordinator.h.OTHER (+54/-0) tests/application_manager_test.cpp (+22/-22) tests/mock_focus_controller.h (+2/-2) tests/mock_session.h (+6/-6) Text conflict in src/modules/Unity/Application/application_manager.cpp Text conflict in src/modules/Unity/Application/inputarea.cpp Text conflict in src/modules/Unity/Application/mirsurfacemanager.cpp Text conflict in src/unity-mir/CMakeLists.txt Text conflict in src/unity-mir/initialsurfaceplacementstrategy.cpp Text conflict in src/unity-mir/initialsurfaceplacementstrategy.h Text conflict in src/unity-mir/sessionlistener.cpp Text conflict in src/unity-mir/sessionlistener.h Text conflict in src/unity-mir/shellserverconfiguration.cpp Text conflict in src/unity-mir/shellserverconfiguration.h Contents conflict in src/unity-mir/surfacecoordinator.cpp Contents conflict in src/unity-mir/surfacecoordinator.h
To merge this branch:	bzr merge lp://qastaging/~alan-griffiths/unity-mir/compatibility-with-mir-changes
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Gerry Boland (community)		2014-03-27	Disapprove on 2014-05-20
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-04-10
Review via email: mp+213079@code.qastaging.launchpad.net

Commit message

Changes tracking mir development-branch (ABI 18)

Description of the change

Changes tracking mir development-branch (ABI 18)

The initial cut is actually against lp:~alan-griffiths/mir/remove-one-of-the-redundant-surface-factories (which hasn't landed yet).

Once that lands I'll try to keep this in step with further changes to development-branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-27:

FAILED: Continuous integration, rev:207
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/305/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/168/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/169/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/168/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/305/rebuild

review: Needs Fixing (continuous-integration)

lp://qastaging/~alan-griffiths/unity-mir/compatibility-with-mir-changes updated on 2014-04-02

208. By Alan Griffiths on 2014-04-01: Compatibility with lp:~alan-griffiths/mir/introducing-SurfaceObserver

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-02:

FAILED: Continuous integration, rev:208
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/306/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/169/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/170/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/169/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/306/rebuild

review: Needs Fixing (continuous-integration)

lp://qastaging/~alan-griffiths/unity-mir/compatibility-with-mir-changes updated on 2014-04-03

209. By Alan Griffiths on 2014-04-03: merge lp:unity-mir
210. By Alan Griffiths on 2014-04-03: compatibility with lp:~alan-griffiths/mir/eliminate-shell-SurfaceFactory-and-Surface
211. By Alan Griffiths on 2014-04-03: Fix inconsistent naming

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-04:

FAILED: Continuous integration, rev:211
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/308/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/171/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/172/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/171/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/308/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Gerry Boland (gerboland) wrote on 2014-04-07:

Please attach the MP checklist: https://wiki.ubuntu.com/Process/Merges/Checklists/Unity-Mir

+void SurfaceCoordinator::remove_surface(std::weak_ptr<mir::scene::Surface> const& surface)
+ DLOG("SurfaceCoordinator::destroy_surface");
Do match the debug message to the method.

Other than that, code looks fine. Am working on the functional testing now.

review: Needs Fixing

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2014-04-07:

* Are there any related MPs required for this MP to build/function as expected? Please list.

lp:~mir-team/mir/development-branch/
lp:~alan-griffiths/platform-api/compatibility-with-mir-changes

* Did you perform an exploratory manual test run of your code change and any related functionality?

No, just ran the tests

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

n/a

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-07:

FAILED: Continuous integration, rev:212
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/309/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/172/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/173/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/172/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/309/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Gerry Boland (gerboland) wrote on 2014-04-07:

In file included from /home/gerry/dev/mir/unity-mir/compatibility-with-mir-changes/src/unity-mir/sessionlistener.cpp:17:0:
/home/gerry/dev/mir/unity-mir/compatibility-with-mir-changes/src/unity-mir/sessionlistener.h:36:64: error: ‘scene’ is not a member of ‘mir’
void surface_created(mir::shell::Session&, std::shared_ptr<mir::scene::Surface> const&) override;