Mir

Merge lp:~alan-griffiths/mir/fix-gmock-detection into lp:mir

Proposed by Alan Griffiths on 2017-10-16
Status: Merged
Approved by: Alan Griffiths on 2017-10-17
Approved revision: 4295
Merged at revision: 4293
Proposed branch: lp:~alan-griffiths/mir/fix-gmock-detection
Merge into: lp:mir
Prerequisite: lp:~alan-griffiths/mir/fix-cross-build
Diff against target: 182 lines (+23/-17)
10 files modified
benchmarks/frame-uniformity/CMakeLists.txt (+2/-3)
cmake/FindGtestGmock.cmake (+10/-1)
debian/control (+1/-0)
tests/CMakeLists.txt (+1/-1)
tests/integration-tests/CMakeLists.txt (+1/-2)
tests/mir_test_doubles/CMakeLists.txt (+2/-2)
tests/mir_test_framework/CMakeLists.txt (+2/-2)
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
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration 2017-10-16 Approve on 2017-10-17
Brandon Schaefer (community) 2017-10-16 Approve on 2017-10-16
Review via email: mp+332306@code.launchpad.net

This proposal supersedes a proposal from 2017-10-16.

Commit message

Fix gmock detection in cmake.

At some point since xenial cmake-extras gained a script for finding gmock and gtest. We can use that for most build platforms.

To post a comment you must log in.
Brandon Schaefer (brandontschaefer) wrote :

Huh thought I did this with mir a bit ago. But yeah lgtm as this is much easier then manually having to keep track our selfs!

review: Approve
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:4292
https://mir-jenkins.ubuntu.com/job/mir-ci/3734/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5127/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5365
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5352
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5352
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5352
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5171
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5171/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5171
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5171/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5171
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5171/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5171
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5171/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5171
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5171/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5171/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5171/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5171
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5171/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3734/rebuild

review: Needs Fixing (continuous-integration)
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/1467/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5132/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1603/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5370
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5357
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5357
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5357
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5176
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5176/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5176
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5176/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5176
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5176/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5176
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5176/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5176
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5176/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5176/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5176/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5176
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5176/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
4293. By Alan Griffiths on 2017-10-17

Add another way of detecting cross compilation (and some debug messages)

4294. By Alan Griffiths on 2017-10-17

merge :parent

4295. By Alan Griffiths on 2017-10-17

Remove debug messages and simplify logic

Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4294
https://mir-jenkins.ubuntu.com/job/mir-ci/3735/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5133
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5371
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5358
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5358
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5358
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5177
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5177/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5177
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5177/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5177
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5177/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5177
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5177/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5177
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5177/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5177
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5177/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5177
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5177/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5177
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5177/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3735/rebuild

review: Approve (continuous-integration)
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4295
https://mir-jenkins.ubuntu.com/job/mir-ci/3736/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5134
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5372
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5359
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5359
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5359
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5178
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5178/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5178
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5178/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5178
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5178/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5178
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5178/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5178
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5178/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5178
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5178/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5178
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5178/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5178
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5178/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3736/rebuild

review: Approve (continuous-integration)
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'benchmarks/frame-uniformity/CMakeLists.txt'
2--- benchmarks/frame-uniformity/CMakeLists.txt 2017-08-25 06:41:20 +0000
3+++ benchmarks/frame-uniformity/CMakeLists.txt 2017-10-17 09:33:43 +0000
4@@ -28,7 +28,7 @@
5 mirserver
6 mirclient
7 mirplatform
8-
9+
10 mir-test-assist
11
12 # needed for fake_event_hub_server_configuration.h (which relies on private APIs)
13@@ -39,7 +39,6 @@
14
15 ${Boost_LIBRARIES}
16 ${GTEST_BOTH_LIBRARIES}
17- ${GMOCK_LIBRARY}
18- ${GMOCK_MAIN_LIBRARY}
19+ ${GMOCK_LIBRARIES}
20 ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
21 )
22
23=== modified file 'cmake/FindGtestGmock.cmake'
24--- cmake/FindGtestGmock.cmake 2017-09-07 05:58:13 +0000
25+++ cmake/FindGtestGmock.cmake 2017-10-17 09:33:43 +0000
26@@ -1,6 +1,14 @@
27 include(ExternalProject)
28 include(FindPackageHandleStandardArgs)
29
30+execute_process(COMMAND "arch" OUTPUT_VARIABLE MIR_HOST_PROCESSOR OUTPUT_STRIP_TRAILING_WHITESPACE)
31+
32+if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "${MIR_HOST_PROCESSOR}")
33+ find_package(GMock REQUIRED)
34+ if (NOT TARGET GMock)
35+ add_custom_target(GMock DEPENDS gmock)
36+ endif()
37+else()
38 #
39 # When cross compiling MIR_CHROOT points to our chroot.
40 # When not cross compiling, it should be blank to use the host system.
41@@ -89,8 +97,9 @@
42 set(GTEST_LIBRARY ${GTEST_BINARY_DIR}/libgtest.a)
43 set(GTEST_MAIN_LIBRARY ${GTEST_BINARY_DIR}/libgtest_main.a)
44 set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
45-set(GTEST_ALL_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
46+set(GMOCK_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
47
48 find_package_handle_standard_args(GTest DEFAULT_MSG
49 GMOCK_INCLUDE_DIR
50 GTEST_INCLUDE_DIR)
51+endif()
52
53=== modified file 'debian/control'
54--- debian/control 2017-10-11 15:49:20 +0000
55+++ debian/control 2017-10-17 09:33:43 +0000
56@@ -4,6 +4,7 @@
57 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
58 XSBC-Original-Maintainer: Thomas Voß <thomas.voss@canonical.com>
59 Build-Depends: cmake,
60+ cmake-extras,
61 pkg-config,
62 debhelper (>= 9),
63 doxygen,
64
65=== modified file 'tests/CMakeLists.txt'
66--- tests/CMakeLists.txt 2017-09-18 10:57:00 +0000
67+++ tests/CMakeLists.txt 2017-10-17 09:33:43 +0000
68@@ -109,9 +109,9 @@
69 mir-test-doubles-platform-static
70 ${Boost_LIBRARIES}
71 ${GTEST_BOTH_LIBRARIES}
72- ${GMOCK_LIBRARY}
73 PRIVATE
74 ${GMOCK_MAIN_LIBRARY}
75+ ${GMOCK_LIBRARIES}
76 ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
77 )
78
79
80=== modified file 'tests/integration-tests/CMakeLists.txt'
81--- tests/integration-tests/CMakeLists.txt 2017-08-25 06:41:20 +0000
82+++ tests/integration-tests/CMakeLists.txt 2017-10-17 09:33:43 +0000
83@@ -69,8 +69,7 @@
84
85 ${Boost_LIBRARIES}
86 ${GTEST_BOTH_LIBRARIES}
87- ${GMOCK_LIBRARY}
88- ${GMOCK_MAIN_LIBRARY}
89+ ${GMOCK_LIBRARIES}
90 # Mesa platform dependencies
91 ${DRM_LDFLAGS} ${DRM_LIBRARIES}
92 ${GBM_LDFLAGS} ${GBM_LIBRARIES}
93
94=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
95--- tests/mir_test_doubles/CMakeLists.txt 2017-08-25 06:41:20 +0000
96+++ tests/mir_test_doubles/CMakeLists.txt 2017-10-17 09:33:43 +0000
97@@ -86,7 +86,7 @@
98 mirserver
99
100 ${Boost_LIBRARIES}
101- ${GMOCK_LIBRARY}
102+ ${GMOCK_LIBRARIES}
103 ${GMOCK_MAIN_LIBRARY}
104 ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
105 )
106@@ -104,7 +104,7 @@
107 mir-test-doubles-platform-static
108
109 -ldl
110- ${GMOCK_LIBRARY}
111+ ${GMOCK_LIBRARIES}
112 ${GMOCK_MAIN_LIBRARY}
113 ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
114 )
115
116=== modified file 'tests/mir_test_framework/CMakeLists.txt'
117--- tests/mir_test_framework/CMakeLists.txt 2017-09-25 13:39:41 +0000
118+++ tests/mir_test_framework/CMakeLists.txt 2017-10-17 09:33:43 +0000
119@@ -85,11 +85,11 @@
120
121 target_link_libraries(mir-test-framework-static
122
123+ mirserver
124 mirclient
125 ${Boost_LIBRARIES}
126 ${GTEST_BOTH_LIBRARIES}
127- ${GMOCK_LIBRARY}
128- ${GMOCK_MAIN_LIBRARY}
129+ ${GMOCK_LIBRARIES}
130 ${UMOCKDEV_LIBRARIES}
131 ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
132 )
133
134=== modified file 'tests/performance-tests/CMakeLists.txt'
135--- tests/performance-tests/CMakeLists.txt 2017-09-18 10:57:00 +0000
136+++ tests/performance-tests/CMakeLists.txt 2017-10-17 09:33:43 +0000
137@@ -28,8 +28,8 @@
138 test_compositor.cpp
139 )
140 target_link_libraries(mir_compositor_performance_test
141+ mir_system_performance_test
142 ${GTEST_BOTH_LIBRARIES}
143- mir_system_performance_test
144 )
145
146 mir_add_wrapped_executable(mir_client_startup_performance_test
147
148=== modified file 'tests/unit-tests/CMakeLists.txt'
149--- tests/unit-tests/CMakeLists.txt 2017-09-07 05:58:13 +0000
150+++ tests/unit-tests/CMakeLists.txt 2017-10-17 09:33:43 +0000
151@@ -136,8 +136,7 @@
152
153 ${PROTOBUF_LITE_LIBRARIES}
154 ${GTEST_BOTH_LIBRARIES}
155- ${GMOCK_LIBRARY}
156- ${GMOCK_MAIN_LIBRARY}
157+ ${GMOCK_LIBRARIES}
158 ${Boost_LIBRARIES}
159 ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
160 )
161@@ -176,8 +175,7 @@
162
163 ${PROTOBUF_LITE_LIBRARIES}
164 ${GTEST_BOTH_LIBRARIES}
165- ${GMOCK_LIBRARY}
166- ${GMOCK_MAIN_LIBRARY}
167+ ${GMOCK_LIBRARIES}
168 ${Boost_LIBRARIES}
169 ${UMOCKDEV_LIBRARIES}
170 ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
171
172=== modified file 'tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp'
173--- tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp 2017-08-25 06:41:20 +0000
174+++ tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp 2017-10-17 09:33:43 +0000
175@@ -155,7 +155,7 @@
176 auto edid_size = mir_output_get_edid_size(output);
177
178 ASSERT_NE(nullptr, edid_start);
179- ASSERT_NE(0, edid_size);
180+ ASSERT_NE(0u, edid_size);
181
182 std::vector<uint8_t> host_edid(edid_start, edid_start+edid_size);
183

Subscribers

People subscribed via source and target branches