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

[dobey]

Use cmake-extras EnableCoverageReport instead of custom code for coverage.

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

PASSED: Continuous integration, rev:49
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-transfer-ci/11/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1228
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1235
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1018
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1018/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1018
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1018/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1018
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1018/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1018
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1018/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1018
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1018/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1018
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1018/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Pete Woods (pete-woods)]

review: Approve

[Charles Kerr (charlesk)]

Looks great.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-09-23 13:47:10 +0000
+++ CMakeLists.txt	2016-12-02 21:27:54 +0000
@@ -73,22 +73,23 @@
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
 include_directories (${CMAKE_CURRENT_BINARY_DIR}/include)
 
-# testing & coverage
-if (${enable_tests})
-  pkg_check_modules (DBUSTEST REQUIRED dbustest-1>=14.04.0)
-  enable_testing ()
-  if (${enable_lcov})
-    include(GCov)
-  endif ()
-endif ()
-
 # add the subdirs
 add_subdirectory(data)
 add_subdirectory(include)
 add_subdirectory(src)
 add_subdirectory(po)
+
+# testing & coverage
 if (${enable_tests})
+  pkg_check_modules (DBUSTEST REQUIRED dbustest-1>=14.04.0)
+  enable_testing ()
   add_subdirectory(tests)
+  include(EnableCoverageReport)
+  ENABLE_COVERAGE_REPORT(
+    TARGETS indicator-transfer indicator-transfer-service dmtransfers mock-source-plugin
+    TESTS test-controller test-multisource test-plugin-source test-view-gmenu
+    FILTER /usr/include ${CMAKE_BINARY_DIR}/*
+  )
 endif ()
 
 # uninstall target

=== removed file 'cmake/GCov.cmake'
--- cmake/GCov.cmake	2014-03-29 17:17:09 +0000
+++ cmake/GCov.cmake	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-if (CMAKE_BUILD_TYPE MATCHES coverage)
-  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
-        COMMAND "${LCOV_EXECUTABLE}" --directory ${CMAKE_BINARY_DIR} --capture | ${CMAKE_SOURCE_DIR}/trim-lcov.py > dconf-lcov.info
-        COMMAND "${LCOV_EXECUTABLE}" -r dconf-lcov.info /usr/include/\\*  -o nosys-lcov.info
-        COMMAND LANG=C "${GENHTML_EXECUTABLE}" --prefix ${CMAKE_BINARY_DIR} --output-directory lcov-html --legend --show-details nosys-lcov.info
-        COMMAND ${CMAKE_COMMAND} -E echo ""
-        COMMAND ${CMAKE_COMMAND} -E echo "file://${CMAKE_BINARY_DIR}/lcov-html/index.html"
-        COMMAND ${CMAKE_COMMAND} -E echo "")
-        #COMMAND "${LCOV_EXECUTABLE}" --directory ${CMAKE_BINARY_DIR} --capture --output-file coverage.info --no-checksum
-        #COMMAND "${GENHTML_EXECUTABLE}" --prefix ${CMAKE_BINARY_DIR} --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
-        #COMMAND ${CMAKE_COMMAND} -E echo "\\#define foo \\\"bar\\\"" 
-        #)
-    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 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-08-03 14:28:28 +0000
+++ src/CMakeLists.txt	2016-12-02 21:27:54 +0000
@@ -15,7 +15,7 @@
      multisource.cpp)
 
 add_library(${SERVICE_LIB} SHARED ${SERVICE_LIB_HANDWRITTEN_SOURCES})
-target_link_libraries (${SERVICE_LIB} PRIVATE ${SERVICE_DEPS_LIBRARIES} ${GCOV_LIBS})
+target_link_libraries (${SERVICE_LIB} PRIVATE ${SERVICE_DEPS_LIBRARIES})
 
 set_target_properties(${SERVICE_LIB} PROPERTIES
   VERSION ${INDICATOR_TRANSFER_VERSION}
@@ -32,13 +32,13 @@
 
 set (SERVICE_EXEC_HANDWRITTEN_SOURCES main.cpp)
 add_executable (${SERVICE_EXEC} ${SERVICE_EXEC_HANDWRITTEN_SOURCES})
-target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES} ${GCOV_LIBS})
+target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES})
 install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
 
 # add warnings/coverage info on handwritten files
 # but not the generated ones...
 set_property (SOURCE ${SERVICE_LIB_HANDWRITTEN_SOURCES} ${SERVICE_EXEC_HANDWRITTEN_SOURCES}
-              APPEND_STRING PROPERTY COMPILE_FLAGS " -std=c++11 -fPIC -g ${CXX_WARNING_ARGS} ${GCOV_FLAGS}")
+              APPEND_STRING PROPERTY COMPILE_FLAGS " -std=c++11 -fPIC -g ${CXX_WARNING_ARGS}")
 
 set_property (SOURCE main.cpp APPEND PROPERTY COMPILE_DEFINITIONS PLUGINDIR="${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
 

=== modified file 'src/dm-plugin/CMakeLists.txt'
--- src/dm-plugin/CMakeLists.txt	2015-07-30 19:52:49 +0000
+++ src/dm-plugin/CMakeLists.txt	2016-12-02 21:27:54 +0000
@@ -13,9 +13,9 @@
 target_link_libraries (${DM_LIB}
     indicator-transfer
     ${SERVICE_DEPS_LIBRARIES}
-    ${GCOV_LIBS})
+)
 
 install(TARGETS ${DM_LIB} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
 
 set_property (SOURCE ${DM_SOURCES}
-              APPEND_STRING PROPERTY COMPILE_FLAGS " -std=c++11 -fPIC -g ${CXX_WARNING_ARGS} ${GCOV_FLAGS}")
+              APPEND_STRING PROPERTY COMPILE_FLAGS " -std=c++11 -fPIC -g ${CXX_WARNING_ARGS}")