Mir

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

fix-gmock-detection
Merge into development-branch

Proposed by Alan Griffiths on 2017-04-20

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

This proposal supersedes a proposal from 2017-04-20.

Commit message

Fix gmock detection in cmake.

At some point in the past 5 years cmake-extras gained a script for finding gmock and gtest. We don't need to maintain our own.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-04-20: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Brandon Schaefer (brandontschaefer) wrote on 2017-04-20: Posted in a previous version of this proposal

lgtm

review: Approve

Revision history for this message

Brandon Schaefer (brandontschaefer) wrote on 2017-04-20:

still lgtms

review: Approve

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-04-20: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-04-20:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-04-20:

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2017-04-20:

armhf, zesty:

17:04:53 ../../gmock/gtest/libgtest.a: error adding symbols: File format not recognized
17:04:53 collect2: error: ld returned 1 exit status
17:04:53 tests/performance-tests/CMakeFiles/mir_compositor_performance_test.dir/build.make:100: recipe for target 'bin/mir_compositor_performance_test.bin' failed
17:04:53 make[3]: *** [bin/mir_compositor_performance_test.bin] Error 1

Why would that be?

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2017-04-21:

I think this is the right idea, but some better explanation (a description) might be helpful.

Looks like this cleanup only became possible recently with the new gtest packaging...?

Also, don't we need to explicitly require Gtest?

review: Needs Information

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-04-21:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2017-04-21:

Hmm build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty again. (But different symptoms to last time.)

10:32:13 /usr/lib/gcc-cross/arm-linux-gnueabihf/6/../../../../arm-linux-gnueabihf/bin/ld.gold: error: ../../gmock/gtest/libgtest.a(gtest-all.cc.o): incompatible target
10:32:13 /usr/lib/gcc-cross/arm-linux-gnueabihf/6/../../../../arm-linux-gnueabihf/bin/ld.gold: error: ../../gmock/gtest/libgtest_main.a(gtest_main.cc.o): incompatible target

review: Needs Fixing

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-04-21:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2017-04-21:

Oh! that's a cross-build. Maybe its picking up the host binaries? Something for next week.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2017-04-24:

OK then, while work is in progress don't forget:

+#mir_add_wrapped_executable(mir_compositor_performance_test

should be uncommented.

review: Needs Fixing

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-04-24:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2017-04-24:

Maybe replacing ${GMOCK_LIBRARIES} with ${GMOCK_LDFLAGS} would help fix the cross-compile failure.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2017-04-26:

Hmm, aren't we aiming to keep support for building on xenial? While lp:mir builds perfectly on xenial, this proposal does not...

-- Installing: /home/dan/bzr/mir/fix-gmock-detection/build/mir_gtest/fail_on_success.sh
CMake Error at CMakeLists.txt:287 (find_package):
  By not providing "FindGMock.cmake" in CMAKE_MODULE_PATH this project has
  asked CMake to find a package configuration file provided by "GMock", but
  CMake did not find one.

Could not find a package configuration file provided by "GMock" with any of
the following names:

GMockConfig.cmake
gmock-config.cmake

  Add the installation prefix of "GMock" to CMAKE_PREFIX_PATH or set
  "GMock_DIR" to a directory containing one of the above files. If "GMock"
  provides a separate development package or SDK, be sure it has been
  installed.

-- Configuring incomplete, errors occurred!

review: Needs Information

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2017-04-26:

^^^
That's pure xenial with no overlay, no PPAs.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2017-04-26:

Weak disapproval. This breaks our plan to keep xenial support while removing overlays.

The new GMock CMake package is apparently still too new to be backward compatible.

review: Disapprove

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Alan Griffiths

Emanuele Antonio Faraone

Gerry Boland

Mir development team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2017-04-21 03:08:25 +0000
 +++ CMakeLists.txt	2017-04-24 09:26:55 +0000
@@ -284,7 +284,16 @@
  add_subdirectory(cmake/)
  if (MIR_ENABLE_TESTS)
