Mir

Merge lp://qastaging/~kdub/mir/fix-1549226 into lp://qastaging/mir

  1. fix-1549226
  2. Merge into development-branch
Proposed by Kevin DuBois
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 3337
Proposed branch: lp://qastaging/~kdub/mir/fix-1549226
Merge into: lp://qastaging/mir
Diff against target: 606 lines (+116/-57)
15 files modified
src/platforms/android/server/cmdstream_sync_factory.h (+6/-0)
src/platforms/android/server/device_quirks.cpp (+29/-7)
src/platforms/android/server/device_quirks.h (+1/-0)
src/platforms/android/server/display_component_factory.h (+2/-0)
src/platforms/android/server/egl_sync_factory.cpp (+5/-0)
src/platforms/android/server/hal_component_factory.cpp (+22/-10)
src/platforms/android/server/hal_component_factory.h (+9/-3)
src/platforms/android/server/platform.cpp (+12/-8)
src/platforms/android/server/platform.h (+0/-2)
tests/include/mir/test/doubles/stub_display_builder.h (+5/-0)
tests/unit-tests/graphics/android/test_device_detection.cpp (+7/-7)
tests/unit-tests/graphics/android/test_display_hotplug.cpp (+5/-0)
tests/unit-tests/graphics/android/test_output_builder.cpp (+7/-10)
tests/unit-tests/graphics/android/test_platform.cpp (+4/-8)
tests/unit-tests/graphics/android/test_server_interpreter.cpp (+2/-2)
To merge this branch: bzr merge lp://qastaging/~kdub/mir/fix-1549226
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Daniel van Vugt Approve
Cemil Azizoglu (community) Approve
Review via email: mp+287078@code.qastaging.launchpad.net

Commit message

fix: LP: #1549226 by correcting the autodetection of the arale device. Also properly connect up the the option for the eglsync quirk.

Description of the change

fix: LP: #1549226 by correcting the autodetection of the arale device. Also properly connect up the the option for the eglsync quirk.

had to do some shuffling of internal android classes, but this doesnt break ABI. Its probably worth revisiting the dependencies of the objects in the near future. (which, with the various quirks and differing HWC version requirements have gotten more complex, and could probably do with an audit/cleanup)

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3337
https://mir-jenkins.ubuntu.com/job/mir-ci/391/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/184/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/200
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/196
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/196
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/189
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/189/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/189
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/189/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/189/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/189
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/189/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/391/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

LGTM.

But couldn't the reshuffling be deferred? Would hate to see this cause a regression.

review: Approve
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

Failure is lp:1499229

Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

> LGTM.
>
> But couldn't the reshuffling be deferred? Would hate to see this cause a
> regression.

This comment was meant for the fix that goes into 0.20.1. This is fine for the trunk.

Revision history for this message
Kevin DuBois (kdub) wrote :

> Failure is lp:1499229
This one tricked me for a long time too, but if a test prior to this one has a problem with valgrind (in this case, uninitialized variable), this test will fail.

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:3338
https://mir-jenkins.ubuntu.com/job/mir-ci/392/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/185
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/201
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/197
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/197
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/190
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/190/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/190
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/190/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/190
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/190/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/190
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/190/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/392/rebuild

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Cool.

Although these would be more efficient:

26 +std::string const egl_sync_default = "default";
27 +std::string const egl_sync_force_on = "force_on";
28 +std::string const egl_sync_force_off = "force_off";

if written just as:

char const foo[] = "bar";

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/3/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/190/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/4/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/207
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/203
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/203
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/195/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/195
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/195/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/195
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/195/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/195
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/195/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Seems unrelated...?

[ FAILED ] NestedServer.named_cursor_image_changes_are_forwarded_to_host

Revision history for this message
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches