1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2017-04-21 03:08:25 +0000
3
+++ CMakeLists.txt	2017-04-24 09:26:55 +0000
4
@@ -284,7 +284,16 @@
5
284
add_subdirectory(cmake/)
284
add_subdirectory(cmake/)
6
285
285
7
286
if (MIR_ENABLE_TESTS)
286
if (MIR_ENABLE_TESTS)
9
287
  find_package(GtestGmock REQUIRED)
287
  find_package(GMock REQUIRED)
10
288
  if (MIR_CHROOT)
11
289
    string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GMOCK_INCLUDE_DIRS    "${GMOCK_INCLUDE_DIRS}")
12
290
    string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GTEST_INCLUDE_DIRS    "${GTEST_INCLUDE_DIRS}")
13
291
    string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GTEST_LIBRARIES       "${GTEST_LIBRARIES}")
14
292
    string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GMOCK_INCLUDE_DIRS    "${GMOCK_INCLUDE_DIRS}")
15
293
    string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GTEST_MAIN_LIBRARIES  "${GTEST_MAIN_LIBRARIES}")
16
294
    string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GMOCK_LIBRARIES       "${GMOCK_LIBRARIES}")
17
295
    string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GTEST_BOTH_LIBRARIES  "${GTEST_BOTH_LIBRARIES}")
18
296
  endif()
19
288
  pkg_check_modules(LIBEVDEV REQUIRED libevdev)
297
  pkg_check_modules(LIBEVDEV REQUIRED libevdev)
20
289
  include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
298
  include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
21
290
  add_subdirectory(tests/)
299
  add_subdirectory(tests/)
22
291
300
23
=== modified file 'benchmarks/frame-uniformity/CMakeLists.txt'
24
--- benchmarks/frame-uniformity/CMakeLists.txt	2017-04-21 03:08:25 +0000
25
+++ benchmarks/frame-uniformity/CMakeLists.txt	2017-04-24 09:26:55 +0000
26
@@ -28,7 +28,7 @@
27
28
  mirserver
28
  mirserver
28
29
  mirclient
29
  mirclient
29
30
  mirplatform
30
  mirplatform
31
31
  
31
32
32
  mir-test-assist
32
  mir-test-assist
33
33
33
34
34
  # needed for fake_event_hub_server_configuration.h (which relies on private APIs)
34
  # needed for fake_event_hub_server_configuration.h (which relies on private APIs)
35
@@ -39,7 +39,6 @@
36
39
39
37
40
  ${Boost_LIBRARIES}
40
  ${Boost_LIBRARIES}
38
41
  ${GTEST_BOTH_LIBRARIES}
41
  ${GTEST_BOTH_LIBRARIES}
41
42
  ${GMOCK_LIBRARY}
42
  ${GMOCK_LIBRARIES}
40
43
  ${GMOCK_MAIN_LIBRARY}
42
44
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
43
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
43
45
)
44
)
44
46
45
45
=== removed file 'cmake/FindGtestGmock.cmake'
46
--- cmake/FindGtestGmock.cmake	2017-01-18 02:29:37 +0000
47
+++ cmake/FindGtestGmock.cmake	1970-01-01 00:00:00 +0000
48
@@ -1,96 +0,0 @@
49
1
include(ExternalProject)
50
2
include(FindPackageHandleStandardArgs)
51
3
52
4
#
53
5
# When cross compiling MIR_CHROOT points to our chroot.
54
6
# When not cross compiling, it should be blank to use the host system.
55
7
#
56
8
set(usr ${MIR_CHROOT}/usr)
57
9
58
10
if (EXISTS ${usr}/src/googletest)
59
11
  set (USING_GOOGLETEST_1_8 TRUE)
60
12
  set (GTEST_INSTALL_DIR ${usr}/src/googletest/googletest/include)
61
13
else()
62
14
  set (GTEST_INSTALL_DIR ${usr}/src/gmock/gtest/include)
63
15
endif()
64
16
65
17
#gtest
66
18
find_path(
67
19
  GTEST_INCLUDE_DIR gtest/gtest.h
68
20
  HINTS ${GTEST_INSTALL_DIR}
69
21
)
70
22
71
23
#gmock
72
24
find_path(
73
25
  GMOCK_INSTALL_DIR CMakeLists.txt
74
26
  HINTS ${usr}/src/googletest ${usr}/src/gmock)
75
27
if(${GMOCK_INSTALL_DIR} STREQUAL "GMOCK_INSTALL_DIR-NOTFOUND")
76
28
    message(FATAL_ERROR "google-mock package not found")