--  find_package(GtestGmock REQUIRED)
++  find_package(GMock REQUIRED)
++  if (MIR_CHROOT)
++    string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GMOCK_INCLUDE_DIRS    "${GMOCK_INCLUDE_DIRS}")
++    string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GTEST_INCLUDE_DIRS    "${GTEST_INCLUDE_DIRS}")
++    string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GTEST_LIBRARIES       "${GTEST_LIBRARIES}")
++    string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GMOCK_INCLUDE_DIRS    "${GMOCK_INCLUDE_DIRS}")
++    string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GTEST_MAIN_LIBRARIES  "${GTEST_MAIN_LIBRARIES}")
++    string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GMOCK_LIBRARIES       "${GMOCK_LIBRARIES}")
++    string(REPLACE "/usr/" "${MIR_CHROOT}/usr/" GTEST_BOTH_LIBRARIES  "${GTEST_BOTH_LIBRARIES}")
++  endif()
    pkg_check_modules(LIBEVDEV REQUIRED libevdev)
    include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
    add_subdirectory(tests/)
 === modified file 'benchmarks/frame-uniformity/CMakeLists.txt'
 --- benchmarks/frame-uniformity/CMakeLists.txt	2017-04-21 03:08:25 +0000
 +++ benchmarks/frame-uniformity/CMakeLists.txt	2017-04-24 09:26:55 +0000
@@ -28,7 +28,7 @@
    mirserver
    mirclient
    mirplatform
--
++
    mir-test-assist
    # needed for fake_event_hub_server_configuration.h (which relies on private APIs)
@@ -39,7 +39,6 @@
    ${Boost_LIBRARIES}
    ${GTEST_BOTH_LIBRARIES}
--  ${GMOCK_LIBRARY}
--  ${GMOCK_MAIN_LIBRARY}
++  ${GMOCK_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+ )
 === removed file 'cmake/FindGtestGmock.cmake'
 --- cmake/FindGtestGmock.cmake	2017-01-18 02:29:37 +0000
 +++ cmake/FindGtestGmock.cmake	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
