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

[dobey]

Use coverage support from cmake-extras.

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

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

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

review: Needs Fixing (continuous-integration)

[Pete Woods (pete-woods)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-02-07 21:53:42 +0000
+++ CMakeLists.txt	2017-02-07 21:53:42 +0000
@@ -11,7 +11,6 @@
 
 find_package(PkgConfig REQUIRED)
 include(GNUInstallDirs)
-include(Coverage)
 include(UseVala)
 
 # Workaround for libexecdir on debian
@@ -79,4 +78,9 @@
 
 enable_testing()
 add_subdirectory(tests)
-
+find_package(CoverageReport)
+ENABLE_COVERAGE_REPORT(
+  TARGETS ${COVERAGE_TARGETS}
+  TESTS ${COVERAGE_TEST_TARGETS}
+  FILTER /usr/include ${CMAKE_BINARY_DIR}/*
+)

=== removed file 'cmake/Coverage.cmake'
--- cmake/Coverage.cmake	2013-08-16 03:13:41 +0000
+++ cmake/Coverage.cmake	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-if (CMAKE_BUILD_TYPE MATCHES coverage)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage")
-  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} --coverage")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --coverage")
-
-  find_program(GCOVR_EXECUTABLE gcovr HINTS ${GCOVR_ROOT} "${GCOVR_ROOT}/bin")
-  if (NOT GCOVR_EXECUTABLE)
-    message(STATUS "Gcovr binary was not found, can not generate XML coverage info.")
-  else ()
-    message(STATUS "Gcovr found, can generate XML coverage info.")
-    add_custom_target (coverage-xml
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      COMMAND "${GCOVR_EXECUTABLE}" --exclude="test.*" --exclude="obj.*" -x -r "${CMAKE_SOURCE_DIR}" 
-      --object-directory=${CMAKE_BINARY_DIR} -o coverage.xml)
-  endif()
-
-  find_program(LCOV_EXECUTABLE lcov HINTS ${LCOV_ROOT} "${GCOVR_ROOT}/bin")
-  find_program(GENHTML_EXECUTABLE genhtml HINTS ${GENHTML_ROOT})
-  if (NOT LCOV_EXECUTABLE)
-    message(STATUS "Lcov binary was not found, can not generate HTML coverage info.")
-  else ()
-    if(NOT GENHTML_EXECUTABLE)
-      message(STATUS "Genthml binary not found, can not generate HTML coverage info.")
-    else()
-      message(STATUS "Lcov and genhtml found, can generate HTML coverage info.")
-      add_custom_target (coverage-html
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        COMMAND "${LCOV_EXECUTABLE}" --capture --output-file "${CMAKE_BINARY_DIR}/coverage.info" --no-checksum --directory "${CMAKE_BINARY_DIR}"
-        COMMAND "${LCOV_EXECUTABLE}" --remove "${CMAKE_BINARY_DIR}/coverage.info" '/usr/*' --output-file "${CMAKE_BINARY_DIR}/coverage.info" 
-        COMMAND "${LCOV_EXECUTABLE}" --remove "${CMAKE_BINARY_DIR}/coverage.info" '${CMAKE_BINARY_DIR}/*' --output-file "${CMAKE_BINARY_DIR}/coverage.info" 
-        COMMAND "${LCOV_EXECUTABLE}" --remove "${CMAKE_BINARY_DIR}/coverage.info" '${CMAKE_SOURCE_DIR}/tests/*' --output-file "${CMAKE_BINARY_DIR}/coverage.info" 
-        COMMAND "${GENHTML_EXECUTABLE}" --prefix "${CMAKE_BINARY_DIR}" --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
-        )
-    endif()
-  endif()
-endif()

=== modified file 'debian/control'
--- debian/control	2017-02-07 21:53:42 +0000
+++ debian/control	2017-02-07 21:53:42 +0000
@@ -9,12 +9,14 @@
                dbus,
                dbus-test-runner (>> 14.04.0+14.04.20150120.1),
                dh-translations,
+               gcovr,
                gir1.2-accountsservice-1.0,
                gnome-common,
                googletest | google-mock (>= 1.6.0+svn437),
                gsettings-ubuntu-schemas,
                autotools-dev,
                valac (>= 0.20),
+               lcov,
                libaccountsservice-dev,
                libdbustest1-dev (>= 15.04.0),
                libgirepository1.0-dev,

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-02-23 12:48:46 +0000
+++ src/CMakeLists.txt	2017-02-07 21:53:42 +0000
@@ -278,3 +278,11 @@
 )
 
 add_subdirectory(gmenuharness)
+
+# coverage reporting
+set(COVERAGE_TARGETS
+  ${COVERAGE_TARGETS}
+  indicator-sound-service-lib
+  indicator-sound-service-bin
+  PARENT_SCOPE
+)

=== modified file 'src/gmenuharness/CMakeLists.txt'
--- src/gmenuharness/CMakeLists.txt	2015-12-23 13:35:46 +0000
+++ src/gmenuharness/CMakeLists.txt	2017-02-07 21:53:42 +0000
@@ -15,3 +15,10 @@
     gmenuharness-shared
     ${GLIB_LDFLAGS}
 )
+
+# coverage reporting
+set(COVERAGE_TARGETS
+  ${COVERAGE_TARGETS}
+  gmenuharness-shared
+  PARENT_SCOPE
+)

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2017-02-07 21:53:42 +0000
+++ tests/CMakeLists.txt	2017-02-07 21:53:42 +0000
@@ -284,3 +284,17 @@
 add_subdirectory(integration)
 add_subdirectory(dbus-types)
 add_subdirectory(service-mocks)
+
+# coverage reporting
+set(COVERAGE_TEST_TARGETS
+  ${COVERAGE_TEST_TARGETS}
+  name-watch-test
+  accounts-service-user-test
+  volume-control-test
+  sound-menu-test
+  notifications-test
+  media-player-user-test
+  greeter-list-test
+  indicator-test
+  PARENT_SCOPE
+)

=== modified file 'tests/integration/CMakeLists.txt'
--- tests/integration/CMakeLists.txt	2017-02-07 21:53:42 +0000
+++ tests/integration/CMakeLists.txt	2017-02-07 21:53:42 +0000
@@ -126,3 +126,10 @@
 )
 
 #add_subdirectory(utils)
+
+# coverage reporting
+set(COVERAGE_TEST_TARGETS
+  ${COVERAGE_TEST_TARGETS}
+  integration-tests
+  PARENT_SCOPE
+)