Mir

Merge lp://qastaging/~mir-team/mir/trunk-0.1.6 into lp://qastaging/mir/0.1

trunk-0.1.6
Merge into trusty

Proposed by kevin gunn on 2014-02-28

Status:	Merged
Approved by:	Daniel van Vugt on 2014-03-06
Approved revision:	no longer in the source branch.
Merged at revision:	1177
Proposed branch:	lp://qastaging/~mir-team/mir/trunk-0.1.6
Merge into:	lp://qastaging/mir/0.1
Diff against target:	19399 lines (+8125/-3470) 329 files modified CMakeLists.txt (+23/-15) cmake/FindXKBCOMMON.cmake (+1/-6) cmake/MirCommon.cmake (+7/-10) cmake/src/mir/mir_discover_gtest_tests.cpp (+24/-10) cross-compile-chroot.sh (+64/-22) debian/changelog (+68/-0) debian/control (+72/-8) debian/create_postinst_prerm_scripts.sh (+30/-0) debian/install_ld_so_conf.sh (+18/-0) debian/libmirclientplatform-android.install (+1/-0) debian/libmirclientplatform-mesa.install (+1/-0) debian/libmirplatform.install (+0/-1) debian/libmirplatformgraphics-android.install (+1/-0) debian/libmirplatformgraphics-mesa.install (+1/-0) debian/libmirserver16.install (+1/-1) debian/rules (+20/-10) debian/update-alternatives.postinst.in (+18/-0) debian/update-alternatives.prerm.in (+16/-0) doc/component_reports.md (+5/-5) examples/CMakeLists.txt (+14/-3) examples/basic_server_configuration.cpp (+13/-7) examples/demo-shell/demo_shell.cpp (+14/-7) examples/render_overlays.cpp (+135/-0) examples/render_surfaces.cpp (+34/-14) examples/render_to_fb.cpp (+0/-1) examples/scroll.cpp (+1/-1) examples/server_configuration.cpp (+10/-4) examples/server_configuration.h (+7/-1) guides/cppguide.xml (+7/-6) include/platform/mir/abnormal_exit.h (+3/-3) include/platform/mir/graphics/drm_authenticator.h (+1/-3) include/platform/mir/options/configuration.h (+74/-0) include/platform/mir/options/default_configuration.h (+40/-75) include/platform/mir/udev/wrapper.h (+2/-1) include/server/mir/compositor/compositor_report.h (+0/-11) include/server/mir/default_server_configuration.h (+18/-7) include/server/mir/frontend/connector_report.h (+0/-15) include/server/mir/frontend/session_mediator_report.h (+0/-24) include/server/mir/input/surface.h (+1/-1) include/server/mir/report/legacy_input_report.h (+39/-0) include/server/mir/scene/scene_report.h (+7/-18) include/shared/mir/report/lttng/mir_tracepoint.h (+1/-2) include/shared/mir/report/lttng/tracepoint_provider.h (+6/-3) include/shared/mir/shared_library.h (+3/-3) include/test/mir_test/draw/graphics_region_factory.h (+18/-27) include/test/mir_test/draw/patterns.h (+1/-1) include/test/mir_test_doubles/mock_display_device.h (+1/-0) include/test/mir_test_doubles/mock_drm.h (+1/-0) include/test/mir_test_doubles/mock_gl.h (+2/-0) include/test/mir_test_doubles/mock_hwc_composer_device_1.h (+2/-0) include/test/mir_test_doubles/mock_input_surface.h (+2/-2) include/test/mir_test_doubles/mock_renderer.h (+8/-6) include/test/mir_test_doubles/stub_display_builder.h (+41/-27) include/test/mir_test_doubles/stub_display_configuration.h (+2/-2) include/test/mir_test_doubles/stub_renderer.h (+65/-0) include/test/mir_test_doubles/stub_surface_builder.h (+7/-6) include/test/mir_test_framework/udev_environment.h (+12/-2) src/client/CMakeLists.txt (+9/-33) src/client/android/CMakeLists.txt (+38/-0) src/client/android/android_client_platform.cpp (+0/-7) src/client/android/client_platform_factory.cpp (+34/-0) src/client/android/client_platform_factory.h (+41/-0) src/client/client_platform_factory.h (+8/-3) src/client/default_connection_configuration.cpp (+31/-2) src/client/lttng/CMakeLists.txt (+4/-7) src/client/lttng/client_tracepoint_provider.h (+2/-2) src/client/lttng/input_receiver_report.cpp (+65/-0) src/client/lttng/input_receiver_report.h (+46/-0) src/client/lttng/input_receiver_report_tp.h (+96/-0) src/client/lttng/rpc_report.cpp (+1/-1) src/client/lttng/rpc_report_tp.c (+0/-4) src/client/lttng/tracepoints.c (+5/-0) src/client/mesa/CMakeLists.txt (+40/-0) src/client/mesa/client_platform.cpp (+1/-39) src/client/mesa/client_platform_factory.cpp (+71/-0) src/client/mesa/client_platform_factory.h (+41/-0) src/client/mesa/native_surface.cpp (+12/-2) src/client/mesa/native_surface.h (+1/-0) src/client/mir_client_library.cpp (+1/-2) src/client/mir_connection.cpp (+3/-2) src/client/mir_screencast_api.cpp (+1/-1) src/client/native_client_platform_factory.h (+0/-49) src/platform/CMakeLists.txt (+1/-0) src/platform/graphics/CMakeLists.txt (+2/-3) src/platform/graphics/android/CMakeLists.txt (+21/-3) src/platform/graphics/android/android_display.cpp (+4/-23) src/platform/graphics/android/android_display.h (+3/-7) src/platform/graphics/android/android_display_configuration.cpp (+3/-19) src/platform/graphics/android/android_display_configuration.h (+1/-1) src/platform/graphics/android/android_platform.cpp (+1/-1) src/platform/graphics/android/configurable_display_buffer.h (+43/-0) src/platform/graphics/android/display_buffer.cpp (+65/-8) src/platform/graphics/android/display_buffer.h (+8/-3) src/platform/graphics/android/display_builder.h (+2/-5) src/platform/graphics/android/display_device.h (+1/-0) src/platform/graphics/android/fb_device.cpp (+5/-0) src/platform/graphics/android/fb_device.h (+1/-0) src/platform/graphics/android/hwc_common_device.cpp (+6/-3) src/platform/graphics/android/hwc_common_device.h (+1/-0) src/platform/graphics/android/hwc_device.cpp (+28/-16) src/platform/graphics/android/hwc_device.h (+2/-1) src/platform/graphics/android/hwc_fb_device.cpp (+24/-12) src/platform/graphics/android/hwc_fb_device.h (+1/-0) src/platform/graphics/android/hwc_layerlist.cpp (+117/-43) src/platform/graphics/android/hwc_layerlist.h (+33/-8) src/platform/graphics/android/hwc_layers.cpp (+96/-94) src/platform/graphics/android/hwc_layers.h (+32/-38) src/platform/graphics/android/output_builder.cpp (+4/-10) src/platform/graphics/android/output_builder.h (+2/-3) src/platform/graphics/mesa/CMakeLists.txt (+19/-3) src/platform/graphics/mesa/display.cpp (+11/-0) src/platform/graphics/mesa/display_buffer.cpp (+72/-31) src/platform/graphics/mesa/display_buffer.h (+4/-1) src/platform/graphics/mesa/display_helpers.cpp (+8/-1) src/platform/graphics/mesa/platform.cpp (+1/-1) src/platform/graphics/mesa/platform.h (+1/-1) src/platform/options/CMakeLists.txt (+1/-0) src/platform/options/default_configuration.cpp (+105/-100) src/platform/options/program_option.cpp (+3/-3) src/platform/udev_wrapper.cpp (+16/-0) src/server/CMakeLists.txt (+5/-5) src/server/compositor/CMakeLists.txt (+2/-1) src/server/compositor/compositing_screencast.cpp (+176/-0) src/server/compositor/compositing_screencast.h (+74/-0) src/server/compositor/default_configuration.cpp (+9/-21) src/server/compositor/default_display_buffer_compositor.cpp (+2/-1) src/server/compositor/gl_renderer.cpp (+56/-23) src/server/compositor/gl_renderer.h (+6/-1) src/server/compositor/gl_renderer_factory.cpp (+0/-8) src/server/compositor/gl_renderer_factory.h (+0/-5) src/server/compositor/multi_threaded_compositor.cpp (+1/-1) src/server/compositor/renderer.h (+5/-1) src/server/compositor/screencast_display_buffer.cpp (+110/-0) src/server/compositor/screencast_display_buffer.h (+85/-0) src/server/compositor/switching_bundle.cpp (+33/-7) src/server/compositor/switching_bundle.h (+5/-1) src/server/default_server_configuration.cpp (+15/-79) src/server/frontend/CMakeLists.txt (+0/-9) src/server/frontend/default_configuration.cpp (+4/-7) src/server/frontend/published_socket_connector.cpp (+1/-41) src/server/frontend/published_socket_connector.h (+0/-3) src/server/frontend/session_mediator.cpp (+43/-2) src/server/frontend/session_mediator_android.cpp (+0/-44) src/server/frontend/session_mediator_mesa.cpp (+0/-68) src/server/graphics/default_configuration.cpp (+23/-13) src/server/graphics/nested/nested_display.cpp (+2/-1) src/server/input/CMakeLists.txt (+0/-1) src/server/input/android/android_input_window_handle.cpp (+1/-1) src/server/input/default_configuration.cpp (+11/-7) src/server/logging/CMakeLists.txt (+23/-0) src/server/logging/default_configuration.cpp (+0/-108) src/server/lttng/input_report_tp.c (+0/-4) src/server/lttng/message_processor_report_tp.c (+0/-4) src/server/report/CMakeLists.txt (+10/-0) src/server/report/default_server_configuration.cpp (+119/-0) src/server/report/logging/CMakeLists.txt (+2/-2) src/server/report/logging/compositor_report.cpp (+18/-21) src/server/report/logging/compositor_report.h (+18/-13) src/server/report/logging/connector_report.cpp (+17/-16) src/server/report/logging/connector_report.h (+11/-5) src/server/report/logging/display_report.cpp (+57/-56) src/server/report/logging/display_report.h (+11/-5) src/server/report/logging/input_report.cpp (+16/-13) src/server/report/logging/input_report.h (+12/-11) src/server/report/logging/logging_report_factory.cpp (+75/-0) src/server/report/logging/message_processor_report.cpp (+17/-16) src/server/report/logging/message_processor_report.h (+12/-7) src/server/report/logging/scene_report.cpp (+75/-82) src/server/report/logging/scene_report.h (+17/-13) src/server/report/logging/session_mediator_report.cpp (+45/-45) src/server/report/logging/session_mediator_report.h (+14/-7) src/server/report/logging_report_factory.h (+59/-0) src/server/report/lttng/CMakeLists.txt (+9/-14) src/server/report/lttng/compositor_report.cpp (+49/-0) src/server/report/lttng/compositor_report.h (+52/-0) src/server/report/lttng/compositor_report_tp.h (+76/-0) src/server/report/lttng/connector_report.cpp (+65/-0) src/server/report/lttng/connector_report.h (+58/-0) src/server/report/lttng/connector_report_tp.h (+68/-0) src/server/report/lttng/display_report.cpp (+57/-0) src/server/report/lttng/display_report.h (+60/-0) src/server/report/lttng/display_report_tp.h (+69/-0) src/server/report/lttng/input_report.cpp (+7/-6) src/server/report/lttng/input_report.h (+16/-12) src/server/report/lttng/input_report_tp.h (+3/-16) src/server/report/lttng/lttng_report_factory.cpp (+64/-0) src/server/report/lttng/lttng_utils.h (+47/-0) src/server/report/lttng/lttng_utils_pop.h (+22/-0) src/server/report/lttng/message_processor_report.cpp (+27/-23) src/server/report/lttng/message_processor_report.h (+8/-4) src/server/report/lttng/message_processor_report_tp.h (+58/-22) src/server/report/lttng/scene_report.cpp (+44/-0) src/server/report/lttng/scene_report.h (+48/-0) src/server/report/lttng/scene_report_tp.h (+59/-0) src/server/report/lttng/server_tracepoint_provider.cpp (+2/-2) src/server/report/lttng/server_tracepoint_provider.h (+5/-2) src/server/report/lttng/session_mediator_report.cpp (+46/-0) src/server/report/lttng/session_mediator_report.h (+53/-0) src/server/report/lttng/session_mediator_report_tp.h (+68/-0) src/server/report/lttng/tracepoints.c (+10/-0) src/server/report/lttng_report_factory.h (+43/-0) src/server/report/null/CMakeLists.txt (+12/-0) src/server/report/null/compositor_report.cpp (+25/-25) src/server/report/null/compositor_report.h (+46/-0) src/server/report/null/connector_report.cpp (+31/-0) src/server/report/null/connector_report.h (+50/-0) src/server/report/null/display_report.cpp (+18/-18) src/server/report/null/display_report.h (+25/-22) src/server/report/null/input_report.cpp (+17/-17) src/server/report/null/input_report.h (+11/-8) src/server/report/null/message_processor_report.cpp (+26/-26) src/server/report/null/message_processor_report.h (+10/-7) src/server/report/null/null_report_factory.cpp (+92/-0) src/server/report/null/scene_report.cpp (+36/-0) src/server/report/null/scene_report.h (+51/-0) src/server/report/null/session_mediator_report.cpp (+35/-35) src/server/report/null/session_mediator_report.h (+64/-0) src/server/report/null_report_factory.h (+51/-0) src/server/report/report_factory.h (+72/-0) src/server/scene/CMakeLists.txt (+0/-2) src/server/scene/application_session.cpp (+4/-1) src/server/scene/basic_surface.cpp (+155/-40) src/server/scene/basic_surface.h (+62/-40) src/server/scene/default_configuration.cpp (+1/-38) src/server/scene/mutable_surface_state.h (+5/-5) src/server/scene/session_manager.cpp (+2/-0) src/server/scene/surface_allocator.cpp (+9/-7) src/server/scene/surface_data.cpp (+0/-194) src/server/scene/surface_data.h (+0/-82) src/server/scene/surface_impl.cpp (+1/-1) src/server/scene/surface_stack.cpp (+6/-6) src/shared/CMakeLists.txt (+3/-2) src/shared/graphics/android/CMakeLists.txt (+2/-0) src/shared/report/lttng/tracepoint_provider.cpp (+3/-3) src/shared/sharedlibrary/CMakeLists.txt (+19/-0) src/shared/sharedlibrary/shared_library.cpp (+3/-3) src/utils/screencast.cpp (+59/-43) tests/CMakeLists.txt (+3/-2) tests/acceptance-tests/test_client_authorization.cpp (+2/-0) tests/acceptance-tests/test_client_input.cpp (+0/-5) tests/acceptance-tests/test_nested_mir.cpp (+6/-1) tests/acceptance-tests/test_server_shutdown.cpp (+4/-28) tests/draw/CMakeLists.txt (+9/-7) tests/draw/android_graphics_region_factory.cpp (+53/-47) tests/draw/mesa_graphics_region_factory.cpp (+42/-0) tests/integration-tests/CMakeLists.txt (+3/-2) tests/integration-tests/client/CMakeLists.txt (+1/-1) tests/integration-tests/client/test_client_render.cpp (+9/-10) tests/integration-tests/compositor/test_swapping_swappers.cpp (+38/-36) tests/integration-tests/frontend/test_application_mediator_report.cpp (+7/-1) tests/integration-tests/graphics/android/test_buffer_integration.cpp (+6/-4) tests/integration-tests/graphics/android/test_display_integration.cpp (+0/-1) tests/integration-tests/graphics/android/test_internal_client.cpp (+5/-3) tests/integration-tests/graphics/mesa/test_buffer_integration.cpp (+5/-2) tests/integration-tests/input/CMakeLists.txt (+1/-1) tests/integration-tests/input/android/test_android_cursor_listener.cpp (+4/-2) tests/integration-tests/input/android/test_android_input_manager.cpp (+4/-3) tests/integration-tests/test_session.cpp (+3/-18) tests/integration-tests/test_surface_first_frame_sync.cpp (+2/-13) tests/mir_test_doubles/CMakeLists.txt (+2/-2) tests/mir_test_doubles/mock_drm.cpp (+7/-4) tests/mir_test_doubles/mock_gl.cpp (+13/-0) tests/mir_test_doubles/test_protobuf_socket_server.cpp (+5/-4) tests/mir_test_framework/stubbed_server_configuration.cpp (+17/-28) tests/mir_test_framework/testing_client_options.cpp (+2/-2) tests/mir_test_framework/udev_environment.cpp (+28/-14) tests/unit-tests/CMakeLists.txt (+3/-0) tests/unit-tests/android_input/input_reader.cpp (+7/-7) tests/unit-tests/client/CMakeLists.txt (+2/-2) tests/unit-tests/client/android/test_android_client_platform.cpp (+3/-3) tests/unit-tests/client/mesa/test_client_platform.cpp (+5/-5) tests/unit-tests/client/mesa/test_native_surface.cpp (+20/-0) tests/unit-tests/client/test_client_platform.cpp (+8/-11) tests/unit-tests/client/test_mir_connection.cpp (+8/-0) tests/unit-tests/compositor/CMakeLists.txt (+2/-0) tests/unit-tests/compositor/test_compositing_screencast.cpp (+281/-0) tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp (+28/-15) tests/unit-tests/compositor/test_gl_renderer.cpp (+4/-5) tests/unit-tests/compositor/test_multi_threaded_compositor.cpp (+3/-2) tests/unit-tests/compositor/test_rendering_operator.cpp (+2/-2) tests/unit-tests/compositor/test_screencast_display_buffer.cpp (+169/-0) tests/unit-tests/frontend/CMakeLists.txt (+2/-2) tests/unit-tests/frontend/test_published_socket_connector.cpp (+6/-27) tests/unit-tests/frontend/test_session_mediator.cpp (+3/-2) tests/unit-tests/frontend/test_session_mediator_android.cpp (+3/-1) tests/unit-tests/frontend/test_session_mediator_mesa.cpp (+7/-4) tests/unit-tests/graphics/CMakeLists.txt (+2/-2) tests/unit-tests/graphics/android/test_android_fb.cpp (+23/-52) tests/unit-tests/graphics/android/test_android_platform.cpp (+4/-3) tests/unit-tests/graphics/android/test_fb_device.cpp (+11/-5) tests/unit-tests/graphics/android/test_hwc_common_device.cpp (+14/-34) tests/unit-tests/graphics/android/test_hwc_device.cpp (+2/-0) tests/unit-tests/graphics/android/test_hwc_display.cpp (+146/-26) tests/unit-tests/graphics/android/test_hwc_layerlist.cpp (+173/-54) tests/unit-tests/graphics/android/test_hwc_layers.cpp (+161/-127) tests/unit-tests/graphics/android/test_output_builder.cpp (+29/-37) tests/unit-tests/graphics/mesa/CMakeLists.txt (+1/-0) tests/unit-tests/graphics/mesa/mock_kms_output.h (+52/-0) tests/unit-tests/graphics/mesa/test_buffer_allocator.cpp (+4/-3) tests/unit-tests/graphics/mesa/test_cursor.cpp (+2/-19) tests/unit-tests/graphics/mesa/test_display.cpp (+24/-24) tests/unit-tests/graphics/mesa/test_display_buffer.cpp (+74/-11) tests/unit-tests/graphics/mesa/test_display_configuration.cpp (+4/-3) tests/unit-tests/graphics/mesa/test_display_multi_monitor.cpp (+14/-5) tests/unit-tests/graphics/mesa/test_drm_helper.cpp (+65/-0) tests/unit-tests/graphics/mesa/test_gbm_buffer.cpp (+4/-3) tests/unit-tests/graphics/mesa/test_internal_client.cpp (+1/-1) tests/unit-tests/graphics/mesa/test_kms_page_flipper.cpp (+1/-1) tests/unit-tests/graphics/mesa/test_linux_virtual_terminal.cpp (+10/-9) tests/unit-tests/graphics/mesa/test_platform.cpp (+12/-9) tests/unit-tests/graphics/offscreen/test_offscreen_display.cpp (+8/-6) tests/unit-tests/graphics/test_display.cpp (+4/-3) tests/unit-tests/graphics/test_graphics_platform.cpp (+5/-13) tests/unit-tests/input/android/test_android_input_registrar.cpp (+1/-1) tests/unit-tests/input/android/test_android_input_window_handle.cpp (+1/-1) tests/unit-tests/logging/message_processor_report.cpp (+2/-2) tests/unit-tests/logging/test_compositor_report.cpp (+4/-4) tests/unit-tests/logging/test_display_report.cpp (+3/-2) tests/unit-tests/logging/test_legacy_input_report.cpp (+4/-4) tests/unit-tests/scene/CMakeLists.txt (+1/-1) tests/unit-tests/scene/test_application_session.cpp (+67/-18) tests/unit-tests/scene/test_basic_surface.cpp (+146/-37) tests/unit-tests/scene/test_surface.cpp (+155/-35) tests/unit-tests/scene/test_surface_impl.cpp (+8/-8) tests/unit-tests/scene/test_surface_stack.cpp (+54/-34) tests/unit-tests/test_udev_wrapper.cpp (+70/-0) tools/install_on_android.sh (+1/-0) tools/setup-partial-armhf-chroot.sh (+42/-72) tools/valgrind_suppressions_armhf (+111/-0)
To merge this branch:	bzr merge lp://qastaging/~mir-team/mir/trunk-0.1.6
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel van Vugt		2014-02-28	Approve on 2014-03-06
PS Jenkins bot (community)	continuous-integration		Approve on 2014-03-05
Mir development team		2014-03-04	Pending
Review via email: mp+208717@code.qastaging.launchpad.net

