~ci-train-bot/mir/mir-ubuntu-artful-2983

« back to all changes in this revision

Viewing changes to tests/include/mir_test_framework/stubbed_server_configuration.h

Committer: Daniel van Vugt
Date: 2016-08-09 08:13:02 UTC
mfrom: (1160.2470.34 trunk)
mto: (1160.2470.146 development-branch)
mto: This revision was merged to the branch mainline in revision 1293.
Revision ID: daniel.van.vugt@canonical.com-20160809081302-zs2h8y6ubnn4f2uc

Merge latest trunk

files added:
debian/libmirrenderer-dev.install

examples/pointer_confinement.c

include/renderer

include/renderer/mir

include/renderer/mir/renderer

include/renderers/gl/mir/renderer/gl/context.h

include/renderers/gl/mir/renderer/gl/context_source.h

include/server/mir/input/seat_report.h

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

src/renderer

src/renderer/CMakeLists.txt

src/renderer/mirrenderer.pc.in

src/server/graphics/nested/platform.cpp

src/server/graphics/nested/platform.h

src/server/report/logging/seat_report.cpp

src/server/report/logging/seat_report.h

src/server/report/null/seat_report.cpp

src/server/report/null/seat_report.h

tests/unit-tests/client/test_no_tls_future.cpp

files removed:
include/platform/mir/graphics/gl_context.h

files renamed:
debian/libmirplatform13.install => debian/libmirplatform14.install

debian/mir-platform-graphics-android10.install => debian/mir-platform-graphics-android11.install

debian/mir-platform-graphics-mesa-kms10.install => debian/mir-platform-graphics-mesa-kms11.install

debian/mir-platform-graphics-mesa-x10.install => debian/mir-platform-graphics-mesa-x11.install

src/include/server/mir/compositor/renderer.h => include/renderer/mir/renderer/renderer.h

src/include/server/mir/compositor/renderer_factory.h => include/renderer/mir/renderer/renderer_factory.h

files modified:
.bzrignore

CMakeLists.txt

benchmarks/frame-uniformity/CMakeLists.txt

cmake/MirCommon.cmake

cross-compile-chroot.sh

debian/control

debian/rules

doc/component_reports.md

doc/measuring_latency.md

examples/CMakeLists.txt

examples/render_surfaces.cpp

examples/server_example_canonical_window_manager.cpp

examples/tooltip.c

include/client/mir_toolkit/events/input/input_event.h

include/client/mir_toolkit/events/input/keyboard_event.h

include/client/mir_toolkit/events/input/pointer_event.h

include/client/mir_toolkit/events/input/touch_event.h

include/client/mir_toolkit/mir_surface.h

include/platform/mir/graphics/display.h

include/server/mir/scene/surface_observer.h

include/server/mir/server.h

include/server/mir/shell/abstract_shell.h

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

include/test/mir/test/doubles/null_gl_context.h

include/test/mir_test_framework/headless_test.h

include/test/mir_test_framework/placement_applying_shell.h

playground/CMakeLists.txt

playground/demo-shell/demo_shell.cpp

playground/demo-shell/window_manager.cpp

playground/demo-shell/window_manager.h

src/CMakeLists.txt

src/client/CMakeLists.txt

src/client/buffer.cpp

src/client/buffer.h

src/client/buffer_factory.cpp

src/client/buffer_stream.cpp

src/client/error_buffer.cpp

src/client/error_buffer.h

src/client/input/input_event.cpp

src/client/mir_buffer.h

src/client/mir_buffer_api.cpp

src/client/mir_surface_api.cpp

src/client/no_tls_future-inl.h

src/client/rpc/CMakeLists.txt

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/symbols.map

src/common/CMakeLists.txt

src/common/symbols.map

src/cookie/CMakeLists.txt

src/include/client/mir/client_buffer.h

src/include/client/mir_toolkit/mir_buffer.h

src/include/platform/mir/options/configuration.h

src/include/server/mir/default_server_configuration.h

src/include/server/mir/graphics/surfaceless_egl_context.h

src/include/server/mir/scene/legacy_scene_change_notification.h

src/platform/CMakeLists.txt

src/platform/options/default_configuration.cpp

src/platform/symbols.map

src/platforms/CMakeLists.txt

src/platforms/android/client/CMakeLists.txt

src/platforms/android/client/buffer.cpp

src/platforms/android/client/buffer.h

src/platforms/android/common/android_native_buffer.cpp

src/platforms/android/common/syncfence.cpp

src/platforms/android/include/android_format_conversion-inl.h

src/platforms/android/include/android_native_buffer.h

src/platforms/android/include/fence.h

src/platforms/android/include/native_buffer.h

src/platforms/android/include/sync_fence.h

src/platforms/android/server/CMakeLists.txt

src/platforms/android/server/device_quirks.cpp

src/platforms/android/server/device_quirks.h

src/platforms/android/server/display.cpp

src/platforms/android/server/display.h

src/platforms/android/server/gl_context.cpp