77
29
endif()
78
30
79
31
find_path(GMOCK_INCLUDE_DIR gmock/gmock.h)
80
32
81
33
if (USING_GOOGLETEST_1_8)
82
34
  set(GMOCK_BASE_BINARY_DIR ${CMAKE_BINARY_DIR}/gmock/libs)
83
35
  set(GMOCK_BINARY_DIR ${GMOCK_BASE_BINARY_DIR}/googlemock)
84
36
  set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
85
37
else()
86
38
  set(GMOCK_BASE_BINARY_DIR ${CMAKE_BINARY_DIR}/gmock/libs)
87
39
  set(GMOCK_BINARY_DIR ${GMOCK_BASE_BINARY_DIR})
88
40
  set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
89
41
endif()
90
42
91
43
set(GTEST_CXX_FLAGS "-fPIC -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64")
92
44
if (cmake_build_type_lower MATCHES "threadsanitizer")
93
45
  set(GTEST_CXX_FLAGS "${GTEST_CXX_FLAGS} -fsanitize=thread")
94
46
elseif (cmake_build_type_lower MATCHES "ubsanitizer")
95
47
  set(GTEST_CXX_FLAGS "${GTEST_CXX_FLAGS} -fsanitize=undefined")
96
48
endif()
97
49
98
50
set(GTEST_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${GTEST_CXX_FLAGS}")
99
51
list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
100
52
list(APPEND GTEST_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
101
53
102
54
if (USING_GOOGLETEST_1_8)
103
55
  list(APPEND GTEST_CMAKE_ARGS -DBUILD_GTEST=ON)
104
56
endif()
105
57
106
58
if (cmake_build_type_lower MATCHES "threadsanitizer")
107
59
  #Skip compiler check, since if GCC is the compiler, we need to link against -ltsan
108
60
  #explicitly; specifying additional linker flags doesn't seem possible for external projects
109
61
  list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER_WORKS=1)
110
62
endif()
111
63
if (${CMAKE_CROSSCOMPILING})
112
64
  if(DEFINED MIR_CHROOT)
113
65
    list(APPEND GTEST_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
114
66
  else()
115
67
    list(APPEND GTEST_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
116
68
    list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
117
69
  endif()
118
70
endif()
119
71
120
72
ExternalProject_Add(
121
73
    GMock
122
74
    #where to build in source tree
123
75
    PREFIX ${GMOCK_PREFIX}
124
76
    #where the source is external to the project
125
77
    SOURCE_DIR ${GMOCK_INSTALL_DIR}
126
78
    #forward the compilers to the subproject so cross-arch builds work
127
79
    CMAKE_ARGS ${GTEST_CMAKE_ARGS}
128
80
    BINARY_DIR ${GMOCK_BASE_BINARY_DIR}
129
81
130
82
    #we don't need to install, so skip
131
83
    INSTALL_COMMAND ""
132
84
)
133
85
134
86
set(GMOCK_LIBRARY ${GMOCK_BINARY_DIR}/libgmock.a)
135
87
set(GMOCK_MAIN_LIBRARY ${GMOCK_BINARY_DIR}/libgmock_main.a)
136
88
set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY})
137
89
set(GTEST_LIBRARY ${GTEST_BINARY_DIR}/libgtest.a)
138
90
set(GTEST_MAIN_LIBRARY ${GTEST_BINARY_DIR}/libgtest_main.a)
139
91
set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
140
92
set(GTEST_ALL_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
141
93
142
94
find_package_handle_standard_args(GTest  DEFAULT_MSG
143
95
                                    GMOCK_INCLUDE_DIR
144
96
                                    GTEST_INCLUDE_DIR)
145
97
0
146
=== modified file 'debian/control'
147
--- debian/control	2017-04-21 03:08:25 +0000
148
+++ debian/control	2017-04-24 09:26:55 +0000
149
@@ -4,6 +4,7 @@
150
4
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
4
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
151
5
XSBC-Original-Maintainer: Thomas Voß <thomas.voss@canonical.com>
5
XSBC-Original-Maintainer: Thomas Voß <thomas.voss@canonical.com>
152
6
Build-Depends: cmake,
6
Build-Depends: cmake,
153
7
               cmake-extras,
154
7
               pkg-config,
8
               pkg-config,
155
8
               debhelper (>= 9),
9
               debhelper (>= 9),
156
9
               doxygen,
10
               doxygen,
157
10
11
158
=== modified file 'tests/CMakeLists.txt'
159
--- tests/CMakeLists.txt	2017-04-21 03:08:25 +0000
160
+++ tests/CMakeLists.txt	2017-04-24 09:26:55 +0000
161
@@ -104,8 +104,7 @@
162
104
  mir-test-doubles-platform-static
104
  mir-test-doubles-platform-static
163
105
  ${Boost_LIBRARIES}
105
  ${Boost_LIBRARIES}
164
106
  ${GTEST_BOTH_LIBRARIES}
106
  ${GTEST_BOTH_LIBRARIES}
167
107
  ${GMOCK_LIBRARY}
107
  ${GMOCK_LIBRARIES}
166
108
  ${GMOCK_MAIN_LIBRARY}
168
109
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
108
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
169
110
)
109
)
170
111
110
171
112
111
172
=== modified file 'tests/integration-tests/CMakeLists.txt'
173
--- tests/integration-tests/CMakeLists.txt	2017-04-21 03:08:25 +0000
174
+++ tests/integration-tests/CMakeLists.txt	2017-04-24 09:26:55 +0000
175
@@ -69,8 +69,7 @@
176
69
69
177
70
  ${Boost_LIBRARIES}