Commit message

Latest upstream release of Mir 0.1.6 (lp:~mir-team/mir/development-branch r1433)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-02-28:

The diff to tagged release 0.1.6 is good. Only changelog differs.

Only mentions of last minute bugs are missing from changelog:
bug 1285955
bug 1207312

I would also recommend not cluttering the changelog with details of internal changes that users of Mir won't ever need to understand. e.g. All but one of these are meaningless to the public Mir SDK so should not be mentioned;

396 + - config, frontend: remove force_threads_to_unblock_callback()
397 + - Protect input region member of surface data, hold mutex to access
398 + hidden member.
399 + - config: ConfigurationOptions::default_ipc_threads can be a constant.
400 + - debian: Provide platform packages managed with dpkg alternatives.
401 + - Add the ability to load device traces, both udev and ioctls, in the
402 + UdevEnvironment test helper.
403 + - test_client_input.cpp: Remove unused global "mir_test_socket".
404 + - Sundry improvements to mir::udev.

That's not all. I just picked it as an example. Only line 400 would qualify as meaningful to anyone else, so release notable.

review: Needs Fixing

Revision history for this message

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

FAILED: Continuous integration, rev:1435
http://jenkins.qa.ubuntu.com/job/mir-ci/1638/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1072
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1070
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/36/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/36/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

