Merge lp:~dobey/indicator-sound/fix-gtest into lp:indicator-sound

[dobey]

Use only the gmock module from cmake-extras.

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:546
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-sound-ci/10/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1632/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1639
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1417/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1417/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1417/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1417/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1417/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1417/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-sound-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[Pete Woods (pete-woods)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-12 19:36:10 +0000
+++ CMakeLists.txt	2017-02-07 21:29:28 +0000
@@ -78,10 +78,5 @@
 add_subdirectory(src)
 
 enable_testing()
-
-set (GTEST_SOURCE_DIR /usr/src/gtest/src)
-set (GTEST_INCLUDE_DIR ${GTEST_SOURCE_DIR}/..)
-set (GTEST_LIBS -lpthread)
-
 add_subdirectory(tests)
 

=== modified file 'debian/control'
--- debian/control	2017-01-09 14:18:03 +0000
+++ debian/control	2017-02-07 21:29:28 +0000
@@ -11,7 +11,7 @@
                dh-translations,
                gir1.2-accountsservice-1.0,
                gnome-common,
-               google-mock (>= 1.6.0+svn437),
+               googletest | google-mock (>= 1.6.0+svn437),
                gsettings-ubuntu-schemas,
                autotools-dev,
                valac (>= 0.20),
@@ -19,7 +19,6 @@
                libdbustest1-dev (>= 15.04.0),
                libgirepository1.0-dev,
                libglib2.0-dev (>= 2.32.0),
-               libgtest-dev,
                libqtdbusmock1-dev (>= 0.3),
                libqtdbustest1-dev,
                libunity-api-dev,

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-01-07 05:32:06 +0000
+++ tests/CMakeLists.txt	2017-02-07 21:29:28 +0000
@@ -1,14 +1,5 @@
-
-###########################
-# Google Test
-###########################
-
-include_directories(${GTEST_INCLUDE_DIR})
-
-add_library (gtest-static STATIC
-             ${GTEST_SOURCE_DIR}/gtest-all.cc
-             ${GTEST_SOURCE_DIR}/gtest_main.cc)
-target_link_libraries(gtest-static ${GTEST_LIBS})
+find_package(GMock)
+include_directories(${GMOCK_INCLUDE_DIRS})
 
 ###########################
 # GSettings Schema
@@ -141,7 +132,7 @@
 
 include_directories(${CMAKE_SOURCE_DIR}/src)
 add_executable (name-watch-test name-watch-test.cc ${CMAKE_SOURCE_DIR}/src/bus-watch-namespace.c)
-target_link_libraries (name-watch-test gtest-static ${SOUNDSERVICE_LIBRARIES})
+target_link_libraries (name-watch-test ${SOUNDSERVICE_LIBRARIES} ${GMOCK_LIBRARIES})
 add_test(name-watch-test name-watch-test)
 
 ###########################
@@ -154,9 +145,9 @@
     accounts-service-user-test
     indicator-sound-service-lib
     vala-mocks-lib
-    gtest-static
     ${SOUNDSERVICE_LIBRARIES}
     ${TEST_LIBRARIES}
+    ${GMOCK_LIBRARIES}
 )
 
 # Split tests to work around libaccountservice sucking
@@ -179,8 +170,8 @@
     indicator-sound-service-lib
     vala-mocks-lib
     pulse-mock
-    gtest-static
     ${TEST_LIBRARIES}
+    ${GMOCK_LIBRARIES}
 )
 
 add_test(volume-control-test volume-control-test)
@@ -195,9 +186,9 @@
     sound-menu-test
     indicator-sound-service-lib
     vala-mocks-lib
-    gtest-static
     ${SOUNDSERVICE_LIBRARIES}
     ${TEST_LIBRARIES}
+    ${GMOCK_LIBRARIES}
 )
 
 add_test(sound-menu-test sound-menu-test)
@@ -213,9 +204,9 @@
     indicator-sound-service-lib
     vala-mocks-lib
     pulse-mock
-    gtest-static
     ${SOUNDSERVICE_LIBRARIES}
     ${TEST_LIBRARIES}
+    ${GMOCK_LIBRARIES}
 )
 
 add_test(notifications-test notifications-test)
@@ -230,9 +221,9 @@
     media-player-user-test
     indicator-sound-service-lib
     vala-mocks-lib
-    gtest-static
     ${SOUNDSERVICE_LIBRARIES}
     ${TEST_LIBRARIES}
+    ${GMOCK_LIBRARIES}
 )
 
 # Split tests to work around libaccountservice sucking
@@ -256,9 +247,9 @@
     greeter-list-test
     indicator-sound-service-lib
     vala-mocks-lib
-    gtest-static
     ${SOUNDSERVICE_LIBRARIES}
     ${TEST_LIBRARIES}
+    ${GMOCK_LIBRARIES}
 )
 
 # Split tests to work around libaccountservice sucking
@@ -280,9 +271,9 @@
 add_executable (indicator-test indicator-test.cc gschemas.compiled)
 target_link_libraries (
     indicator-test
-    gtest-static
     ${SOUNDSERVICE_LIBRARIES}
     ${TEST_LIBRARIES}
+    ${GMOCK_LIBRARIES}
 )
 
 # Split tests to work around libaccountservice sucking

=== modified file 'tests/integration/CMakeLists.txt'
--- tests/integration/CMakeLists.txt	2016-12-09 12:07:28 +0000
+++ tests/integration/CMakeLists.txt	2017-02-07 21:29:28 +0000
@@ -1,8 +1,6 @@
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-find_package(GMock)
-
 #pkg_check_modules(GMENUHARNESS REQUIRED libgmenuharness REQUIRED)
 #include_directories(${GMENUHARNESS_INCLUDE_DIRS})
 include_directories("${CMAKE_SOURCE_DIR}/include")
@@ -21,7 +19,6 @@
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${GMOCK_INCLUDE_DIRS})
-include_directories(${GTEST_INCLUDE_DIRS})
 
 include_directories("${CMAKE_SOURCE_DIR}/tests/dbus-types")
 include_directories("${CMAKE_BINARY_DIR}/tests/dbus-types")
@@ -71,7 +68,6 @@
     sound-indicator-dbus-interfaces
     ${QTDBUSMOCK_LDFLAGS}
     ${QTDBUSTEST_LDFLAGS}
-    ${GTEST_LIBRARIES}
     ${GMOCK_LIBRARIES}
 #    ${GMENUHARNESS_LDFLAGS}
     ${GLIB_LDFLAGS}