--include(ExternalProject)
--include(FindPackageHandleStandardArgs)
--
--#
--# When cross compiling MIR_CHROOT points to our chroot.
--# When not cross compiling, it should be blank to use the host system.
--#
--set(usr ${MIR_CHROOT}/usr)
--
--if (EXISTS ${usr}/src/googletest)
--  set (USING_GOOGLETEST_1_8 TRUE)
--  set (GTEST_INSTALL_DIR ${usr}/src/googletest/googletest/include)
--else()
--  set (GTEST_INSTALL_DIR ${usr}/src/gmock/gtest/include)
--endif()
--
--#gtest
--find_path(
--  GTEST_INCLUDE_DIR gtest/gtest.h
--  HINTS ${GTEST_INSTALL_DIR}
--)
--
--#gmock
--find_path(
--  GMOCK_INSTALL_DIR CMakeLists.txt
--  HINTS ${usr}/src/googletest ${usr}/src/gmock)
--if(${GMOCK_INSTALL_DIR} STREQUAL "GMOCK_INSTALL_DIR-NOTFOUND")
--    message(FATAL_ERROR "google-mock package not found")
--endif()
--
--find_path(GMOCK_INCLUDE_DIR gmock/gmock.h)
--
--if (USING_GOOGLETEST_1_8)
--  set(GMOCK_BASE_BINARY_DIR ${CMAKE_BINARY_DIR}/gmock/libs)
--  set(GMOCK_BINARY_DIR ${GMOCK_BASE_BINARY_DIR}/googlemock)
--  set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
--else()
--  set(GMOCK_BASE_BINARY_DIR ${CMAKE_BINARY_DIR}/gmock/libs)
--  set(GMOCK_BINARY_DIR ${GMOCK_BASE_BINARY_DIR})
--  set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
--endif()
--
--set(GTEST_CXX_FLAGS "-fPIC -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64")
--if (cmake_build_type_lower MATCHES "threadsanitizer")
--  set(GTEST_CXX_FLAGS "${GTEST_CXX_FLAGS} -fsanitize=thread")
--elseif (cmake_build_type_lower MATCHES "ubsanitizer")
--  set(GTEST_CXX_FLAGS "${GTEST_CXX_FLAGS} -fsanitize=undefined")
--endif()
--
--set(GTEST_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${GTEST_CXX_FLAGS}")
--list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
--list(APPEND GTEST_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
--
--if (USING_GOOGLETEST_1_8)
--  list(APPEND GTEST_CMAKE_ARGS -DBUILD_GTEST=ON)
--endif()
--
--if (cmake_build_type_lower MATCHES "threadsanitizer")
--  #Skip compiler check, since if GCC is the compiler, we need to link against -ltsan
--  #explicitly; specifying additional linker flags doesn't seem possible for external projects
--  list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER_WORKS=1)
--endif()
--if (${CMAKE_CROSSCOMPILING})
--  if(DEFINED MIR_CHROOT)
--    list(APPEND GTEST_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
--  else()
--    list(APPEND GTEST_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
--    list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
--  endif()
--endif()
--
--ExternalProject_Add(
--    GMock
--    #where to build in source tree
--    PREFIX ${GMOCK_PREFIX}
--    #where the source is external to the project
--    SOURCE_DIR ${GMOCK_INSTALL_DIR}
--    #forward the compilers to the subproject so cross-arch builds work
--    CMAKE_ARGS ${GTEST_CMAKE_ARGS}
--    BINARY_DIR ${GMOCK_BASE_BINARY_DIR}
--
--    #we don't need to install, so skip
--    INSTALL_COMMAND ""
--)
--
--set(GMOCK_LIBRARY ${GMOCK_BINARY_DIR}/libgmock.a)
--set(GMOCK_MAIN_LIBRARY ${GMOCK_BINARY_DIR}/libgmock_main.a)
--set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY})
--set(GTEST_LIBRARY ${GTEST_BINARY_DIR}/libgtest.a)
--set(GTEST_MAIN_LIBRARY ${GTEST_BINARY_DIR}/libgtest_main.a)
--set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
--set(GTEST_ALL_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
--
--find_package_handle_standard_args(GTest  DEFAULT_MSG
--                                    GMOCK_INCLUDE_DIR
--                                    GTEST_INCLUDE_DIR)
 === modified file 'debian/control'
 --- debian/control	2017-04-21 03:08:25 +0000
 +++ debian/control	2017-04-24 09:26:55 +0000
@@ -4,6 +4,7 @@
  Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
  XSBC-Original-Maintainer: Thomas Voß <thomas.voss@canonical.com>
  Build-Depends: cmake,
++               cmake-extras,
                 pkg-config,
                 debhelper (>= 9),
                 doxygen,
 === modified file 'tests/CMakeLists.txt'
 --- tests/CMakeLists.txt	2017-04-21 03:08:25 +0000
 +++ tests/CMakeLists.txt	2017-04-24 09:26:55 +0000
@@ -104,8 +104,7 @@
    mir-test-doubles-platform-static
    ${Boost_LIBRARIES}
    ${GTEST_BOTH_LIBRARIES}
--  ${GMOCK_LIBRARY}
--  ${GMOCK_MAIN_LIBRARY}
++  ${GMOCK_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+ )
 === modified file 'tests/integration-tests/CMakeLists.txt'
 --- tests/integration-tests/CMakeLists.txt	2017-04-21 03:08:25 +0000
 +++ tests/integration-tests/CMakeLists.txt	2017-04-24 09:26:55 +0000
@@ -69,8 +69,7 @@
    ${Boost_LIBRARIES}
    ${GTEST_BOTH_LIBRARIES}
--  ${GMOCK_LIBRARY}
--  ${GMOCK_MAIN_LIBRARY}
++  ${GMOCK_LIBRARIES}
    # Mesa platform dependencies
    ${DRM_LDFLAGS} ${DRM_LIBRARIES}
    ${GBM_LDFLAGS} ${GBM_LIBRARIES}
 === modified file 'tests/mir_test_doubles/CMakeLists.txt'
 --- tests/mir_test_doubles/CMakeLists.txt	2017-04-21 03:08:25 +0000
 +++ tests/mir_test_doubles/CMakeLists.txt	2017-04-24 09:26:55 +0000
@@ -87,7 +87,7 @@
    mirserver
    ${Boost_LIBRARIES}
--  ${GMOCK_LIBRARY}
++  ${GMOCK_LIBRARIES}
    ${GMOCK_MAIN_LIBRARY}
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+ )
@@ -105,7 +105,7 @@
    mir-test-doubles-platform-static
    -ldl
--  ${GMOCK_LIBRARY}
++  ${GMOCK_LIBRARIES}
    ${GMOCK_MAIN_LIBRARY}
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+ )
 === modified file 'tests/mir_test_framework/CMakeLists.txt'
 --- tests/mir_test_framework/CMakeLists.txt	2017-03-14 04:41:33 +0000
 +++ tests/mir_test_framework/CMakeLists.txt	2017-04-24 09:26:55 +0000
