~brandontschaefer/mir/first-round-deprecation

« back to all changes in this revision

Viewing changes to tests/mir_test/display_config_matchers.cpp

Committer: Brandon Schaefer
Date: 2016-12-13 17:59:30 UTC
mfrom: (3787.1.93 development-branch)
Revision ID: brandon.schaefer@canonical.com-20161213175930-j9o7qn0b11n3kzlm

* Merge trunk, fix conflicts

files added:
include/client/mir_toolkit/extensions

include/client/mir_toolkit/extensions/mesa_drm_auth.h

include/client/mir_toolkit/extensions/set_gbm_device.h

include/client/mir_toolkit/mir_extension_core.h

include/common/mir/posix_rw_mutex.h

include/server/mir/executor.h

include/server/mir/observer_registrar.h

include/test/mir_test_framework/stub_platform_extension.h

playground/diamond.c

playground/diamond.h

playground/egldiamond_render_surface.c

playground/mir_egl_platform_shim.c

playground/mir_egl_platform_shim.h

playground/render_surface.cpp

src/capnproto

src/capnproto/CMakeLists.txt

src/capnproto/mir_event.capnp

src/client/buffer_stream_configuration.cpp

src/client/buffer_stream_configuration.h

src/client/error_render_surface.cpp

src/client/error_render_surface.h

src/client/handle_event_exception.h

src/client/mir_extension_core.cpp

src/common/events/pointer_event.cpp

src/include/client/mir_toolkit/extensions

src/include/client/mir_toolkit/extensions/android_buffer.h

src/include/client/mir_toolkit/extensions/android_egl.h

src/include/common/mir/events/pointer_event.h

src/include/server/mir/observer_multiplexer.h

src/server/frontend/protobuf_input_converter.cpp

src/server/frontend/protobuf_input_converter.h

src/server/frontend/session_mediator_observer_multiplexer.cpp

src/server/frontend/session_mediator_observer_multiplexer.h

src/server/graphics/display_configuration_observer_multiplexer.cpp

src/server/graphics/display_configuration_observer_multiplexer.h

src/server/input/seat_observer_multiplexer.cpp

src/server/input/seat_observer_multiplexer.h

src/server/report/reports.cpp

src/server/report/reports.h

tests/acceptance-tests/buffer_stream_arrangement.h

tests/acceptance-tests/staging

tests/acceptance-tests/staging/CMakeLists.txt

tests/acceptance-tests/staging/test_buffer_stream_arrangement.cpp

tests/acceptance-tests/test_client_extensions.cpp

tests/include/mir/test/doubles/mock_mesa_auth_extensions.h

tests/unit-tests/client/test_mir_render_surface.cpp

tests/unit-tests/test_observer_multiplexer.cpp

tests/unit-tests/test_posix_timestamp.cpp

files removed:
include/common/mir/posix_rw_mutex.h

src/include/server/mir/frontend/unsupported_feature_exception.h

files renamed:
debian/libmirserver42.install => debian/libmirserver43.install

include/server/mir/frontend/session_mediator_report.h => include/server/mir/frontend/session_mediator_observer.h

include/server/mir/graphics/display_configuration_report.h => include/server/mir/graphics/display_configuration_observer.h

include/server/mir/input/seat_report.h => include/server/mir/input/seat_observer.h

src/common/events/motion_event.cpp => src/common/events/touch_event.cpp

src/client/mir_buffer.h => src/include/client/mir/mir_buffer.h

src/client/client_buffer_stream.h => src/include/client/mir/mir_buffer_stream.h

src/include/common/mir/events/motion_event.h => src/include/common/mir/events/touch_event.h

tests/acceptance-tests/throwback/test_presentation_chain.cpp => tests/acceptance-tests/staging/test_presentation_chain.cpp

tests/acceptance-tests/throwback/test_render_surface.cpp => tests/acceptance-tests/staging/test_render_surface.cpp

tests/include/mir/test/doubles/mock_client_buffer_stream.h => tests/include/mir/test/doubles/mock_mir_buffer_stream.h

files modified:
CMakeLists.txt

cmake/FindGtestGmock.cmake

cmake/LinuxCrossCompile.cmake

cmake/MirCommon.cmake

cross-compile-chroot.sh

debian/control

debian/libmirclient-dev.install

debian/rules

examples/cursors_demo_client.c

examples/eglapp.c

examples/eglapp.h

examples/pointer_confinement.c

examples/render_surfaces.cpp

examples/server_example_canonical_window_manager.cpp