FAILED: Continuous integration, rev:1436
http://jenkins.qa.ubuntu.com/job/mir-ci/1639/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1074
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1072
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/37/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/37/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

kevin gunn (kgunn72) wrote on 2014-02-28:

wasn't sure to include bug 1285955 as fixed, as the mp is more of a temp workaround - but i'll include that.

I'm torn about condensing the changelog - i prefer the detail. But, happy to conform to convention.
I'll take one more scrub, but then let's move on getting this in.

> The diff to tagged release 0.1.6 is good. Only changelog differs.
>
> Only mentions of last minute bugs are missing from changelog:
> bug 1285955
> bug 1207312
>
> I would also recommend not cluttering the changelog with details of internal
> changes that users of Mir won't ever need to understand. e.g. All but one of
> these are meaningless to the public Mir SDK so should not be mentioned;
>
> 396 + - config, frontend: remove force_threads_to_unblock_callback()
> 397 + - Protect input region member of surface data, hold mutex to
> access
> 398 + hidden member.
> 399 + - config: ConfigurationOptions::default_ipc_threads can be a
> constant.
> 400 + - debian: Provide platform packages managed with dpkg
> alternatives.
> 401 + - Add the ability to load device traces, both udev and ioctls, in
> the
> 402 + UdevEnvironment test helper.
> 403 + - test_client_input.cpp: Remove unused global "mir_test_socket".
> 404 + - Sundry improvements to mir::udev.
>
> That's not all. I just picked it as an example. Only line 400 would qualify as
> meaningful to anyone else, so release notable.

