1
=== modified file 'tests/mir_test/CMakeLists.txt'
2
--- tests/mir_test/CMakeLists.txt	2015-06-23 16:08:35 +0000
3
+++ tests/mir_test/CMakeLists.txt	2016-05-19 15:39:22 +0000
4
@@ -1,3 +1,7 @@
5
1
# We don't want LTO objects in a published archive (libmir-test-assist.a)
6
2
string (REPLACE " -flto " " " CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
7
3
string (REPLACE " -flto " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
8
4
9
1
add_library(mir-public-test OBJECT
5
add_library(mir-public-test OBJECT
10
2
  cross_process_action.cpp
6
  cross_process_action.cpp
11
3
  cross_process_sync.cpp
7
  cross_process_sync.cpp
12
4
8
13
=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
14
--- tests/mir_test_doubles/CMakeLists.txt	2016-05-04 09:06:26 +0000
15
+++ tests/mir_test_doubles/CMakeLists.txt	2016-05-19 15:39:22 +0000
16
@@ -16,7 +16,6 @@
17
16
  mock_input_device.cpp
16
  mock_input_device.cpp
18
17
  mock_frame_dropping_policy_factory.cpp
17
  mock_frame_dropping_policy_factory.cpp
19
18
  mock_timer.cpp
18
  mock_timer.cpp
20
19
  stub_buffer.cpp
21
20
  test_protobuf_client.cpp
19
  test_protobuf_client.cpp
22
21
  test_protobuf_socket_server.cpp
20
  test_protobuf_socket_server.cpp
23
22
  triggered_main_loop.cpp
21
  triggered_main_loop.cpp
24
@@ -71,11 +70,16 @@
25
71
  )
70
  )
26
72
endif()
71
endif()
27
73
72
28
73
# We don't want LTO objects in a published archive (libmir-test-assist.a)
29
74
string (REPLACE " -flto " " " CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
30
75
string (REPLACE " -flto " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
31
76
32
74
add_library(mir-public-test-doubles OBJECT
77
add_library(mir-public-test-doubles OBJECT
33
75
  nested_mock_egl.cpp
78
  nested_mock_egl.cpp
34
76
  null_logger.cpp
79
  null_logger.cpp
35
77
  stub_display_configuration.cpp ${CMAKE_SOURCE_DIR}/include/test/mir/test/doubles/stub_display_configuration.h
80
  stub_display_configuration.cpp ${CMAKE_SOURCE_DIR}/include/test/mir/test/doubles/stub_display_configuration.h
36
78
  fake_display.cpp ${CMAKE_SOURCE_DIR}/include/test/mir/test/doubles/fake_display.h
81
  fake_display.cpp ${CMAKE_SOURCE_DIR}/include/test/mir/test/doubles/fake_display.h
37
82
  stub_buffer.cpp
38
79
)
83
)
39
80
84
40
81
add_library(mir-test-doubles-static STATIC
85
add_library(mir-test-doubles-static STATIC
41
82
86
42
=== modified file 'tests/mir_test_framework/CMakeLists.txt'
43
--- tests/mir_test_framework/CMakeLists.txt	2016-03-29 07:30:50 +0000
44
+++ tests/mir_test_framework/CMakeLists.txt	2016-05-19 15:39:22 +0000
45
@@ -21,6 +21,10 @@
46
21
    -DMIR_BUILD_PREFIX="${CMAKE_BINARY_DIR}"
21
    -DMIR_BUILD_PREFIX="${CMAKE_BINARY_DIR}"
47
22
    )
22
    )
48
23
23
49
24
# We don't want LTO objects in a published archive (libmir-test-assist.a)
50
25
string (REPLACE " -flto " " " CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
51
26
string (REPLACE " -flto " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
52
27
53
24
add_library(mir-public-test-framework OBJECT
28
add_library(mir-public-test-framework OBJECT
54
25
  any_surface.cpp
29
  any_surface.cpp
55
26
  async_server_runner.cpp
30
  async_server_runner.cpp
56
27
31
57
=== modified file 'tests/mirtest.pc.in'
58
--- tests/mirtest.pc.in	2015-06-25 16:47:02 +0000
59
+++ tests/mirtest.pc.in	2016-05-19 15:39:22 +0000
60
@@ -6,5 +6,5 @@
61
6
Description: Mir test assist library
6
Description: Mir test assist library
62
7
Version: @MIR_VERSION@
7
Version: @MIR_VERSION@
63
8
Requires: mirserver mirplatform mirclient
8
Requires: mirserver mirplatform mirclient
65
9
Libs: -L@LIBDIR@ -lmir-test-assist
9
Libs: -L@LIBDIR@ -lmir-test-assist -ldl
66
10
Cflags: -I@INCLUDEDIR@
10
Cflags: -I@INCLUDEDIR@
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-05-20
Cemil Azizoglu (community)			Approve on 2016-05-19
Kevin DuBois (community)		2016-05-19	Approve on 2016-05-19
Review via email: mp+295227@code.launchpad.net