@@ -83,11 +83,11 @@
  target_link_libraries(mir-test-framework-static
++  mirserver
    mirclient
    ${Boost_LIBRARIES}
    ${GTEST_BOTH_LIBRARIES}
--  ${GMOCK_LIBRARY}
--  ${GMOCK_MAIN_LIBRARY}
++  ${GMOCK_LIBRARIES}
    ${UMOCKDEV_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+ )
@@ -118,7 +118,7 @@
  add_library(
    mir-test-input-framework OBJECT
--
++
    stub_input.cpp
    fake_input_device_impl.cpp
    stub_input_platform.cpp
@@ -175,7 +175,7 @@
+ )
  target_link_libraries(
--  mirplatformgraphicsthrow
++  mirplatformgraphicsthrow
    mirplatform
+ )
 === modified file 'tests/performance-tests/CMakeLists.txt'
 --- tests/performance-tests/CMakeLists.txt	2017-04-21 03:08:25 +0000
 +++ tests/performance-tests/CMakeLists.txt	2017-04-24 09:26:55 +0000
@@ -32,8 +32,8 @@
    test_compositor.cpp
+ )
  target_link_libraries(mir_compositor_performance_test
--  ${GTEST_BOTH_LIBRARIES}
    mir_system_performance_test
++  ${GTEST_BOTH_LIBRARIES}
+ )
  mir_add_wrapped_executable(mir_client_startup_performance_test
 === modified file 'tests/unit-tests/CMakeLists.txt'
 --- tests/unit-tests/CMakeLists.txt	2017-04-21 03:08:25 +0000
 +++ tests/unit-tests/CMakeLists.txt	2017-04-24 09:26:55 +0000
@@ -137,8 +137,7 @@
    ${PROTOBUF_LITE_LIBRARIES}
    ${GTEST_BOTH_LIBRARIES}
--  ${GMOCK_LIBRARY}
--  ${GMOCK_MAIN_LIBRARY}
++  ${GMOCK_LIBRARIES}
    ${Boost_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+ )
@@ -178,8 +177,7 @@
    ${PROTOBUF_LITE_LIBRARIES}
    ${GTEST_BOTH_LIBRARIES}
--  ${GMOCK_LIBRARY}
--  ${GMOCK_MAIN_LIBRARY}
++  ${GMOCK_LIBRARIES}
    ${Boost_LIBRARIES}
    ${UMOCKDEV_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 === modified file 'tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp'
 --- tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp	2017-02-17 07:35:08 +0000
 +++ tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp	2017-04-24 09:26:55 +0000
@@ -155,7 +155,7 @@
      auto edid_size = mir_output_get_edid_size(output);
      ASSERT_NE(nullptr, edid_start);
--    ASSERT_NE(0, edid_size);
++    ASSERT_NE(0u, edid_size);
      std::vector<uint8_t> host_edid(edid_start, edid_start+edid_size);

Mir

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

Commit message

Description of the change

Preview Diff

Subscribers