Mir

Merge lp://qastaging/~alan-griffiths/mir/mir-on-mir-platform into lp://qastaging/mir

  1. mir-on-mir-platform
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Work in progress
Proposed branch: lp://qastaging/~alan-griffiths/mir/mir-on-mir-platform
Merge into: lp://qastaging/mir
Diff against target: 1306 lines (+318/-225)
49 files modified
debian/control (+15/-0)
debian/mir-platform-graphics-mir13.install (+1/-0)
include/platform/mir/graphics/cursor.h (+0/-1)
include/platform/mir/graphics/gl_extensions_base.h (+3/-3)
include/platform/mir/graphics/platform.h (+14/-12)
include/platform/mir/graphics/surfaceless_egl_context.h (+3/-3)
include/test/mir/test/doubles/stub_cursor.h (+0/-1)
src/include/server/mir/default_server_configuration.h (+0/-1)
src/platform/graphics/CMakeLists.txt (+5/-1)
src/platform/graphics/gl_extensions_base.cpp (+3/-3)
src/platform/graphics/surfaceless_egl_context.cpp (+3/-3)
src/platform/symbols.map (+7/-0)
src/platforms/CMakeLists.txt (+1/-0)
src/platforms/eglstream-kms/server/platform_symbols.cpp (+2/-1)
src/platforms/mesa/server/kms/cursor.cpp (+0/-11)
src/platforms/mesa/server/kms/cursor.h (+0/-1)
src/platforms/mesa/server/kms/platform_symbols.cpp (+2/-1)
src/platforms/mesa/server/x11/graphics/graphics.cpp (+2/-1)
src/platforms/mir/CMakeLists.txt (+41/-0)
src/platforms/mir/cursor.cpp (+2/-8)
src/platforms/mir/cursor.h (+2/-4)
src/platforms/mir/display.cpp (+2/-2)
src/platforms/mir/platform.cpp (+134/-0)
src/platforms/mir/symbols.map.in (+20/-0)
src/server/CMakeLists.txt (+0/-1)
src/server/graphics/CMakeLists.txt (+0/-3)
src/server/graphics/default_configuration.cpp (+9/-74)
src/server/graphics/software_cursor.cpp (+0/-12)
src/server/graphics/software_cursor.h (+0/-1)
src/server/input/default_configuration.cpp (+0/-12)
src/server/symbols.map (+0/-1)
tests/acceptance-tests/test_nested_mir.cpp (+6/-13)
tests/include/mir/test/doubles/stub_host_connection.h (+7/-5)
tests/mir_test_framework/headless_nested_server_runner.cpp (+1/-1)
tests/mir_test_framework/platform_graphics_throw.cpp (+3/-2)
tests/mir_test_framework/stubbed_graphics_platform.cpp (+2/-1)
tests/unit-tests/graphics/test_software_cursor.cpp (+0/-19)
tests/unit-tests/input/CMakeLists.txt (+0/-1)
tests/unit-tests/platforms/mesa/kms/test_cursor.cpp (+1/-1)
tests/unit-tests/platforms/nested/CMakeLists.txt (+2/-0)
tests/unit-tests/platforms/nested/test_buffer.cpp (+5/-2)
tests/unit-tests/platforms/nested/test_host_buffer.cpp (+1/-1)
tests/unit-tests/platforms/nested/test_ipc_operations.cpp (+2/-2)
tests/unit-tests/platforms/nested/test_nested_cursor.cpp (+6/-6)
tests/unit-tests/platforms/nested/test_nested_display.cpp (+3/-3)
tests/unit-tests/platforms/nested/test_nested_display_buffer.cpp (+5/-5)
tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp (+1/-1)
tests/unit-tests/platforms/nested/test_nested_input_platform.cpp (+1/-1)
tools/update_package_abis.sh (+1/-0)
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/mir/mir-on-mir-platform
Reviewer Review Type Date Requested Status
Alan Griffiths Needs Fixing
Mir CI Bot continuous-integration Needs Fixing
Review via email: mp+325931@code.qastaging.launchpad.net

Commit message

Mir-on-Mir as a platform

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

I've seen intermittent tests failing to shutdown. Need to investigate further.

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

FAILED: Continuous integration, rev:4199
https://mir-jenkins.ubuntu.com/job/mir-ci/3458/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4719/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4873
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4862
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4862
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4862
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4756
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4756/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4756
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4756/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4756
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4756/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4756/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4756/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4756
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4756/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4756
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4756/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4756
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4756/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :
Download full text (3.2 KiB)

Yep, that's the sort of thing I saw too:

