1
=== modified file 'include/server/mir/default_server_configuration.h'
2
--- include/server/mir/default_server_configuration.h	2014-06-23 17:40:57 +0000
3
+++ include/server/mir/default_server_configuration.h	2014-06-27 14:49:35 +0000
4
@@ -98,6 +98,7 @@
5
98
}
98
}
6
99
namespace graphics
99
namespace graphics
7
100
{
100
{
8
101
class NativePlatform;
9
101
class Platform;
102
class Platform;
10
102
class Display;
103
class Display;
11
103
class BufferInitializer;
104
class BufferInitializer;
12
@@ -164,6 +165,7 @@
13
164
    virtual std::shared_ptr<ServerStatusListener>   the_server_status_listener();
165
    virtual std::shared_ptr<ServerStatusListener>   the_server_status_listener();
14
165
    virtual std::shared_ptr<DisplayChanger>         the_display_changer();
166
    virtual std::shared_ptr<DisplayChanger>         the_display_changer();
15
166
    virtual std::shared_ptr<graphics::Platform>     the_graphics_platform();
167
    virtual std::shared_ptr<graphics::Platform>     the_graphics_platform();
16
168
    virtual std::shared_ptr<graphics::NativePlatform>  the_graphics_native_platform();
17
167
    virtual std::shared_ptr<input::InputConfiguration> the_input_configuration();
169
    virtual std::shared_ptr<input::InputConfiguration> the_input_configuration();
18
168
    virtual std::shared_ptr<input::InputDispatcher> the_input_dispatcher();
170
    virtual std::shared_ptr<input::InputDispatcher> the_input_dispatcher();
19
169
    virtual std::shared_ptr<input::InputSender>     the_input_sender();
171
    virtual std::shared_ptr<input::InputSender>     the_input_sender();
20
@@ -331,6 +333,7 @@
21
331
    CachedPtr<shell::InputTargeter> input_targeter;
333
    CachedPtr<shell::InputTargeter> input_targeter;
22
332
    CachedPtr<input::CursorListener> cursor_listener;
334
    CachedPtr<input::CursorListener> cursor_listener;
23
333
    CachedPtr<graphics::Platform>     graphics_platform;
335
    CachedPtr<graphics::Platform>     graphics_platform;
24
336
    CachedPtr<graphics::NativePlatform>    graphics_native_platform;
25
334
    CachedPtr<graphics::BufferInitializer> buffer_initializer;
337
    CachedPtr<graphics::BufferInitializer> buffer_initializer;
26
335
    CachedPtr<graphics::GraphicBufferAllocator> buffer_allocator;
338
    CachedPtr<graphics::GraphicBufferAllocator> buffer_allocator;
27
336
    CachedPtr<graphics::Display>      display;
339
    CachedPtr<graphics::Display>      display;
28
@@ -367,7 +370,8 @@
29
367
    CachedPtr<compositor::CompositorReport> compositor_report;
370
    CachedPtr<compositor::CompositorReport> compositor_report;
30
368
    CachedPtr<logging::Logger> logger;
371
    CachedPtr<logging::Logger> logger;
31
369
    CachedPtr<graphics::DisplayReport> display_report;
372
    CachedPtr<graphics::DisplayReport> display_report;
33
370
    CachedPtr<time::Clock> clock;
373
    // static to workaround the singleton clock in AsioMainLoop when running multiple servers
34
374
    static CachedPtr<time::Clock> clock;
35
371
    CachedPtr<MainLoop> main_loop;
375
    CachedPtr<MainLoop> main_loop;
36
372
    CachedPtr<ServerStatusListener> server_status_listener;
376
    CachedPtr<ServerStatusListener> server_status_listener;
37
373
    CachedPtr<graphics::DisplayConfigurationPolicy> display_configuration_policy;
377
    CachedPtr<graphics::DisplayConfigurationPolicy> display_configuration_policy;
38
374
378
39
=== modified file 'src/server/default_server_configuration.cpp'
40
--- src/server/default_server_configuration.cpp	2014-06-17 22:07:15 +0000
41
+++ src/server/default_server_configuration.cpp	2014-06-27 14:49:35 +0000
42
@@ -147,6 +147,8 @@
43
147
        });