examples/server_example_window_management_info.cpp

examples/server_example_window_management_info.h

include/client/mir/events/event_builders.h

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/events/event.h

include/client/mir_toolkit/events/input_configuration_event.h

include/client/mir_toolkit/mir_buffer_stream.h

include/client/mir_toolkit/mir_cursor_configuration.h

include/client/mir_toolkit/mir_display_configuration.h

include/client/mir_toolkit/mir_input_device.h

include/client/mir_toolkit/mir_surface.h

include/common/mir/input/keymap.h

include/common/mir/time/posix_timestamp.h

include/core/mir_toolkit/common.h

include/platform/mir/graphics/display.h

include/platform/mir/graphics/display_configuration.h

include/platform/mir/input/event_builder.h

include/server/mir/frontend/buffer_stream.h

include/server/mir/main_loop.h

include/server/mir/server.h

include/server/mir/shell/display_configuration_controller.h

include/server/mir/shell/surface_specification.h

include/test/mir/test/display_config_matchers.h

include/test/mir/test/doubles/fake_display.h

include/test/mir/test/doubles/mock_egl.h

include/test/mir/test/doubles/mock_seat_report.h

include/test/mir/test/doubles/null_display.h

include/test/mir/test/event_matchers.h

include/test/mir_test_framework/fake_input_device.h

playground/CMakeLists.txt

playground/README

playground/demo-shell/window_manager.cpp

playground/mir_demo_client_chain_jumping_buffers.c

playground/mir_demo_client_prerendered_frames.c

playground/server_configuration.cpp

src/CMakeLists.txt

src/client/CMakeLists.txt

src/client/buffer.cpp

src/client/buffer.h

src/client/buffer_stream.cpp

src/client/buffer_stream.h

src/client/buffer_vault.cpp

src/client/buffer_vault.h

src/client/connection_surface_map.cpp

src/client/connection_surface_map.h

src/client/cursor_configuration.h

src/client/display_configuration.h

src/client/display_configuration_api.cpp

src/client/error_buffer.cpp

src/client/error_buffer.h

src/client/error_chain.cpp

src/client/error_chain.h

src/client/error_stream.cpp

src/client/error_stream.h

src/client/event.cpp

src/client/event_printer.cpp

src/client/events/event_builders.cpp

src/client/input/CMakeLists.txt

src/client/input/android/android_input_receiver.cpp

src/client/input/android/event_conversion_helpers.cpp

src/client/input/input_devices.cpp

src/client/input/input_event.cpp

src/client/input/xkb_mapper.cpp

src/client/mir_buffer_api.cpp

src/client/mir_buffer_stream_api.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_connection_api.cpp

src/client/mir_cookie.cpp

src/client/mir_cookie.h

src/client/mir_cursor_api.cpp

src/client/mir_debug_api.cpp

src/client/mir_input_device_api.cpp

src/client/mir_presentation_chain.h

src/client/mir_presentation_chain_api.cpp

src/client/mir_render_surface.h

src/client/mir_render_surface_api.cpp

src/client/mir_screencast.cpp

src/client/mir_screencast.h

src/client/mir_screencast_api.cpp

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/mirclient.pc.in

src/client/no_tls_future-inl.h

src/client/presentation_chain.cpp

src/client/presentation_chain.h

src/client/render_surface.cpp

src/client/render_surface.h

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/screencast_stream.cpp

src/client/screencast_stream.h

src/client/surface_map.h

src/client/symbols.map

src/common/CMakeLists.txt

src/common/events/CMakeLists.txt

src/common/events/close_surface_event.cpp

src/common/events/event.cpp

src/common/events/input_configuration_event.cpp

src/common/events/input_device_state_event.cpp

src/common/events/input_event.cpp

src/common/events/keyboard_event.cpp

src/common/events/keymap_event.cpp

src/common/events/orientation_event.cpp

src/common/events/prompt_session_event.cpp

src/common/events/resize_event.cpp

src/common/events/surface_event.cpp

src/common/events/surface_output_event.cpp

src/common/events/surface_placement_event.cpp

src/common/output_type_names.cpp

src/common/symbols.map

src/include/client/mir/client_context.h

src/include/client/mir/client_platform.h

src/include/client/mir/egl_native_surface.h

src/include/client/mir/input/input_devices.h

src/include/client/mir_toolkit/client_types_nbs.h

src/include/client/mir_toolkit/mir_buffer.h

src/include/client/mir_toolkit/mir_buffer_private.h