16:24:57 11: [ RUN ] NestedInput.on_add_device_observer_gets_device_added_calls_on_existing_devices
16:24:57 11: [2017-06-19 16:24:56.684528] mirserver: Starting
16:24:57 11: [2017-06-19 16:24:56.687228] mirserver: Selected driver: mir:stub-graphics (version 0.27.0)
16:24:57 11: [2017-06-19 16:24:56.874292] mirserver: Using software cursor
16:24:57 11: [2017-06-19 16:24:56.904316] mirserver: Selected input driver: mir:stub-input (version: 0.27.0)
16:24:57 11: [2017-06-19 16:24:56.929421] mirserver: Mir version 0.27.0
16:24:57 11: [2017-06-19 16:24:57.085794] mirserver: Initial display configuration:
16:24:57 11: [2017-06-19 16:24:57.086460] mirserver: CMakeFiles CTestTestfile.cmake Makefile cmake_install.cmake mir_acceptance_tests_precompiled.hpp.gch precompiled.hpp.compileflags precompiled.hpp.compileflags.processed Output 1: VGA connected, used
16:24:57 11: [2017-06-19 16:24:57.086656] mirserver: . |_ Physical size 0.0" 0x0mm
16:24:57 11: [2017-06-19 16:24:57.086807] mirserver: . |_ Power is on
16:24:57 11: [2017-06-19 16:24:57.086988] mirserver: . |_ Current mode 1920x1080 60.00Hz
16:24:57 11: [2017-06-19 16:24:57.087161] mirserver: . |_ Preferred mode 1920x1080 60.00Hz
16:24:57 11: [2017-06-19 16:24:57.087305] mirserver: . |_ Orientation normal
16:24:57 11: [2017-06-19 16:24:57.087465] mirserver: . |_ Logical size 1920x1080
16:24:57 11: [2017-06-19 16:24:57.087617] mirserver: . |_ Logical position +0+0
16:24:57 11: [2017-06-19 16:24:57.087773] mirserver: . |_ Scaling factor: 1.00
16:24:58 11: [2017-06-19 16:24:57.192869] mirserver: Starting
16:24:58 11: [2017-06-19 16:24:57.196132] mirserver: Selected driver: mir:mir (version 0.27.0)
16:24:59 11: [2017-06-19 16:24:58.279249] mirserver: Using hardware cursor
16:24:59 11: [2017-06-19 16:24:58.512087] mirserver: Selected input driver: mir:mir-input (version: 0.27.0)
16:24:59 11: [2017-06-19 16:24:58.579084] mirserver: Mir version 0.27.0
16:24:59 11: [2017-06-19 16:24:58.859170] mirserver: Initial display configuration:
16:24:59 11: [2017-06-19 16:24:58.860082] mirserver: CMakeFiles CTestTestfile.cmake Makefile cmake_install.cmake mir_acceptance_tests_precompiled.hpp.gch precompiled.hpp.compileflags precompiled.hpp.compileflags.processed Output 1: VGA connected, used
16:24:59 11: [2017-06-19 16:24:58.860288] mirserver: . |_ Physical size 0.0" 0x0mm
16:24:59 11: [2017-06-19 16:24:58.860449] mirserver: . |_ Power is on
16:24:59 11: [2017-06-19 16:24:58.860644] mirserver: . |_ Current mode 1920x1080 60.00Hz
16:24:59 11: [2017-06-19 16:24:58.860829] mirserver: . |_ Preferred mode 1920x1080 60.00Hz
16:24:59 11: [2017-06-19 16:24:58.860989] mirserver: . |_ Orientation normal
16:24:59 11: [2017-06-19 16:24:58.861159] mirserver: . |_ Logical size 1920x1080
16:24:59 11: [2017-06-19 16:24:58.861321] mirserver: . |_ Logical position +0+0
16:24:59 11: [2017-06-19 16:24:58.861488] mirserver: . |_ Scaling factor: 1.00
16:24:59 11: [2017-06-19 16:24:58.917833] mirserver: Stopping
18:54:59 debian/rules:20: recipe for target 'override_dh_auto_test' failed
18:54:59 Makefile:130: recipe for target 'test' failed
18:54:59 make[1]: *** [override_dh_auto_test] Terminated
18...

Read more...

review: Needs Fixing
Reply

Unmerged revisions

4199. By Alan Griffiths

Fix some tests of mir-on-mir cursor

4198. By Alan Griffiths

Ensure nested tests use nested platform

4197. By Alan Griffiths

Better naming for Mir-on-Mir

4196. By Alan Griffiths

merge & fixup ~kdub/mir/real-nested-platform

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