147
        });
44
148
}
148
}
45
149
149
46
150
mir::CachedPtr<mir::time::Clock> mir::DefaultServerConfiguration::clock;
47
151
48
150
std::shared_ptr<mir::time::Clock> mir::DefaultServerConfiguration::the_clock()
152
std::shared_ptr<mir::time::Clock> mir::DefaultServerConfiguration::the_clock()
49
151
{
153
{
50
152
    return clock(
154
    return clock(
51
153
155
52
=== modified file 'src/server/graphics/default_configuration.cpp'
53
--- src/server/graphics/default_configuration.cpp	2014-06-24 21:44:55 +0000
54
+++ src/server/graphics/default_configuration.cpp	2014-06-27 14:49:35 +0000
55
@@ -70,22 +70,31 @@
56
70
    return graphics_platform(
70
    return graphics_platform(
57
71
        [this]()->std::shared_ptr<mg::Platform>
71
        [this]()->std::shared_ptr<mg::Platform>
58
72
        {
72
        {
59
73
            auto graphics_lib = mir::load_library(the_options()->get<std::string>(options::platform_graphics_lib));
60
74
61
75
            if (!the_options()->is_set(options::host_socket_opt))
73
            if (!the_options()->is_set(options::host_socket_opt))
62
76
            {
74
            {
63
77
                // fallback to standalone if host socket is unset
75
                // fallback to standalone if host socket is unset
64
76
                auto graphics_lib = mir::load_library(the_options()->get<std::string>(options::platform_graphics_lib));
65
78
                auto create_platform = graphics_lib->load_function<mg::CreatePlatform>("create_platform");
77
                auto create_platform = graphics_lib->load_function<mg::CreatePlatform>("create_platform");
66
79
                return create_platform(the_options(), the_emergency_cleanup(), the_display_report());
78
                return create_platform(the_options(), the_emergency_cleanup(), the_display_report());
67
80
            }
79
            }
68
81
80
69
82
            auto create_native_platform = graphics_lib->load_function<mg::CreateNativePlatform>("create_native_platform");
70
83
71
84
            return std::make_shared<mir::graphics::nested::NestedPlatform>(
81
            return std::make_shared<mir::graphics::nested::NestedPlatform>(
72
85
                the_host_connection(),
82
                the_host_connection(),
73
86
                the_input_dispatcher(),
83
                the_input_dispatcher(),
74
87
                the_display_report(),
84
                the_display_report(),
76
88
                create_native_platform(the_display_report()));
85
                the_graphics_native_platform());
77
86
        });
78
87
}
79
88
80
89
std::shared_ptr<mg::NativePlatform>  mir::DefaultServerConfiguration::the_graphics_native_platform()
81
90
{
82
91
    return graphics_native_platform(
83
92
        [this]()
84
93
        {
85
94
            auto graphics_lib = mir::load_library(the_options()->get<std::string>(options::platform_graphics_lib));
86
95
            auto create_native_platform = graphics_lib->load_function<mg::CreateNativePlatform>("create_native_platform");
87
96
88
97
            return create_native_platform(the_display_report());
89
89
        });
98
        });
90
90
}
99
}
91
91
100
92
92
101
93
=== modified file 'src/server/graphics/nested/nested_display.cpp'
94
--- src/server/graphics/nested/nested_display.cpp	2014-06-02 17:07:02 +0000
95
+++ src/server/graphics/nested/nested_display.cpp	2014-06-27 14:49:35 +0000
96
@@ -215,10 +215,6 @@
97
215
                });
215
                });
98
216
        });
216
        });
99
217
217
100
218
    if (result.empty())
101
219
        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir needs at least one output for display"));
102
220
103
221
104
222
    {
218
    {
105
223
        std::unique_lock<std::mutex> lock(outputs_mutex);
219
        std::unique_lock<std::mutex> lock(outputs_mutex);
106
224
        outputs.swap(result);
220
        outputs.swap(result);
107
225
221
108
=== modified file 'src/server/run_mir.cpp'
109
--- src/server/run_mir.cpp	2014-06-02 17:07:02 +0000
110
+++ src/server/run_mir.cpp	2014-06-27 14:49:35 +0000
111
@@ -24,6 +24,7 @@
112
24
#include "mir/raii.h"
24
#include "mir/raii.h"
113
25
#include "mir/emergency_cleanup.h"
25
#include "mir/emergency_cleanup.h"
114
26
26
115
27
#include <atomic>
116
27
#include <exception>
28
#include <exception>
117
28
#include <mutex>
29
#include <mutex>
118
29
#include <csignal>
30
#include <csignal>
119
@@ -82,9 +83,11 @@
120
82
83
121
83
    weak_emergency_cleanup = config.the_emergency_cleanup();
84
    weak_emergency_cleanup = config.the_emergency_cleanup();
122
84
85
123
86
    static std::atomic<unsigned int> concurrent_calls{0};
124
87
125
85
    auto const raii = raii::paired_calls(
88
    auto const raii = raii::paired_calls(
128
86
        [&]{ for (auto sig : intercepted) old_handler[sig] = signal(sig, fatal_signal_cleanup); },
89
        [&]{ if (!concurrent_calls++) for (auto sig : intercepted) old_handler[sig] = signal(sig, fatal_signal_cleanup); },
129
87
        [&]{ for (auto sig : intercepted) signal(sig, old_handler[sig]); });
90
        [&]{ if (!--concurrent_calls) for (auto sig : intercepted) signal(sig, old_handler[sig]); });
130
88
91
131
89
    init(server);
92
    init(server);
132
90
    server.run();
93
    server.run();
133
91
94
134
=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
135
--- tests/acceptance-tests/test_nested_mir.cpp	2014-06-11 16:11:32 +0000
136
+++ tests/acceptance-tests/test_nested_mir.cpp	2014-06-27 14:49:35 +0000
137
@@ -1,5 +1,5 @@
138
1
/*
1
/*
140
2
 * Copyright © 2013 Canonical Ltd.
2
 * Copyright © 2013-2014 Canonical Ltd.
141
3
 *
3
 *
142
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
143
5
 * under the terms of the GNU General Public License version 3,
5
 * under the terms of the GNU General Public License version 3,
144
@@ -17,23 +17,21 @@
145
17
 */
17
 */
146
18
18
147
19
#include "mir/frontend/session_mediator_report.h"
19
#include "mir/frontend/session_mediator_report.h"
148
20
#include "mir/graphics/native_platform.h"
149
20
#include "mir/display_server.h"
21
#include "mir/display_server.h"
150
21
#include "mir/run_mir.h"
22
#include "mir/run_mir.h"
151
22
23
154
23
#include "mir_test_framework/display_server_test_fixture.h"
24
#include "mir_test_framework/in_process_server.h"
155
24
#include "mir_test_doubles/mock_gl.h"
25
#include "mir_test_framework/stubbed_server_configuration.h"
156
26
157
25
#include "mir_test_doubles/mock_egl.h"
27
#include "mir_test_doubles/mock_egl.h"
158
26
28
163
27
#ifndef ANDROID
29
#include <gtest/gtest.h>
160
28
#include "mir_test_doubles/mock_gbm.h"
161
29
#endif
162
30
164
31
#include <gmock/gmock.h>
30
#include <gmock/gmock.h>
165
32
#include <gtest/gtest.h>
166
33
31
167
34
namespace mf = mir::frontend;
32
namespace mf = mir::frontend;
168
33
namespace mg = mir::graphics;
169
35
namespace mtf = mir_test_framework;
34
namespace mtf = mir_test_framework;
170
36
171
37
using namespace testing;
35
using namespace testing;
172
38
36
173
39
namespace
37
namespace
174
@@ -67,7 +65,7 @@
175
67
    void session_error(const std::string&, const char*, const std::string&) override {};
65
    void session_error(const std::string&, const char*, const std::string&) override {};
176
68
};
66
};
177
69
67
179
70
struct HostServerConfiguration : public mtf::TestingServerConfiguration
68
struct HostServerConfiguration : mtf::StubbedServerConfiguration
180
71
{
69
{
181
72
    virtual std::shared_ptr<mf::SessionMediatorReport>  the_session_mediator_report()
70
    virtual std::shared_ptr<mf::SessionMediatorReport>  the_session_mediator_report()
182
73
    {
71
    {
183
@@ -97,13 +95,61 @@
184
97
    }
95
    }
185
98
};
96
};
186
99
97
187
98
struct NativePlatformAdapter : mg::NativePlatform
188
99
{
189
100
    NativePlatformAdapter(std::shared_ptr<mg::Platform> const& adaptee) :
190
101
        adaptee(adaptee) {}
191
102
192
103
    void initialize(std::shared_ptr<mg::NestedContext> const& /*nested_context*/) override {}
193
104
194
105
    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator(
195
106
        std::shared_ptr<mg::BufferInitializer> const& buffer_initializer) override
196
107
    {
197
108
        return adaptee->create_buffer_allocator(buffer_initializer);
198
109
    }
199
110
200
111
    std::shared_ptr<mg::PlatformIPCPackage> get_ipc_package() override
201
112
    {
202
113
        return adaptee->get_ipc_package();
203
114
    }
204
115
205
116
    std::shared_ptr<mg::InternalClient> create_internal_client() override
206
117
    {
207
118
        return adaptee->create_internal_client();
208
119
    }
209
120
210
121
    void fill_buffer_package(
211
122
        mg::BufferIPCPacker* packer,
212
123
        mg::Buffer const* buffer,
213
124
        mg::BufferIpcMsgType msg_type) const override
214
125
    {
215
126
        return adaptee->fill_buffer_package(packer, buffer, msg_type);
216
127
    }
217
128
218
129
    std::shared_ptr<mg::Platform> const adaptee;
219
130
};
220
131
221
100
struct NestedServerConfiguration : FakeCommandLine, public mir::DefaultServerConfiguration
132
struct NestedServerConfiguration : FakeCommandLine, public mir::DefaultServerConfiguration
222
101
{
133
{
224
102
    NestedServerConfiguration(std::string const& host_socket) :
134
    NestedServerConfiguration(
225
135
        std::string const& host_socket,
226
136
        std::shared_ptr<mg::Platform> const& graphics_platform) :
227
103
        FakeCommandLine(host_socket),
137
        FakeCommandLine(host_socket),
231
104
        DefaultServerConfiguration(FakeCommandLine::argc, FakeCommandLine::argv)
138
        DefaultServerConfiguration(FakeCommandLine::argc, FakeCommandLine::argv),
232
105
    {
139
        graphics_platform(graphics_platform)
233
106
    }
140
    {
234
141
    }
235
142
236
143
    std::shared_ptr<mg::NativePlatform> the_graphics_native_platform() override
237
144
    {
238
145
        return graphics_native_platform(
239
146
            [this]() -> std::shared_ptr<mg::NativePlatform>
240
147
            {
241
148
                return std::make_shared<NativePlatformAdapter>(graphics_platform);
242
149
            });
243
150
    }
244
151
245
152
    std::shared_ptr<mg::Platform> const graphics_platform;
246
107
};
153
};
247
108
154
248
109
struct NestedMockEGL : mir::test::doubles::MockEGL
155
struct NestedMockEGL : mir::test::doubles::MockEGL
249
@@ -113,13 +159,6 @@
250
113
        {
159
        {
251
114
            InSequence init_before_terminate;
160
            InSequence init_before_terminate;
252
115
            EXPECT_CALL(*this, eglGetDisplay(_)).Times(1);
161
            EXPECT_CALL(*this, eglGetDisplay(_)).Times(1);
253
116
254
117
            EXPECT_CALL(*this, eglInitialize(_, _, _)).Times(1).WillRepeatedly(
255
118
                DoAll(WithArgs<1, 2>(Invoke(this, &NestedMockEGL::egl_initialize)), Return(EGL_TRUE)));
256
119
257
120
            EXPECT_CALL(*this, eglChooseConfig(_, _, _, _, _)).Times(AnyNumber()).WillRepeatedly(
258
121
                DoAll(WithArgs<2, 4>(Invoke(this, &NestedMockEGL::egl_choose_config)), Return(EGL_TRUE)));
259
122
260
123
            EXPECT_CALL(*this, eglTerminate(_)).Times(1);
162
            EXPECT_CALL(*this, eglTerminate(_)).Times(1);
261
124
        }
163
        }
262
125
164
263
@@ -127,6 +166,18 @@
264
127
        EXPECT_CALL(*this, eglMakeCurrent(_, _, _, _)).Times(AnyNumber());
166
        EXPECT_CALL(*this, eglMakeCurrent(_, _, _, _)).Times(AnyNumber());
265
128
        EXPECT_CALL(*this, eglDestroySurface(_, _)).Times(AnyNumber());
167
        EXPECT_CALL(*this, eglDestroySurface(_, _)).Times(AnyNumber());
266
129
168
267
169
        EXPECT_CALL(*this, eglQueryString(_, _)).Times(AnyNumber());
268
170
        ON_CALL(*this, eglQueryString(_,EGL_EXTENSIONS))
269
171
            .WillByDefault(Return("EGL_KHR_image "
270
172
                                  "EGL_KHR_image_base "
271
173
                                  "EGL_MESA_drm_image"));
272
174
273
175
        EXPECT_CALL(*this, eglChooseConfig(_, _, _, _, _)).Times(AnyNumber()).WillRepeatedly(
274
176
            DoAll(WithArgs<2, 4>(Invoke(this, &NestedMockEGL::egl_choose_config)), Return(EGL_TRUE)));
275
177
276
178
        EXPECT_CALL(*this, eglGetCurrentContext()).Times(AnyNumber());
277
179
        EXPECT_CALL(*this, eglCreatePbufferSurface(_, _, _)).Times(AnyNumber());
278
180
279
130
        EXPECT_CALL(*this, eglGetProcAddress(StrEq("eglCreateImageKHR"))).Times(AnyNumber());
181
        EXPECT_CALL(*this, eglGetProcAddress(StrEq("eglCreateImageKHR"))).Times(AnyNumber());
280
131
        EXPECT_CALL(*this, eglGetProcAddress(StrEq("eglDestroyImageKHR"))).Times(AnyNumber());
182
        EXPECT_CALL(*this, eglGetProcAddress(StrEq("eglDestroyImageKHR"))).Times(AnyNumber());
281
132
        EXPECT_CALL(*this, eglGetProcAddress(StrEq("glEGLImageTargetTexture2DOES"))).Times(AnyNumber());
183
        EXPECT_CALL(*this, eglGetProcAddress(StrEq("glEGLImageTargetTexture2DOES"))).Times(AnyNumber());
282
@@ -147,117 +198,39 @@
283
147
    }
198
    }
284
148
};
199
};
285
149
200
332
150
struct NestedMockPlatform
201
struct NestedServer : mtf::InProcessServer, HostServerConfiguration
333
151
#ifndef ANDROID
202
{
334
152
    : mir::test::doubles::MockGBM
203
    NestedMockEGL mock_egl;
335
153
#endif
204
336
154
{
205
    virtual mir::DefaultServerConfiguration& server_config()
337
155
    NestedMockPlatform()
206
    {
338
156
    {
207
        return *this;
293
157
#ifndef ANDROID
294
158
        InSequence gbm_device_lifecycle;
295
159
        EXPECT_CALL(*this, gbm_create_device(_)).Times(1);
296
160
        EXPECT_CALL(*this, gbm_device_destroy(_)).Times(1);
297
161
#endif
298
162
    }
299
163
};
300
164
301
165
struct NestedMockGL : NiceMock<mir::test::doubles::MockGL>
302
166
{
303
167
    NestedMockGL() {}
304
168
};
305
169
306
170
template<class NestedServerConfiguration>
307
171
struct ClientConfig : mtf::TestingClientConfiguration
308
172
{
309
173
    ClientConfig(std::string const& host_socket) : host_socket(host_socket) {}
310
174
311
175
    std::string const host_socket;
312
176
313
177
    void exec() override
314
178
    {
315
179
        try
316
180
        {
317
181
            NestedMockPlatform mock_gbm;
318
182
            NestedMockEGL mock_egl;
319
183
            NestedMockGL mock_gl;
320
184
            NestedServerConfiguration nested_config(host_socket);
321
185
322
186
            mir::run_mir(nested_config, [](mir::DisplayServer& server){server.stop();});
323
187
324
188
            // TODO - remove FAIL() as we should exit (NB we need logic to cause exit).
325
189
            FAIL();
326
190
        }
327
191
        catch (std::exception const& x)
328
192
        {
329
193
            // TODO - this is only temporary until NestedPlatform is implemented.
330
194
            EXPECT_THAT(x.what(), HasSubstr("Platform::create_buffer_allocator is not implemented yet!"));
331
195
        }
339
196
    }
208
    }
340
197
};
209
};
341
198
}
210
}
342
199
211
353
200
using TestNestedMir = mtf::BespokeDisplayServerTestFixture;
212
TEST_F(NestedServer, nested_platform_connects_and_disconnects)
344
201
345
202
// TODO resolve problems running "nested" tests on android and running nested on MESA
346
203
#ifdef ANDROID
347
204
#define DISABLED_ON_ANDROID_AND_MESA(name) DISABLED_##name
348
205
#else
349
206
#define DISABLED_ON_ANDROID_AND_MESA(name) DISABLED_##name
350
207
#endif
351
208
352
209
TEST_F(TestNestedMir, DISABLED_ON_ANDROID_AND_MESA(nested_platform_connects_and_disconnects))
354
210
{
213
{
371
211
    struct MyHostServerConfiguration : HostServerConfiguration
214
    std::string const connection_string{new_connection()};
372
212
    {
215
    NestedServerConfiguration nested_config{connection_string, the_graphics_platform()};
373
213
        void exec() override
216
374
214
        {
217
    InSequence seq;
375
215
            InSequence seq;
218
    EXPECT_CALL(*mock_session_mediator_report, session_connect_called(_)).Times(1);
376
216
            EXPECT_CALL(*mock_session_mediator_report, session_connect_called(_)).Times(1);
219
    EXPECT_CALL(*mock_session_mediator_report, session_disconnect_called(_)).Times(1);
377
217
            EXPECT_CALL(*mock_session_mediator_report, session_disconnect_called(_)).Times(1);
220
378
218
        }
221
    mir::run_mir(nested_config, [](mir::DisplayServer& server){server.stop();});
363
219
    };
364
220
365
221
    MyHostServerConfiguration host_config;
366
222
    ClientConfig<NestedServerConfiguration> client_config(host_config.the_socket_file());
367
223
368
224
369
225
    launch_server_process(host_config);
370
226
    launch_client_process(client_config);
379
227
}
222
}
380
228
223
381
229
//////////////////////////////////////////////////////////////////
224
//////////////////////////////////////////////////////////////////
413
230
// TODO the following tests were used in investigating lifetime issues.
225
// TODO the following test was used in investigating lifetime issues.
414
231
// TODO they may not have much long term value, but decide that later
226
// TODO it may not have much long term value, but decide that later.
415
232
227
TEST_F(NestedServer, on_exit_display_objects_should_be_destroyed)
416
233
TEST(DisplayLeak, on_exit_display_objects_should_be_destroyed)
228
{
417
234
{
229
    std::string const connection_string{new_connection()};
418
235
    struct MyServerConfiguration : mtf::TestingServerConfiguration
230
419
236
    {
231
    struct MyServerConfiguration : NestedServerConfiguration
420
237
        std::shared_ptr<mir::graphics::Display> the_display() override
232
    {
421
238
        {
233
        using NestedServerConfiguration::NestedServerConfiguration;
391
239
            auto const& temp = mtf::TestingServerConfiguration::the_display();
392
240
            my_display = temp;
393
241
            return temp;
394
242
        }
395
243
396
244
        std::weak_ptr<mir::graphics::Display> my_display;
397
245
    };
398
246
399
247
    MyServerConfiguration host_config;
400
248
401
249
    mir::run_mir(host_config, [](mir::DisplayServer& server){server.stop();});
402
250
403
251
    EXPECT_FALSE(host_config.my_display.lock()) << "after run_mir() exits the display should be released";
404
252
}
405
253
406
254
TEST_F(TestNestedMir, DISABLED_ON_ANDROID_AND_MESA(on_exit_display_objects_should_be_destroyed))
407
255
{
408
256
    struct MyNestedServerConfiguration : NestedServerConfiguration
409
257
    {
410
258
        // TODO clang says "error: inheriting constructors are not supported"
411
259
        // using NestedServerConfiguration::NestedServerConfiguration;
412
260
        MyNestedServerConfiguration(std::string const& host_socket) : NestedServerConfiguration(host_socket) {}
422
261
234
423
262
        std::shared_ptr<mir::graphics::Display> the_display() override
235
        std::shared_ptr<mir::graphics::Display> the_display() override
424
263
        {
236
        {
425
@@ -266,17 +239,12 @@
426
266
            return temp;
239
            return temp;
427
267
        }
240
        }
428
268
241
429
269
        ~MyNestedServerConfiguration()
430
270
        {
431
271
            EXPECT_FALSE(my_display.lock()) << "after run_mir() exits the display should be released";
432
272
        }
433
273
434
274
        std::weak_ptr<mir::graphics::Display> my_display;
242
        std::weak_ptr<mir::graphics::Display> my_display;
435
275
    };
243
    };
436
276
244
442
277
    HostServerConfiguration host_config;
245
    MyServerConfiguration config{connection_string, the_graphics_platform()};
443
278
    ClientConfig<MyNestedServerConfiguration> client_config(host_config.the_socket_file());
246
444
279
247
    mir::run_mir(config, [](mir::DisplayServer& server){server.stop();});
445
280
    launch_server_process(host_config);
248
446
281
    launch_client_process(client_config);
249
    EXPECT_FALSE(config.my_display.lock()) << "after run_mir() exits the display should be released";
447
282
}
250
}
Status:	Merged
Approved by:	Alan Griffiths on 2014-07-01
Approved revision:	no longer in the source branch.
Merged at revision:	1739
Proposed branch:	lp:~alan-griffiths/mir/spike-nested-server-test-fixture
Merge into:	lp:mir
Diff against target:	447 lines (+128/-146) 6 files modified include/server/mir/default_server_configuration.h (+5/-1) src/server/default_server_configuration.cpp (+2/-0) src/server/graphics/default_configuration.cpp (+14/-5) src/server/graphics/nested/nested_display.cpp (+0/-4) src/server/run_mir.cpp (+5/-2) tests/acceptance-tests/test_nested_mir.cpp (+102/-134)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/spike-nested-server-test-fixture
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Alexandros Frantzis (community)			Approve on 2014-07-01
Kevin DuBois (community)		2014-06-26	Approve on 2014-06-30
PS Jenkins bot (community)	continuous-integration		Approve on 2014-06-28
Alan Griffiths			Abstain on 2014-06-27
Review via email: mp+224637@code.launchpad.net