70
  ${Boost_LIBRARIES}
178
71
  ${GTEST_BOTH_LIBRARIES}
71
  ${GTEST_BOTH_LIBRARIES}
181
72
  ${GMOCK_LIBRARY}
72
  ${GMOCK_LIBRARIES}
180
73
  ${GMOCK_MAIN_LIBRARY}
182
74
  # Mesa platform dependencies
73
  # Mesa platform dependencies
183
75
  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
74
  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
184
76
  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
75
  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
185
77
76
186
=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
187
--- tests/mir_test_doubles/CMakeLists.txt	2017-04-21 03:08:25 +0000
188
+++ tests/mir_test_doubles/CMakeLists.txt	2017-04-24 09:26:55 +0000
189
@@ -87,7 +87,7 @@
190
87
  mirserver
87
  mirserver
191
88
88
192
89
  ${Boost_LIBRARIES}
89
  ${Boost_LIBRARIES}
194
90
  ${GMOCK_LIBRARY}
90
  ${GMOCK_LIBRARIES}
195
91
  ${GMOCK_MAIN_LIBRARY}
91
  ${GMOCK_MAIN_LIBRARY}
196
92
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
92
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
197
93
)
93
)
198
@@ -105,7 +105,7 @@
199
105
  mir-test-doubles-platform-static
105
  mir-test-doubles-platform-static
200
106
106
201
107
  -ldl
107
  -ldl
203
108
  ${GMOCK_LIBRARY}
108
  ${GMOCK_LIBRARIES}
204
109
  ${GMOCK_MAIN_LIBRARY}
109
  ${GMOCK_MAIN_LIBRARY}
205
110
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
110
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
206
111
)
111
)
207
112
112
208
=== modified file 'tests/mir_test_framework/CMakeLists.txt'
209
--- tests/mir_test_framework/CMakeLists.txt	2017-03-14 04:41:33 +0000
210
+++ tests/mir_test_framework/CMakeLists.txt	2017-04-24 09:26:55 +0000
211
@@ -83,11 +83,11 @@
212
83
83
213
84
target_link_libraries(mir-test-framework-static
84
target_link_libraries(mir-test-framework-static
214
85
85
215
86
  mirserver
216
86
  mirclient
87
  mirclient
217
87
  ${Boost_LIBRARIES}
88
  ${Boost_LIBRARIES}
218
88
  ${GTEST_BOTH_LIBRARIES}
89
  ${GTEST_BOTH_LIBRARIES}
221
89
  ${GMOCK_LIBRARY}
90
  ${GMOCK_LIBRARIES}
220
90
  ${GMOCK_MAIN_LIBRARY}
222
91
  ${UMOCKDEV_LIBRARIES}
91
  ${UMOCKDEV_LIBRARIES}
223
92
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
92
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
224
93
)
93
)
225
@@ -118,7 +118,7 @@
226
118
118
227
119
add_library(
119
add_library(
228
120
  mir-test-input-framework OBJECT
120
  mir-test-input-framework OBJECT
230
121
  
121
231
122
  stub_input.cpp
122
  stub_input.cpp
232
123
  fake_input_device_impl.cpp
123
  fake_input_device_impl.cpp
233
124
  stub_input_platform.cpp
124
  stub_input_platform.cpp
234
@@ -175,7 +175,7 @@
235
175
)
175
)
236
176
176
237
177
target_link_libraries(
177
target_link_libraries(
239
178
  mirplatformgraphicsthrow 
178
  mirplatformgraphicsthrow
240
179
179
241
180
  mirplatform
180
  mirplatform
242
181
)
181
)
243
182
182
244
=== modified file 'tests/performance-tests/CMakeLists.txt'
245
--- tests/performance-tests/CMakeLists.txt	2017-04-21 03:08:25 +0000
246
+++ tests/performance-tests/CMakeLists.txt	2017-04-24 09:26:55 +0000
247
@@ -32,8 +32,8 @@
248
32
  test_compositor.cpp
