← Back to branch summary

~robertcarr/mir/send-clients-input

~robertcarr/mir/send-clients-input

« back to all changes in this revision

Viewing changes to tests/integration-tests/cucumber/test_session_management_context.cpp

Committer: Alan Griffiths
Date: 2013-03-13 09:49:17 UTC
mfrom: (467.1.27 trunk)
mto: (467.15.31 prepare-to-send-clients-input)
mto: This revision was merged to the branch mainline in revision 493.
Revision ID: alan@octopull.co.uk-20130313094917-gslfm0w6jr34g2eb

merge lp:mir (and fix compile error)

files added:
include/client

include/server

include/shared

include/shared/mir

include/shared/mir_toolkit

include/test

src/server

src/server/CMakeLists.txt

src/shared

src/shared/CMakeLists.txt

files renamed:
include/mir_toolkit/ => include/client/mir_toolkit/

include/mir/ => include/server/mir/

include/mir/draw/ => include/shared/mir/draw/

include/mir/geometry/ => include/shared/mir/geometry/

include/mir/protobuf/ => include/shared/mir/protobuf/

include/mir_toolkit/input/ => include/shared/mir_toolkit/input/

include/mir_test/ => include/test/mir_test/

include/mir_test_cucumber/ => include/test/mir_test_cucumber/

include/mir_test_doubles/ => include/test/mir_test_doubles/

include/mir_test_framework/ => include/test/mir_test_framework/

src/compositor/ => src/server/compositor/

src/default_server_configuration.cpp => src/server/default_server_configuration.cpp

src/display_server.cpp => src/server/display_server.cpp

src/frontend/ => src/server/frontend/

src/graphics/ => src/server/graphics/

src/input/ => src/server/input/

src/logging/ => src/server/logging/

src/main.cpp => src/server/main.cpp

src/mirserver.pc.in => src/server/mirserver.pc.in

src/options/ => src/server/options/

src/shell/ => src/server/shell/

src/surfaces/ => src/server/surfaces/

src/draw/ => src/shared/draw/

src/protobuf/ => src/shared/protobuf/

files modified:
CMakeLists.txt

cross-compile-chroot.sh

debian/libmirclient-demos.examples

debian/rules

examples/CMakeLists.txt

include/test/mir_test/fake_event_hub_input_configuration.h

include/test/mir_test_doubles/mock_alloc_adaptor.h

src/CMakeLists.txt

src/client/CMakeLists.txt

tests/CMakeLists.txt

tests/behavior-tests/session_management_context.cpp

tests/behavior-tests/session_manager_steps.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/cucumber/test_session_management_context.cpp

tests/integration-tests/graphics/android/test_buffer_integration.cpp

tests/integration-tests/graphics/gbm/test_buffer_integration.cpp

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp

tests/mir_test_doubles/test_protobuf_socket_server.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/compositor/test_temporary_buffers.cpp

tests/unit-tests/frontend/test_application_mediator.cpp

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

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

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

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

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

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

tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp

tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp

tests/unit-tests/graphics/gbm/test_gbm_display.cpp

tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp

tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp

tests/unit-tests/graphics/gbm/test_kms_output.cpp

tests/unit-tests/graphics/gbm/test_kms_page_flipper.cpp

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

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

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

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

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

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

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

tests/unit-tests/shell/test_application_session.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/surfaces/test_proxy_surface.cpp

Show diffs side-by-side

added added

removed removed

tests/integration-tests/cucumber/test_session_management_context.cpp

16

16

* Authored by: Robert Carr <robert.carr@canonical.com>

17

17

*/

18

18

19

#include "session_management_context.h"

19

#include "mir_test_cucumber/session_management_context.h"

20

20

#include "mir/server_configuration.h"

21

21

#include "mir/shell/session_store.h"

22

22

#include "mir/shell/session.h"

Older »