src/include/client/mir_toolkit/mir_presentation_chain.h

src/include/client/mir_toolkit/mir_render_surface.h

src/include/common/mir/events/close_surface_event.h

src/include/common/mir/events/event.h

src/include/common/mir/events/event_private.h

src/include/common/mir/events/input_configuration_event.h

src/include/common/mir/events/input_device_state_event.h

src/include/common/mir/events/input_event.h

src/include/common/mir/events/keyboard_event.h

src/include/common/mir/events/keymap_event.h

src/include/common/mir/events/orientation_event.h

src/include/common/mir/events/prompt_session_event.h

src/include/common/mir/events/resize_event.h

src/include/common/mir/events/surface_event.h

src/include/common/mir/events/surface_output_event.h

src/include/common/mir/events/surface_placement_event.h

src/include/common/mir/input/key_mapper.h

src/include/common/mir/input/xkb_mapper.h

src/include/platform/mir/graphics/nested_context.h

src/include/server/mir/default_server_configuration.h

src/include/server/mir/glib_main_loop.h

src/platform/graphics/CMakeLists.txt

src/platform/graphics/display_configuration.cpp

src/platforms/android/client/android_client_platform.cpp

src/platforms/android/client/android_client_platform.h

src/platforms/android/client/egl_native_surface_interpreter.cpp

src/platforms/android/server/display.cpp

src/platforms/android/server/display.h

src/platforms/android/server/display_configuration.cpp

src/platforms/android/server/fb_device.cpp

src/platforms/android/server/graphic_buffer_allocator.cpp

src/platforms/android/server/graphic_buffer_allocator.h

src/platforms/android/server/hwc_blanking_control.cpp

src/platforms/common/server/kms-utils/drm_mode_resources.cpp

src/platforms/common/server/kms-utils/drm_mode_resources.h

src/platforms/eglstream-kms/client/client_platform.cpp

src/platforms/eglstream-kms/client/client_platform.h

src/platforms/eglstream-kms/server/display.cpp

src/platforms/eglstream-kms/server/display.h

src/platforms/mesa/client/client_platform.cpp

src/platforms/mesa/client/client_platform.h

src/platforms/mesa/client/native_surface.cpp

src/platforms/mesa/server/buffer_allocator.cpp

src/platforms/mesa/server/buffer_allocator.h

src/platforms/mesa/server/kms/CMakeLists.txt

src/platforms/mesa/server/kms/display.cpp

src/platforms/mesa/server/kms/display.h

src/platforms/mesa/server/kms/display_buffer.cpp

src/platforms/mesa/server/kms/guest_platform.cpp

src/platforms/mesa/server/kms/kms_page_flipper.cpp

src/platforms/mesa/server/kms/nested_authentication.cpp

src/platforms/mesa/server/kms/nested_authentication.h

src/platforms/mesa/server/kms/real_kms_display_configuration.cpp

src/platforms/mesa/server/kms/real_kms_output.cpp

src/platforms/mesa/server/x11/graphics/display.cpp

src/platforms/mesa/server/x11/graphics/display.h

src/platforms/mesa/server/x11/graphics/display_configuration.cpp

src/platforms/mesa/server/x11/graphics/display_configuration.h

src/protobuf/mir_protobuf.proto

src/protobuf/symbols.map

src/server/CMakeLists.txt

src/server/compositor/stream.cpp

src/server/compositor/stream.h

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/frontend/default_ipc_factory.cpp

src/server/frontend/default_ipc_factory.h

src/server/frontend/event_sender.cpp

src/server/frontend/protobuf_buffer_packer.cpp

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/glib_main_loop.cpp

src/server/graphics/CMakeLists.txt

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/buffer.cpp

src/server/graphics/nested/display.cpp

src/server/graphics/nested/display.h

src/server/graphics/nested/display_buffer.cpp

src/server/graphics/nested/host_chain.h

src/server/graphics/nested/host_surface_spec.h

src/server/graphics/nested/input_platform.cpp

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/mir_client_host_connection.h

src/server/graphics/nested/native_buffer.h

src/server/graphics/nested/nested_display_configuration.cpp

src/server/input/CMakeLists.txt

src/server/input/android/input_sender.cpp

src/server/input/basic_seat.cpp

src/server/input/basic_seat.h

src/server/input/default_configuration.cpp

src/server/input/default_event_builder.cpp

src/server/input/default_event_builder.h

src/server/input/seat_input_device_tracker.cpp

src/server/input/seat_input_device_tracker.h

src/server/input/surface_input_dispatcher.cpp

