1
=== modified file 'include/test/mir_test_framework/in_process_server.h'
2
--- include/test/mir_test_framework/in_process_server.h	2013-12-13 15:11:19 +0000
3
+++ include/test/mir_test_framework/in_process_server.h	2014-01-22 18:03:28 +0000
4
@@ -36,6 +36,7 @@
5
36
/// Fixture for running Mir server in test process
36
/// Fixture for running Mir server in test process
6
37
struct InProcessServer : testing::Test
37
struct InProcessServer : testing::Test
7
38
{
38
{
8
39
    InProcessServer();
9
39
    ~InProcessServer();
40
    ~InProcessServer();
10
40
41
11
41
    /// Starts the server
42
    /// Starts the server
12
@@ -53,6 +54,7 @@
13
53
    mir::DisplayServer* start_mir_server();
54
    mir::DisplayServer* start_mir_server();
14
54
    virtual mir::DefaultServerConfiguration& server_config() = 0;
55
    virtual mir::DefaultServerConfiguration& server_config() = 0;
15
55
56
16
57
    char const* const old_env;
17
56
    std::thread server_thread;
58
    std::thread server_thread;
18
57
    mir::DisplayServer* display_server = 0;
59
    mir::DisplayServer* display_server = 0;
19
58
};
60
};
20
59
61
21
=== modified file 'tests/mir_test_framework/in_process_server.cpp'
22
--- tests/mir_test_framework/in_process_server.cpp	2013-12-17 10:05:06 +0000
23
+++ tests/mir_test_framework/in_process_server.cpp	2014-01-22 18:03:28 +0000
24
@@ -30,6 +30,17 @@
25
30
30
26
31
namespace mtf = mir_test_framework;
31
namespace mtf = mir_test_framework;
27
32
32
28
33
namespace
29
34
{
30
35
char const* const env_no_file = "MIR_SERVER_NO_FILE";
31
36
}
32
37
33
38
mtf::InProcessServer::InProcessServer() :
34
39
    old_env(getenv(env_no_file))
35
40
{
36
41
    if (!old_env) setenv(env_no_file, "", true);
37
42
}
38
43
39
33
void mtf::InProcessServer::SetUp()
44
void mtf::InProcessServer::SetUp()
40
34
{
45
{
41
35
    display_server = start_mir_server();
46
    display_server = start_mir_server();
42
@@ -53,6 +64,8 @@
43
53
mtf::InProcessServer::~InProcessServer()
64
mtf::InProcessServer::~InProcessServer()
44
54
{
65
{
45
55
    if (server_thread.joinable()) server_thread.join();
66
    if (server_thread.joinable()) server_thread.join();
46
67
47
68
    if (!old_env) unsetenv(env_no_file);
48
56
}
69
}
49
57
70
50
58
mir::DisplayServer* mtf::InProcessServer::start_mir_server()
71
mir::DisplayServer* mtf::InProcessServer::start_mir_server()
Reviewer	Review Type	Date Requested	Status
Daniel van Vugt			Approve on 2014-01-23
Kevin DuBois (community)			Approve on 2014-01-23
Andreas Pokorny (community)		2014-01-22	Approve on 2014-01-22
PS Jenkins bot (community)	continuous-integration		Approve on 2014-01-22
Review via email: mp+202722@code.launchpad.net