32
  test_compositor.cpp
249
33
)
33
)
250
34
target_link_libraries(mir_compositor_performance_test
34
target_link_libraries(mir_compositor_performance_test
251
35
  ${GTEST_BOTH_LIBRARIES}
252
36
  mir_system_performance_test
35
  mir_system_performance_test
253
36
  ${GTEST_BOTH_LIBRARIES}
254
37
)
37
)
255
38
38
256
39
mir_add_wrapped_executable(mir_client_startup_performance_test
39
mir_add_wrapped_executable(mir_client_startup_performance_test
257
40
40
258
=== modified file 'tests/unit-tests/CMakeLists.txt'
259
--- tests/unit-tests/CMakeLists.txt	2017-04-21 03:08:25 +0000
260
+++ tests/unit-tests/CMakeLists.txt	2017-04-24 09:26:55 +0000
261
@@ -137,8 +137,7 @@
262
137
137
263
138
  ${PROTOBUF_LITE_LIBRARIES}
138
  ${PROTOBUF_LITE_LIBRARIES}
264
139
  ${GTEST_BOTH_LIBRARIES}
139
  ${GTEST_BOTH_LIBRARIES}
267
140
  ${GMOCK_LIBRARY}
140
  ${GMOCK_LIBRARIES}
266
141
  ${GMOCK_MAIN_LIBRARY}
268
142
  ${Boost_LIBRARIES}
141
  ${Boost_LIBRARIES}
269
143
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
142
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
270
144
)
143
)
271
@@ -178,8 +177,7 @@
272
178
177
273
179
  ${PROTOBUF_LITE_LIBRARIES}
178
  ${PROTOBUF_LITE_LIBRARIES}
274
180
  ${GTEST_BOTH_LIBRARIES}
179
  ${GTEST_BOTH_LIBRARIES}
277
181
  ${GMOCK_LIBRARY}
180
  ${GMOCK_LIBRARIES}
276
182
  ${GMOCK_MAIN_LIBRARY}
278
183
  ${Boost_LIBRARIES}
181
  ${Boost_LIBRARIES}
279
184
  ${UMOCKDEV_LIBRARIES}
182
  ${UMOCKDEV_LIBRARIES}
280
185
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
183
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
281
186
184
282
=== modified file 'tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp'
283
--- tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp	2017-02-17 07:35:08 +0000
284
+++ tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp	2017-04-24 09:26:55 +0000
285
@@ -155,7 +155,7 @@
286
155
    auto edid_size = mir_output_get_edid_size(output);
155
    auto edid_size = mir_output_get_edid_size(output);
287
156
156
288
157
    ASSERT_NE(nullptr, edid_start);
157
    ASSERT_NE(nullptr, edid_start);
290
158
    ASSERT_NE(0, edid_size);
158
    ASSERT_NE(0u, edid_size);
291
159
159
292
160
    std::vector<uint8_t> host_edid(edid_start, edid_start+edid_size);
160
    std::vector<uint8_t> host_edid(edid_start, edid_start+edid_size);
