Merge into trunk.16.10 : fix-coverage : Code : Indicator Location

Status:	Merged
Approved by:	dobey on 2017-02-10
Approved revision:	166
Merged at revision:	164
Proposed branch:	lp:~dobey/indicator-location/fix-coverage
Merge into:	lp:indicator-location
Prerequisite:	lp:~dobey/indicator-location/fix-gtest
Diff against target:	213 lines (+26/-124) 6 files modified CMakeLists.txt (+10/-14) cmake/GCov.cmake (+0/-53) debian/control (+3/-1) src/CMakeLists.txt (+1/-1) tests/CMakeLists.txt (+12/-2) trim-lcov.py (+0/-53)
To merge this branch:	bzr merge lp:~dobey/indicator-location/fix-coverage
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Pete Woods (community)		2017-02-07	Approve on 2017-02-10
unity-api-1-bot	continuous-integration		Approve on 2017-02-07
Review via email: mp+316605@code.launchpad.net

Commit message

Make coverage reporting work.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-02-07:

#

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

review: Approve (continuous-integration)

lp:~dobey/indicator-location/fix-coverage updated on 2017-02-07

165. By dobey on 2017-02-07: Oops remove usage of GCOV variable.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-02-07:

#

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

review: Approve (continuous-integration)

Revision history for this message

Pete Woods (pete-woods) on 2017-02-10:

#

review: Needs Fixing

lp:~dobey/indicator-location/fix-coverage updated on 2017-02-10

166. By dobey on 2017-02-10: Remove hard-coded -g compiler flag.

Revision history for this message

Pete Woods (pete-woods) on 2017-02-10:

#

review: Approve

Indicator Location

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

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2017-02-10 16:19:35 +0000
 +++ CMakeLists.txt	2017-02-10 16:19:35 +0000
@@ -10,9 +10,6 @@
  set (SERVICE_LIB ${PACKAGE})
  set (SERVICE_EXEC "${PACKAGE}-service")
--option (enable_tests "Build the package's automatic tests." ON)
--option (enable_lcov "Generate lcov code coverage reports." ON)
--
  ##
  ##  GNU standard paths
  ##
@@ -79,18 +76,17 @@
  set (CMAKE_INCLUDE_CURRENT_DIR ON)
  set (CC_WARNING_ARGS " -Wall -Wextra -Wno-missing-field-initializers")
--# testing & coverage
--if (${enable_tests})
--  enable_testing ()
--  if (${enable_lcov})
--    include(GCov)
--  endif ()
--endif ()
--
  add_subdirectory (src)
  add_subdirectory (data)
  add_subdirectory (po)
  add_subdirectory (tools)
