Mir

Merge lp:~alan-griffiths/mir/delete-dead-code into lp:mir

  1. delete-dead-code
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Merged at revision: 3101
Proposed branch: lp:~alan-griffiths/mir/delete-dead-code
Merge into: lp:mir
Diff against target: 32 lines (+1/-3)
2 files modified
include/server/mir/shell/system_compositor_window_manager.h (+1/-1)
src/include/server/mir/default_server_configuration.h (+0/-2)
To merge this branch: bzr merge lp:~alan-griffiths/mir/delete-dead-code
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Andreas Pokorny (community) Approve
Alexandros Frantzis (community) Approve
Review via email: mp+277094@code.launchpad.net

Commit message

shell, playground: PlacementStrategy was removed back in 0.14 but there were a couple of remaining mentions.

Description of the change

shell, playground: PlacementStrategy was removed back in 0.14 but there were a couple of remaining mentions.

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

FAILED: Continuous integration, rev:3094
http://jenkins.qa.ubuntu.com/job/mir-ci/5534/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4842
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3749
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4784/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/742/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1688
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1688/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/742
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/742/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4785
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4785/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7384/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25061
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/743/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

One of our current (krillin) test failures:

/bin/bash: line 1: 7219 Segmentation fault (core dumped) mir_demo_server --test-client /usr/bin/mir_demo_client_fingerpaint

Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2120/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4868
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3775
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4810/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/768/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/675
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/675/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/768
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/768/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4811
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4811/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/769/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

lgtm

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Can't access https://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4810/console to see what happened. Trying again.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2123/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4876
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3783
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4818/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/776/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/678
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/678/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/776
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/776/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4819
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4819/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/777/console

review: Needs Fixing (continuous-integration)
lp:~alan-griffiths/mir/delete-dead-code updated
3101. By Alan Griffiths

shell, playground: PlacementStrategy was removed back in 0.14 but there were a couple of remaining mentions.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/server/mir/shell/system_compositor_window_manager.h'
2--- include/server/mir/shell/system_compositor_window_manager.h 2015-10-29 22:07:47 +0000
3+++ include/server/mir/shell/system_compositor_window_manager.h 2015-11-10 09:58:02 +0000
4@@ -23,7 +23,7 @@
5
6 namespace mir
7 {
8-namespace scene { class PlacementStrategy; class SessionCoordinator; }
9+namespace scene { class SessionCoordinator; }
10 namespace shell
11 {
12 class FocusController;
13
14=== modified file 'src/include/server/mir/default_server_configuration.h'
15--- src/include/server/mir/default_server_configuration.h 2015-11-04 07:43:28 +0000
16+++ src/include/server/mir/default_server_configuration.h 2015-11-10 09:58:02 +0000
17@@ -100,7 +100,6 @@
18 class BufferStreamFactory;
19 class MediatingDisplayChanger;
20 class PixelBuffer;
21-class PlacementStrategy;
22 class SessionContainer;
23 class SessionEventSink;
24 class SessionEventHandlerRegister;
25@@ -425,7 +424,6 @@
26 CachedPtr<scene::SurfaceFactory> surface_factory;
27 CachedPtr<scene::SessionContainer> session_container;
28 CachedPtr<scene::SurfaceCoordinator> surface_coordinator;
29- CachedPtr<scene::PlacementStrategy> placement_strategy;
30 CachedPtr<scene::SessionListener> session_listener;
31 CachedPtr<scene::PixelBuffer> pixel_buffer;
32 CachedPtr<scene::SnapshotStrategy> snapshot_strategy;

Subscribers

People subscribed via source and target branches