src/server/report/CMakeLists.txt

src/server/report/default_server_configuration.cpp

src/server/report/logging/display_configuration_report.cpp

src/server/report/logging/display_configuration_report.h

src/server/report/logging/logging_report_factory.cpp

src/server/report/logging/seat_report.cpp

src/server/report/logging/seat_report.h

src/server/report/logging/session_mediator_report.h

src/server/report/logging_report_factory.h

src/server/report/lttng/lttng_report_factory.cpp

src/server/report/lttng/session_mediator_report.h

src/server/report/lttng/session_mediator_report_tp.h

src/server/report/lttng_report_factory.h

src/server/report/null/null_report_factory.cpp

src/server/report/null/seat_report.cpp

src/server/report/null/seat_report.h

src/server/report/null/session_mediator_report.h

src/server/report/null_report_factory.h

src/server/report/report_factory.h

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/default_configuration.cpp

src/server/scene/mediating_display_changer.cpp

src/server/scene/mediating_display_changer.h

src/server/scene/unsupported_coordinate_translator.cpp

src/server/server.cpp

src/server/shell/canonical_window_manager.cpp

src/server/symbols.map

src/utils/out.c

src/utils/vanity.c

tests/CMakeLists.txt

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_buffer_stream_arrangement.cpp

tests/acceptance-tests/test_client_cookie.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_library_callbacks.cpp

tests/acceptance-tests/test_client_platform_operation.cpp

tests/acceptance-tests/test_client_scaling.cpp

tests/acceptance-tests/test_confined_pointer.cpp

tests/acceptance-tests/test_custom_input_dispatcher.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_latency.cpp

tests/acceptance-tests/test_nested_input.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_new_display_configuration.cpp

tests/acceptance-tests/test_session_mediator_report.cpp

tests/acceptance-tests/test_surface_raise.cpp

tests/acceptance-tests/throwback/CMakeLists.txt

tests/acceptance-tests/throwback/test_client_cursor_api.cpp

tests/acceptance-tests/throwback/test_client_library_errors.cpp

tests/include/mir/test/doubles/mock_android_native_buffer.h

tests/include/mir/test/doubles/mock_buffer_stream.h

tests/include/mir/test/doubles/mock_client_context.h

tests/include/mir/test/doubles/mock_display.h

tests/include/mir/test/doubles/mock_drm.h

tests/include/mir/test/doubles/mock_egl_native_surface.h

tests/include/mir/test/doubles/mock_main_loop.h

tests/include/mir/test/doubles/mock_mir_buffer.h

tests/include/mir/test/doubles/mock_nested_context.h

tests/include/mir/test/doubles/stub_android_native_buffer.h

tests/include/mir/test/doubles/stub_buffer_stream.h

tests/include/mir/test/doubles/stub_display_server.h

tests/include/mir/test/doubles/stub_host_connection.h

tests/include/mir/test/doubles/stub_renderable.h

tests/include/mir/test/doubles/triggered_main_loop.h

tests/include/mir/test/gmock_fixes.h

tests/include/mir_test_framework/fake_input_server_configuration.h

tests/include/mir_test_framework/stub_client_platform_factory.h

tests/include/mir_test_framework/testing_server_configuration.h

tests/integration-tests/compositor/test_swapping_swappers.cpp

tests/integration-tests/input/test_single_seat_setup.cpp

tests/integration-tests/test_buffer_scheduling.cpp

tests/integration-tests/test_server_client_types.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_stale_frames.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/mir_test/display_config_matchers.cpp

tests/mir_test/test_dispatchable.cpp

tests/mir_test_doubles/fake_display.cpp

tests/mir_test_doubles/mock_drm.cpp

tests/mir_test_doubles/mock_egl.cpp

tests/mir_test_doubles/stub_display_configuration.cpp

tests/mir_test_doubles/triggered_main_loop.cpp

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_device_impl.h

tests/mir_test_framework/fake_input_server_configuration.cpp

tests/mir_test_framework/stub_client_platform_factory.cpp

tests/mir_test_framework/stubbed_graphics_platform.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/CMakeLists.txt

tests/unit-tests/client/input/test_android_input_receiver.cpp

tests/unit-tests/client/input/test_xkb_mapper.cpp

tests/unit-tests/client/test_client_buffer_stream.cpp

tests/unit-tests/client/test_client_display_conf.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_connection_resource_map.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/client/test_mir_screencast.cpp

tests/unit-tests/client/test_no_tls_future.cpp