--if (${enable_tests})
--  add_subdirectory (tests)
--endif ()
++
++# testing & coverage
++enable_testing ()
++add_subdirectory (tests)
++find_package(CoverageReport)
++ENABLE_COVERAGE_REPORT(
++  TARGETS ${SERVICE_LIB} ${SERVICE_EXEC}
++  TESTS ${COVERAGE_TEST_TARGETS}
++  FILTER /usr/include ${CMAKE_BINARY_DIR}/*
++)
 === removed file 'cmake/GCov.cmake'
 --- cmake/GCov.cmake	2013-08-25 20:31:26 +0000
 +++ cmake/GCov.cmake	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
--if (CMAKE_BUILD_TYPE MATCHES coverage)
--  set(LCOV_RAW_FILE "lcov-raw.info")
--  set(LCOV_FILE "lcov.info")
--  set(GCOV_FLAGS "${GCOV_FLAGS} --coverage")
--  set(CMAKE_EXE_LINKER_FLAGS    "${CMAKE_EXE_LINKER_FLAGS}    ${GCOV_FLAGS}")
--  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${GCOV_FLAGS}")
--  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GCOV_FLAGS}")
--  set(GCOV_LIBS ${GCOV_LIBS} gcov)
--
--  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.*" -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 "${CMAKE_CTEST_COMMAND}" --force-new-ctest-process --verbose
--        # generate the raw lcov data
--        COMMAND "${LCOV_EXECUTABLE}" --directory ${CMAKE_BINARY_DIR} --capture -o ${LCOV_RAW_FILE}
--        # FIXME: when ubuntu gets lcov 1.10 we can use --no-external instead of the brittle --remove
--        COMMAND "${LCOV_EXECUTABLE}" --remove ${LCOV_RAW_FILE} "/usr/include/*" | ${CMAKE_SOURCE_DIR}/trim-lcov.py > ${LCOV_FILE}
--        COMMAND LANG=C "${GENHTML_EXECUTABLE}" --prefix ${CMAKE_BINARY_DIR} --output-directory lcov-html --legend --show-details ${LCOV_FILE}
--        COMMAND ${CMAKE_COMMAND} -E echo ""
--        COMMAND ${CMAKE_COMMAND} -E echo "file://${CMAKE_BINARY_DIR}/lcov-html/index.html"
--        COMMAND ${CMAKE_COMMAND} -E echo ""
--        VERBATIM) # VERBATIM is necessary here for the wildcard in --remove... again, when we go to lcov 1.10 we can drop this
--        #)
--    endif()
--  endif()
--endif()
--
--
--	#$(MAKE) $(AM_MAKEFLAGS) check
--	#lcov --directory $(top_builddir) --capture --test-name dconf | $(top_srcdir)/trim-lcov.py > dconf-lcov.info
--	#LANG=C genhtml --prefix $(top_builddir) --output-directory lcov-html --legend --show-details dconf-lcov.info
--	#@echo
--	#@echo "     file://$(abs_top_builddir)/lcov-html/index.html"
--	#@echo
 === modified file 'debian/control'
 --- debian/control	2017-02-10 16:19:35 +0000
 +++ debian/control	2017-02-10 16:19:35 +0000
@@ -7,8 +7,10 @@
                 dbus,
                 debhelper (>= 9),
                 dh-translations,
++               gcovr,
                 googletest | google-mock,
--               intltool (>= 0.35.0),
++               intltool (>= 0.35.0),
++               lcov,
                 libglib2.0-dev (>= 2.36),
                 libubuntu-app-launch2-dev,
                 liburl-dispatcher1-dev,
 === modified file 'src/CMakeLists.txt'
 --- src/CMakeLists.txt	2016-01-21 18:28:12 +0000
 +++ src/CMakeLists.txt	2017-02-10 16:19:35 +0000
@@ -1,4 +1,4 @@
--SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -g ${CXX_WARNING_ARGS} ${GCOV_FLAGS}")
++SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_WARNING_ARGS}")
  #set_property (DIRECTORY
  #              APPEND PROPERTY INCLUDE_DIRECTORIES ${SERVICE_INCLUDE_DIRS})
 === modified file 'tests/CMakeLists.txt'
 --- tests/CMakeLists.txt	2017-02-10 16:19:35 +0000
 +++ tests/CMakeLists.txt	2017-02-10 16:19:35 +0000
@@ -8,8 +8,8 @@
  include_directories (${CMAKE_SOURCE_DIR})
  #include_directories (${CMAKE_CURRENT_BINARY_DIR})
--set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -g ${CC_WARNING_ARGS}")
--set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g ${CC_WARNING_ARGS} -std=c++11")
++set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   ${CC_WARNING_ARGS}")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CC_WARNING_ARGS} -std=c++11")
  add_test(NAME formatcode
           COMMAND "${CMAKE_SOURCE_DIR}/tools/format-test.sh" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}/tools/formatcode")
@@ -28,3 +28,13 @@
    ${GMOCK_LIBRARIES}
+ )
++
++
++###
++### coverage
++###
++set(COVERAGE_TEST_TARGETS
++  ${COVERAGE_TEST_TARGETS}
++  ${TEST_NAME}
++  PARENT_SCOPE
++)
 === removed file 'trim-lcov.py'
 --- trim-lcov.py	2013-08-25 20:31:26 +0000
 +++ trim-lcov.py	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
--#!/usr/bin/python
--
--# This script removes branch and/or line coverage data for lines that
--# contain a particular substring.
--#
--# In the interest of "fairness" it removes all branch or coverage data
--# when a match is found -- not just negative data.  It is therefore
--# likely that running this script will actually reduce the total number
--# of lines and branches that are marked as covered (in absolute terms).
--#
--# This script intentionally avoids checking for errors.  Any exceptions
--# will trigger make to fail.
--#
--# Author: Ryan Lortie <desrt@desrt.ca>
--
--import sys
--
--line_suppress = ['g_assert_not_reached']
--branch_suppress = ['g_assert', 'g_return_if_fail', 'g_clear_object', 'g_clear_pointer', 'g_return_val_if_fail', 'G_DEFINE_TYPE']
--
--def check_suppress(suppressions, source, data):
--    line, _, rest = data.partition(',')
--    line = int(line) - 1
--
--    assert line < len(source)
--
--    for suppression in suppressions:
--        if suppression in source[line]:
--            return True
--
--    return False
--
--source = []
--for line in sys.stdin:
--    line = line[:-1]
--
--    keyword, _, rest = line.partition(':')
--
--    # Source file
--    if keyword == 'SF':
--        source = file(rest).readlines()
--
--    # Branch coverage data
--    elif keyword == 'BRDA':
--        if check_suppress(branch_suppress, source, rest):
--            continue
--
--    # Line coverage data
--    elif keyword == 'DA':
--        if check_suppress(line_suppress, source, rest):
--            continue
--
--    print line