src/platforms/android/server/gl_context.h

src/platforms/android/server/graphic_buffer_allocator.h

src/platforms/android/server/hwc_fallback_gl_renderer.cpp

src/platforms/android/server/hwc_fallback_gl_renderer.h

src/platforms/common/server/CMakeLists.txt

src/platforms/common/server/kms-utils/CMakeLists.txt

src/platforms/common/server/shm_buffer.cpp

src/platforms/eglstream-kms/CMakeLists.txt

src/platforms/eglstream-kms/client/CMakeLists.txt

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

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

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

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

src/platforms/eglstream-kms/server/CMakeLists.txt

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

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

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

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

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

src/platforms/evdev/CMakeLists.txt

src/platforms/mesa/client/CMakeLists.txt

src/platforms/mesa/client/client_buffer.cpp

src/platforms/mesa/client/client_buffer.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/linux_virtual_terminal.cpp

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

src/platforms/mesa/server/x11/graphics/CMakeLists.txt

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

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

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

src/protobuf/CMakeLists.txt

src/renderers/gl/CMakeLists.txt

src/renderers/gl/renderer.h

src/renderers/gl/renderer_factory.cpp

src/renderers/gl/renderer_factory.h

src/server/CMakeLists.txt

src/server/compositor/compositing_screencast.cpp

src/server/compositor/default_configuration.cpp

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/default_display_buffer_compositor.h

src/server/compositor/default_display_buffer_compositor_factory.cpp

src/server/compositor/default_display_buffer_compositor_factory.h

src/server/compositor/multi_threaded_compositor.h

src/server/compositor/screencast_display_buffer.cpp

src/server/compositor/screencast_display_buffer.h

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/CMakeLists.txt

src/server/graphics/nested/display.cpp

src/server/graphics/nested/display.h

src/server/input/basic_seat.cpp

src/server/input/basic_seat.h

src/server/input/default_configuration.cpp

src/server/input/seat_input_device_tracker.cpp

src/server/input/seat_input_device_tracker.h

src/server/report/default_server_configuration.cpp

src/server/report/logging/CMakeLists.txt

src/server/report/logging/logging_report_factory.cpp

src/server/report/logging_report_factory.h

src/server/report/lttng/lttng_report_factory.cpp

src/server/report/lttng_report_factory.h

src/server/report/null/CMakeLists.txt

src/server/report/null/null_report_factory.cpp

src/server/report/null_report_factory.h

src/server/report/report_factory.h

src/server/scene/default_configuration.cpp

src/server/scene/gl_pixel_buffer.cpp

src/server/scene/gl_pixel_buffer.h

src/server/server.cpp

src/server/shell/abstract_shell.cpp

src/server/shell/canonical_window_manager.cpp

src/server/symbols.map

tests/CMakeLists.txt

tests/acceptance-tests/server_configuration_options.cpp

tests/acceptance-tests/test_client_surfaces.cpp

tests/acceptance-tests/test_confined_pointer.cpp

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

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

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

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

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

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

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

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

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

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

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

tests/include/mir_test_framework/stubbed_server_configuration.h

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/test_mirsurface.cpp

tests/integration-tests/graphics/mesa/CMakeLists.txt

tests/integration-tests/input/test_single_seat_setup.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_stale_frames.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/executable_path.cpp

tests/mir_test_framework/placement_applying_shell.cpp

tests/mir_test_framework/stubbed_graphics_platform.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/mirtest.pc.in

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/CMakeLists.txt

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

tests/unit-tests/client/test_aging_buffer.cpp

tests/unit-tests/client/test_buffer_vault.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/graphics/android/test_device_detection.cpp

tests/unit-tests/graphics/android/test_display_generic.cpp

tests/unit-tests/graphics/android/test_hwc_fallback_gl_renderer.cpp

tests/unit-tests/graphics/android/test_native_buffer.cpp

tests/unit-tests/graphics/android/test_sync_fence.cpp

tests/unit-tests/graphics/mesa/kms/CMakeLists.txt

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

tests/unit-tests/graphics/mesa/kms/test_display_generic.cpp

tests/unit-tests/graphics/mesa/test_ipc_operations.cpp

tests/unit-tests/graphics/mesa/x11/test_display_generic.cpp

tests/unit-tests/graphics/test_display.h

tests/unit-tests/input/test_seat_input_device_tracker.cpp

tests/unit-tests/scene/test_gl_pixel_buffer.cpp

tools/setup-partial-armhf-chroot.sh

Show diffs side-by-side

added added

removed removed

tests/include/mir_test_framework/stubbed_server_configuration.h

~StubbedServerConfiguration();

std::shared_ptr<graphics::Platform> the_graphics_platform() override;

std::shared_ptr<compositor::RendererFactory> the_renderer_factory() override;

std::shared_ptr<renderer::RendererFactory> the_renderer_factory() override;

// We override the_input_manager in the default server configuration

// to avoid starting and stopping the full android input stack for tests

// which do not leverage input.

Older »