Revision history for this message

kevin gunn (kgunn72) wrote on 2014-02-28:

Did you test your feature/code change/bug fix ? what device(s) ?
dev branch ci testing across i386, amd64 & arm/nexus4

Did you break mir server API or ABI and have the relevant bumps to .so and debian docs been made ?
yes - libmirserver, updates have been made

Did you break mir client API or ABI and have you followed up with the known clients & announced on mir-devel mailing list ?
yes

Don't forget to check on Xorg in the case of client API break
does not break Xorg/xmir

Revision history for this message

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

FAILED: Continuous integration, rev:1437
http://jenkins.qa.ubuntu.com/job/mir-ci/1640/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1085
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1083
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/38/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/38/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

FAILED: Continuous integration, rev:1438
http://jenkins.qa.ubuntu.com/job/mir-ci/1641/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1098
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1096
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/39/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/39/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-03-04:

For bug 1285955 the "workaround" is the closest thing to a fix the Mir project will ever need. So that's definitely Fix Released for Mir in 0.1.6.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-03-04:

I think the last commit should be reverted ("updated snapshot from mir-devel r1441"). Mir 0.1.6 is r1433. Nothing newer than that should be included until it's cooled down a bit as part of the 0.1.7 cycle.

review: Needs Fixing

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-03-04:

The post-0.1.6 changes I intentionally kept out of 0.1.6 because they're large and still carry some risk. So I'll keep those back to the 0.1.7 release.

Revision history for this message

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

FAILED: Continuous integration, rev:1439
http://jenkins.qa.ubuntu.com/job/mir-ci/1642/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1099/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1097
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/40/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/40/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-03-04:

I don't quite understand how CI approved the same code (repeatedly) in development-branch but it doesn't pass here. I can only imagine it's CI that changed.

Revision history for this message

Daniel van Vugt (vanvugt) on 2014-03-04:

review: Approve

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-03-04:

The first Jenkins failure is bug 1287600. A fix has now been proposed for that :P

Revision history for this message

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

FAILED: Continuous integration, rev:1440
http://jenkins.qa.ubuntu.com/job/mir-ci/1643/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1102/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/41/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/41/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

FAILED: Continuous integration, rev:1443
http://jenkins.qa.ubuntu.com/job/mir-ci/1645/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/43/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/43/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-03-05:

Cleaned up. Now the branch contains exactly what the changelog says:

Mir 0.1.6
+ Two cherry picks from Mir 0.1.7 (one enhancement + one bug fix)
+ changelog additions.

review: Approve

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-03-05:

We should stop adding bits of Mir 0.1.7. There are large changes post-0.1.6 (that I wrote even) and it's safest if we let them cool down and mature some more over the weeks before entering distro.

Revision history for this message

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

FAILED: Continuous integration, rev:1445
http://jenkins.qa.ubuntu.com/job/mir-ci/1646/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/44/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/44/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

kevin gunn (kgunn72) wrote on 2014-03-05:

you should not be landing anything on devel you would not instantly want in archive.
devel has been treated as sacred, devel was only created as a barrier for server changes. if you need to mature items, keep a feature branch and ask for testing help.

> We should stop adding bits of Mir 0.1.7. There are large changes post-0.1.6
> (that I wrote even) and it's safest if we let them cool down and mature some
> more over the weeks before entering distro.

Revision history for this message

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

PASSED: Continuous integration, rev:1446
http://jenkins.qa.ubuntu.com/job/mir-ci/1647/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/45/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-03-06:

Feature branches are the opposite of maturing code. In a feature branch, no one other than the author is using it on a daily basis. So the maturation (testing by multiple people) never even begins.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-03-06:

The diff still looks correct, and accurately reflected in debian/changelog.

review: Approve

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

to all changes:

Gerry Boland

Mir development team

Mir

Merge lp://qastaging/~mir-team/mir/trunk-0.1.6 into lp://qastaging/mir/0.1

Commit message

Description of the change

Preview Diff

Subscribers