Merge lp:~raof/mir/fix-googletest-zesty-build into lp:mir

[Chris Halse Rogers]

Fix build failures against GoogleTest 1.8 in zesty (LP: #1644062)

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3842
https://mir-jenkins.ubuntu.com/job/mir-ci/2264/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/2932/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2997
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2989
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2989
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2989
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2961
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2961/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2961
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2961/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2961/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2961
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2961/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2961
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2961/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2961
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2961/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

Woot! Builds on !zesty first time!

Failure is:
11: [ FAILED ] NestedServer.named_cursor_image_changes_are_forwarded_to_host

not related to this branch.

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3842
https://mir-jenkins.ubuntu.com/job/mir-ci/2265/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/2933/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2998
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2990
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2990
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2990
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2962/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2962
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2962/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2962
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2962/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2962
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2962/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2962
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2962/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2962/console

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

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3842
https://mir-jenkins.ubuntu.com/job/mir-ci/2266/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2934
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2999
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2991
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2991
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2991
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2963
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2963/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2963
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2963/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2963
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2963/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2963
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2963/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2963
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2963/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2963
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2963/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

It appears we were both working on this simultaneously. But you solved a couple of problems I had not yet...

Please remember to comment/link your work to bug 1644062.

[Daniel van Vugt (vanvugt)]

Verified all fixed on zesty. Much thanks. Ship it.

review: Approve

=== modified file 'cmake/FindGtestGmock.cmake'
--- cmake/FindGtestGmock.cmake	2016-07-18 07:38:38 +0000
+++ cmake/FindGtestGmock.cmake	2016-11-24 03:08:18 +0000
@@ -1,24 +1,38 @@
 include(ExternalProject)
 include(FindPackageHandleStandardArgs)
 
+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
-set(GTEST_INSTALL_DIR /usr/src/gmock/gtest/include)
-find_path(GTEST_INCLUDE_DIR gtest/gtest.h
-            HINTS ${GTEST_INSTALL_DIR})
+find_path(
+  GTEST_INCLUDE_DIR gtest/gtest.h
+  HINTS ${GTEST_INSTALL_DIR}
+)
 
 #gmock
-find_path(GMOCK_INSTALL_DIR gmock/CMakeLists.txt
-          HINTS /usr/src)
+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()
 
-set(GMOCK_INSTALL_DIR ${GMOCK_INSTALL_DIR}/gmock)
 find_path(GMOCK_INCLUDE_DIR gmock/gmock.h)
 
-set(GMOCK_PREFIX gmock)
-set(GMOCK_BINARY_DIR ${CMAKE_BINARY_DIR}/${GMOCK_PREFIX}/libs)
-set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
+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")
@@ -30,6 +44,11 @@
 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
@@ -52,7 +71,7 @@
     SOURCE_DIR ${GMOCK_INSTALL_DIR}
     #forward the compilers to the subproject so cross-arch builds work
     CMAKE_ARGS ${GTEST_CMAKE_ARGS}
-    BINARY_DIR ${GMOCK_BINARY_DIR}
+    BINARY_DIR ${GMOCK_BASE_BINARY_DIR}
 
     #we don't need to install, so skip
     INSTALL_COMMAND ""

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-11-09 02:30:14 +0000
+++ tests/CMakeLists.txt	2016-11-24 03:08:18 +0000
@@ -10,6 +10,7 @@
 check_cxx_compiler_flag(-Wnull-dereference HAS_W_NULL_DEREFERENCE)
 check_cxx_compiler_flag(-Woverloaded-virtual HAS_W_OVERLOADED_VIRTUAL)
 check_cxx_compiler_flag(-Winconsistent-missing-override HAS_W_INCONSISTENT_MISSING_OVERRIDE)
+check_cxx_compiler_flag(-Wgnu-zero-variadic-macro-arguments HAS_W_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS)
 
 if (HAS_W_NULL_DEREFERENCE)
   # Avoid clang complaints about poor quality gmock/gtest headers
@@ -24,6 +25,10 @@
   # in the tests.
   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override")
 endif()
+if (HAS_W_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS)
+  # INSTANTIATE_TEST_CASE_P hits this like a slice of lemon wrapped around a large gold brick.
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
+endif()
 
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-lto")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-lto")

=== modified file 'tests/include/mir/test/gmock_fixes.h'
--- tests/include/mir/test/gmock_fixes.h	2016-01-29 08:18:22 +0000
+++ tests/include/mir/test/gmock_fixes.h	2016-11-24 03:08:18 +0000
@@ -53,6 +53,10 @@
   // The compiler-generated copy constructor and assignment operator
   // are exactly what we need, so we don't need to define them.
 
+  std::unique_ptr<T, D> Unwrap() {
+    return std::move(value_);
+  }
+
   // Returns the held value and deletes this object.
   std::unique_ptr<T, D> GetValueAndDelete() const {
       std::unique_ptr<T, D> retval(std::move(value_));