293
161
161
Status:	Rejected
Rejected by:	Alan Griffiths on 2017-04-27
Proposed branch:	lp:~alan-griffiths/mir/fix-gmock-detection
Merge into:	lp:mir
Prerequisite:	lp:~brandontschaefer/mir/remove-android-support
Diff against target:	292 lines (+25/-116) 11 files modified CMakeLists.txt (+10/-1) benchmarks/frame-uniformity/CMakeLists.txt (+2/-3) cmake/FindGtestGmock.cmake (+0/-96) debian/control (+1/-0) tests/CMakeLists.txt (+1/-2) tests/integration-tests/CMakeLists.txt (+1/-2) tests/mir_test_doubles/CMakeLists.txt (+2/-2) tests/mir_test_framework/CMakeLists.txt (+4/-4) tests/performance-tests/CMakeLists.txt (+1/-1) tests/unit-tests/CMakeLists.txt (+2/-4) tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp (+1/-1)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/fix-gmock-detection
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Daniel van Vugt			Disapprove on 2017-04-26
Mir CI Bot	continuous-integration	2017-04-20	Needs Fixing on 2017-04-24
Alan Griffiths			Needs Fixing on 2017-04-21
Brandon Schaefer (community)		2017-04-20	Approve on 2017-04-20
Review via email: mp+322859@code.launchpad.net
1	=== modified file 'CMakeLists.txt'
2	--- CMakeLists.txt 2017-04-21 03:08:25 +0000
3	+++ CMakeLists.txt 2017-04-24 09:26:55 +0000
4	@@ -284,7 +284,16 @@
5	284	add_subdirectory(cmake/)	284	add_subdirectory(cmake/)
6	285		285
7	286	if (MIR_ENABLE_TESTS)	286	if (MIR_ENABLE_TESTS)
9	287	find_package(GtestGmock REQUIRED)	287	find_package(GMock REQUIRED)
10			288	if (MIR_CHROOT)
11			289	string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GMOCK_INCLUDE_DIRS "${GMOCK_INCLUDE_DIRS}")
12			290	string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GTEST_INCLUDE_DIRS "${GTEST_INCLUDE_DIRS}")
13			291	string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GTEST_LIBRARIES "${GTEST_LIBRARIES}")
14			292	string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GMOCK_INCLUDE_DIRS "${GMOCK_INCLUDE_DIRS}")
15			293	string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GTEST_MAIN_LIBRARIES "${GTEST_MAIN_LIBRARIES}")
16			294	string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GMOCK_LIBRARIES "${GMOCK_LIBRARIES}")
17			295	string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GTEST_BOTH_LIBRARIES "${GTEST_BOTH_LIBRARIES}")
18			296	endif()
19	288	pkg_check_modules(LIBEVDEV REQUIRED libevdev)	297	pkg_check_modules(LIBEVDEV REQUIRED libevdev)
20	289	include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})	298	include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
21	290	add_subdirectory(tests/)	299	add_subdirectory(tests/)
22	291		300
23	=== modified file 'benchmarks/frame-uniformity/CMakeLists.txt'
24	--- benchmarks/frame-uniformity/CMakeLists.txt 2017-04-21 03:08:25 +0000
25	+++ benchmarks/frame-uniformity/CMakeLists.txt 2017-04-24 09:26:55 +0000
26	@@ -28,7 +28,7 @@
27	28	mirserver	28	mirserver
28	29	mirclient	29	mirclient
29	30	mirplatform	30	mirplatform
31	31		31
32	32	mir-test-assist	32	mir-test-assist
33	33		33
34	34	# needed for fake_event_hub_server_configuration.h (which relies on private APIs)	34	# needed for fake_event_hub_server_configuration.h (which relies on private APIs)
35	@@ -39,7 +39,6 @@
36	39		39
37	40	${Boost_LIBRARIES}	40	${Boost_LIBRARIES}
38	41	${GTEST_BOTH_LIBRARIES}	41	${GTEST_BOTH_LIBRARIES}
41	42	${GMOCK_LIBRARY}	42	${GMOCK_LIBRARIES}
40	43	${GMOCK_MAIN_LIBRARY}
42	44	${CMAKE_THREAD_LIBS_INIT} # Link in pthread.	43	${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
43	45	)	44	)
44	46		45
45	=== removed file 'cmake/FindGtestGmock.cmake'
46	--- cmake/FindGtestGmock.cmake 2017-01-18 02:29:37 +0000
47	+++ cmake/FindGtestGmock.cmake 1970-01-01 00:00:00 +0000
48	@@ -1,96 +0,0 @@
49	1	include(ExternalProject)
50	2	include(FindPackageHandleStandardArgs)
51	3
52	4	#
53	5	# When cross compiling MIR_CHROOT points to our chroot.
54	6	# When not cross compiling, it should be blank to use the host system.
55	7	#
56	8	set(usr ${MIR_CHROOT}/usr)
57	9
58	10	if (EXISTS ${usr}/src/googletest)
59	11	set (USING_GOOGLETEST_1_8 TRUE)
60	12	set (GTEST_INSTALL_DIR ${usr}/src/googletest/googletest/include)
61	13	else()
62	14	set (GTEST_INSTALL_DIR ${usr}/src/gmock/gtest/include)
63	15	endif()
64	16
65	17	#gtest
66	18	find_path(
67	19	GTEST_INCLUDE_DIR gtest/gtest.h
68	20	HINTS ${GTEST_INSTALL_DIR}
69	21	)
70	22
71	23	#gmock
72	24	find_path(
73	25	GMOCK_INSTALL_DIR CMakeLists.txt
74	26	HINTS ${usr}/src/googletest ${usr}/src/gmock)
75	27	if(${GMOCK_INSTALL_DIR} STREQUAL "GMOCK_INSTALL_DIR-NOTFOUND")
76	28	message(FATAL_ERROR "google-mock package not found")
77	29	endif()
78	30
79	31	find_path(GMOCK_INCLUDE_DIR gmock/gmock.h)
80	32
81	33	if (USING_GOOGLETEST_1_8)
82	34	set(GMOCK_BASE_BINARY_DIR ${CMAKE_BINARY_DIR}/gmock/libs)
83	35	set(GMOCK_BINARY_DIR ${GMOCK_BASE_BINARY_DIR}/googlemock)
84	36	set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
85	37	else()
86	38	set(GMOCK_BASE_BINARY_DIR ${CMAKE_BINARY_DIR}/gmock/libs)
87	39	set(GMOCK_BINARY_DIR ${GMOCK_BASE_BINARY_DIR})
88	40	set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
89	41	endif()
90	42
91	43	set(GTEST_CXX_FLAGS "-fPIC -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64")
92	44	if (cmake_build_type_lower MATCHES "threadsanitizer")
93	45	set(GTEST_CXX_FLAGS "${GTEST_CXX_FLAGS} -fsanitize=thread")
94	46	elseif (cmake_build_type_lower MATCHES "ubsanitizer")
95	47	set(GTEST_CXX_FLAGS "${GTEST_CXX_FLAGS} -fsanitize=undefined")
96	48	endif()
97	49
98	50	set(GTEST_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${GTEST_CXX_FLAGS}")
99	51	list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
100	52	list(APPEND GTEST_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
101	53
102	54	if (USING_GOOGLETEST_1_8)
103	55	list(APPEND GTEST_CMAKE_ARGS -DBUILD_GTEST=ON)
104	56	endif()
105	57
106	58	if (cmake_build_type_lower MATCHES "threadsanitizer")
107	59	#Skip compiler check, since if GCC is the compiler, we need to link against -ltsan
108	60	#explicitly; specifying additional linker flags doesn't seem possible for external projects
109	61	list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER_WORKS=1)
110	62	endif()
111	63	if (${CMAKE_CROSSCOMPILING})
112	64	if(DEFINED MIR_CHROOT)
113	65	list(APPEND GTEST_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
114	66	else()
115	67	list(APPEND GTEST_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
116	68	list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
117	69	endif()
118	70	endif()
119	71
120	72	ExternalProject_Add(
121	73	GMock
122	74	#where to build in source tree
123	75	PREFIX ${GMOCK_PREFIX}
124	76	#where the source is external to the project
125	77	SOURCE_DIR ${GMOCK_INSTALL_DIR}
126	78	#forward the compilers to the subproject so cross-arch builds work
127	79	CMAKE_ARGS ${GTEST_CMAKE_ARGS}
128	80	BINARY_DIR ${GMOCK_BASE_BINARY_DIR}
129	81
130	82	#we don't need to install, so skip
131	83	INSTALL_COMMAND ""
132	84	)
133	85
134	86	set(GMOCK_LIBRARY ${GMOCK_BINARY_DIR}/libgmock.a)
135	87	set(GMOCK_MAIN_LIBRARY ${GMOCK_BINARY_DIR}/libgmock_main.a)
136	88	set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY})
137	89	set(GTEST_LIBRARY ${GTEST_BINARY_DIR}/libgtest.a)
138	90	set(GTEST_MAIN_LIBRARY ${GTEST_BINARY_DIR}/libgtest_main.a)
139	91	set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
140	92	set(GTEST_ALL_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
141	93
142	94	find_package_handle_standard_args(GTest DEFAULT_MSG
143	95	GMOCK_INCLUDE_DIR
144	96	GTEST_INCLUDE_DIR)
145	97		0
146	=== modified file 'debian/control'
147	--- debian/control 2017-04-21 03:08:25 +0000
148	+++ debian/control 2017-04-24 09:26:55 +0000
149	@@ -4,6 +4,7 @@
150	4	Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>	4	Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
151	5	XSBC-Original-Maintainer: Thomas Voß <thomas.voss@canonical.com>	5	XSBC-Original-Maintainer: Thomas Voß <thomas.voss@canonical.com>
152	6	Build-Depends: cmake,	6	Build-Depends: cmake,
153			7	cmake-extras,
154	7	pkg-config,	8	pkg-config,
155	8	debhelper (>= 9),	9	debhelper (>= 9),
156	9	doxygen,	10	doxygen,
157	10		11
158	=== modified file 'tests/CMakeLists.txt'
159	--- tests/CMakeLists.txt 2017-04-21 03:08:25 +0000
160	+++ tests/CMakeLists.txt 2017-04-24 09:26:55 +0000
161	@@ -104,8 +104,7 @@
162	104	mir-test-doubles-platform-static	104	mir-test-doubles-platform-static
163	105	${Boost_LIBRARIES}	105	${Boost_LIBRARIES}
164	106	${GTEST_BOTH_LIBRARIES}	106	${GTEST_BOTH_LIBRARIES}
167	107	${GMOCK_LIBRARY}	107	${GMOCK_LIBRARIES}
166	108	${GMOCK_MAIN_LIBRARY}
168	109	${CMAKE_THREAD_LIBS_INIT} # Link in pthread.	108	${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
169	110	)	109	)
170	111		110
171	112		111
172	=== modified file 'tests/integration-tests/CMakeLists.txt'
173	--- tests/integration-tests/CMakeLists.txt 2017-04-21 03:08:25 +0000
174	+++ tests/integration-tests/CMakeLists.txt 2017-04-24 09:26:55 +0000
175	@@ -69,8 +69,7 @@
176	69		69
177	70	${Boost_LIBRARIES}	70	${Boost_LIBRARIES}
178	71	${GTEST_BOTH_LIBRARIES}	71	${GTEST_BOTH_LIBRARIES}
181	72	${GMOCK_LIBRARY}	72	${GMOCK_LIBRARIES}
180	73	${GMOCK_MAIN_LIBRARY}
182	74	# Mesa platform dependencies	73	# Mesa platform dependencies
183	75	${DRM_LDFLAGS} ${DRM_LIBRARIES}	74	${DRM_LDFLAGS} ${DRM_LIBRARIES}
184	76	${GBM_LDFLAGS} ${GBM_LIBRARIES}	75	${GBM_LDFLAGS} ${GBM_LIBRARIES}
185	77		76
186	=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
187	--- tests/mir_test_doubles/CMakeLists.txt 2017-04-21 03:08:25 +0000
188	+++ tests/mir_test_doubles/CMakeLists.txt 2017-04-24 09:26:55 +0000
189	@@ -87,7 +87,7 @@
190	87	mirserver	87	mirserver
191	88		88
192	89	${Boost_LIBRARIES}	89	${Boost_LIBRARIES}
194	90	${GMOCK_LIBRARY}	90	${GMOCK_LIBRARIES}
195	91	${GMOCK_MAIN_LIBRARY}	91	${GMOCK_MAIN_LIBRARY}
196	92	${CMAKE_THREAD_LIBS_INIT} # Link in pthread.	92	${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
197	93	)	93	)
198	@@ -105,7 +105,7 @@
199	105	mir-test-doubles-platform-static	105	mir-test-doubles-platform-static
200	106		106
201	107	-ldl	107	-ldl
203	108	${GMOCK_LIBRARY}	108	${GMOCK_LIBRARIES}
204	109	${GMOCK_MAIN_LIBRARY}	109	${GMOCK_MAIN_LIBRARY}
205	110	${CMAKE_THREAD_LIBS_INIT} # Link in pthread.	110	${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
206	111	)	111	)
207	112		112
208	=== modified file 'tests/mir_test_framework/CMakeLists.txt'
209	--- tests/mir_test_framework/CMakeLists.txt 2017-03-14 04:41:33 +0000
210	+++ tests/mir_test_framework/CMakeLists.txt 2017-04-24 09:26:55 +0000
211	@@ -83,11 +83,11 @@
212	83		83
213	84	target_link_libraries(mir-test-framework-static	84	target_link_libraries(mir-test-framework-static
214	85		85
215			86	mirserver
216	86	mirclient	87	mirclient
217	87	${Boost_LIBRARIES}	88	${Boost_LIBRARIES}
218	88	${GTEST_BOTH_LIBRARIES}	89	${GTEST_BOTH_LIBRARIES}
221	89	${GMOCK_LIBRARY}	90	${GMOCK_LIBRARIES}
220	90	${GMOCK_MAIN_LIBRARY}
222	91	${UMOCKDEV_LIBRARIES}	91	${UMOCKDEV_LIBRARIES}
223	92	${CMAKE_THREAD_LIBS_INIT} # Link in pthread.	92	${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
224	93	)	93	)
225	@@ -118,7 +118,7 @@
226	118		118
227	119	add_library(	119	add_library(
228	120	mir-test-input-framework OBJECT	120	mir-test-input-framework OBJECT
230	121		121
231	122	stub_input.cpp	122	stub_input.cpp
232	123	fake_input_device_impl.cpp	123	fake_input_device_impl.cpp
233	124	stub_input_platform.cpp	124	stub_input_platform.cpp
234	@@ -175,7 +175,7 @@
235	175	)	175	)
236	176		176
237	177	target_link_libraries(	177	target_link_libraries(
239	178	mirplatformgraphicsthrow	178	mirplatformgraphicsthrow
240	179		179
241	180	mirplatform	180	mirplatform
242	181	)	181	)
243	182		182
244	=== modified file 'tests/performance-tests/CMakeLists.txt'
245	--- tests/performance-tests/CMakeLists.txt 2017-04-21 03:08:25 +0000
246	+++ tests/performance-tests/CMakeLists.txt 2017-04-24 09:26:55 +0000
247	@@ -32,8 +32,8 @@
248	32	test_compositor.cpp	32	test_compositor.cpp
249	33	)	33	)
250	34	target_link_libraries(mir_compositor_performance_test	34	target_link_libraries(mir_compositor_performance_test
251	35	${GTEST_BOTH_LIBRARIES}
252	36	mir_system_performance_test	35	mir_system_performance_test
253			36	${GTEST_BOTH_LIBRARIES}
254	37	)	37	)
255	38		38
256	39	mir_add_wrapped_executable(mir_client_startup_performance_test	39	mir_add_wrapped_executable(mir_client_startup_performance_test
257	40		40
258	=== modified file 'tests/unit-tests/CMakeLists.txt'
259	--- tests/unit-tests/CMakeLists.txt 2017-04-21 03:08:25 +0000
260	+++ tests/unit-tests/CMakeLists.txt 2017-04-24 09:26:55 +0000
261	@@ -137,8 +137,7 @@
262	137		137
263	138	${PROTOBUF_LITE_LIBRARIES}	138	${PROTOBUF_LITE_LIBRARIES}
264	139	${GTEST_BOTH_LIBRARIES}	139	${GTEST_BOTH_LIBRARIES}
267	140	${GMOCK_LIBRARY}	140	${GMOCK_LIBRARIES}
266	141	${GMOCK_MAIN_LIBRARY}
268	142	${Boost_LIBRARIES}	141	${Boost_LIBRARIES}
269	143	${CMAKE_THREAD_LIBS_INIT} # Link in pthread.	142	${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
270	144	)	143	)
271	@@ -178,8 +177,7 @@
272	178		177
273	179	${PROTOBUF_LITE_LIBRARIES}	178	${PROTOBUF_LITE_LIBRARIES}
274	180	${GTEST_BOTH_LIBRARIES}	179	${GTEST_BOTH_LIBRARIES}
277	181	${GMOCK_LIBRARY}	180	${GMOCK_LIBRARIES}
276	182	${GMOCK_MAIN_LIBRARY}
278	183	${Boost_LIBRARIES}	181	${Boost_LIBRARIES}
279	184	${UMOCKDEV_LIBRARIES}	182	${UMOCKDEV_LIBRARIES}
280	185	${CMAKE_THREAD_LIBS_INIT} # Link in pthread.	183	${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
281	186		184
282	=== modified file 'tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp'
283	--- tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp 2017-02-17 07:35:08 +0000
284	+++ tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp 2017-04-24 09:26:55 +0000
285	@@ -155,7 +155,7 @@
286	155	auto edid_size = mir_output_get_edid_size(output);	155	auto edid_size = mir_output_get_edid_size(output);
287	156		156
288	157	ASSERT_NE(nullptr, edid_start);	157	ASSERT_NE(nullptr, edid_start);
290	158	ASSERT_NE(0, edid_size);	158	ASSERT_NE(0u, edid_size);
291	159		159
292	160	std::vector<uint8_t> host_edid(edid_start, edid_start+edid_size);	160	std::vector<uint8_t> host_edid(edid_start, edid_start+edid_size);
293	161		161