tests/unit-tests/client/test_protobuf_rpc_channel.cpp

tests/unit-tests/client/test_screencast_stream.cpp

tests/unit-tests/client/test_stream_transport.cpp

tests/unit-tests/compositor/test_screencast_display_buffer.cpp

tests/unit-tests/compositor/test_stream.cpp

tests/unit-tests/frontend/test_event_sender.cpp

tests/unit-tests/frontend/test_protobuf_buffer_packer.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/test_default_display_configuration_policy.cpp

tests/unit-tests/graphics/test_display_configuration.cpp

tests/unit-tests/graphics/test_overlapping_output_grouping.cpp

tests/unit-tests/input/android/test_android_input_lexicon.cpp

tests/unit-tests/input/evdev/test_libinput_device.cpp

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/input/test_event_builders.cpp

tests/unit-tests/input/test_input_event.cpp

tests/unit-tests/input/test_nested_input_platform.cpp

tests/unit-tests/input/test_seat_input_device_tracker.cpp

tests/unit-tests/input/test_surface_input_dispatcher.cpp

tests/unit-tests/input/test_validator.cpp

tests/unit-tests/input/test_x11_platform.cpp

tests/unit-tests/platforms/android/CMakeLists.txt

tests/unit-tests/platforms/android/client/test_android_client_platform.cpp

tests/unit-tests/platforms/android/client/test_buffer.cpp

tests/unit-tests/platforms/android/client/test_egl_native_surface_interpreter.cpp

tests/unit-tests/platforms/android/server/test_device_detection.cpp

tests/unit-tests/platforms/android/server/test_display.cpp

tests/unit-tests/platforms/android/server/test_graphic_buffer_allocator.cpp

tests/unit-tests/platforms/android/server/test_hwc_configuration.cpp

tests/unit-tests/platforms/android/server/test_hwc_device.cpp

tests/unit-tests/platforms/android/server/test_hwc_fb_device.cpp

tests/unit-tests/platforms/android/server/test_hwc_layerlist.cpp

tests/unit-tests/platforms/android/server/test_hwc_logger.cpp

tests/unit-tests/platforms/android/server/test_hwc_wrapper.cpp

tests/unit-tests/platforms/android/server/test_output_builder.cpp

tests/unit-tests/platforms/mesa/client/test_client_buffer.cpp

tests/unit-tests/platforms/mesa/client/test_client_platform.cpp

tests/unit-tests/platforms/mesa/client/test_native_surface.cpp

tests/unit-tests/platforms/mesa/kms-utils/test_drm_mode_resources.cpp

tests/unit-tests/platforms/mesa/kms/test_buffer_allocator.cpp

tests/unit-tests/platforms/mesa/kms/test_cursor.cpp

tests/unit-tests/platforms/mesa/kms/test_display.cpp

tests/unit-tests/platforms/mesa/kms/test_display_configuration.cpp

tests/unit-tests/platforms/mesa/kms/test_guest_platform.cpp

tests/unit-tests/platforms/mesa/kms/test_ipc_operations.cpp

tests/unit-tests/platforms/mesa/kms/test_nested_authentication.cpp

tests/unit-tests/platforms/mesa/kms/test_real_kms_output.cpp

tests/unit-tests/platforms/mesa/x11/test_display.cpp

tests/unit-tests/platforms/nested/test_buffer.cpp

tests/unit-tests/platforms/nested/test_ipc_operations.cpp

tests/unit-tests/platforms/nested/test_nested_display.cpp

tests/unit-tests/platforms/nested/test_nested_display_buffer.cpp

tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_mediating_display_changer.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tests/unit-tests/test_flags.cpp

tests/unit-tests/test_shared_library_prober.cpp

Show diffs side-by-side

added added

removed removed

tests/mir_test/display_config_matchers.cpp

mir_form_factor_monitor,

mir_subpixel_arrangement_unknown,

{},

mir_output_gamma_unsupported

mir_output_gamma_unsupported,

{}

};

/* Modes */

158

159

mir_form_factor_monitor,

159

160

mir_subpixel_arrangement_unknown,

160

161

{},

161

mir_output_gamma_unsupported

162

mir_output_gamma_unsupported,

163

{}

162

164

};

163

165

164

166

/* Modes */

222

224

mir_form_factor_monitor,

223

225

mir_subpixel_arrangement_unknown,

224

226

{},

225

mir_output_gamma_unsupported

227

mir_output_gamma_unsupported,

228

{}

226

229

};

227

230

228

231

/* Modes */

Older »