Merge lp:~kyrofa/unity-scope-click/1457170_update-cmake-extras into lp:unity-scope-click

[Kyle Fazzari]

Update usage of cmake-extras to be compatible with cmake-extras 0.4.

Update usage of cmake-extras to be compatible with cmake-extras 0.4.

Also update HACKING to cover new usage.

[lp:~kyrofa/unity-scope-click/1457170_update-cmake-extras]

326. By Kyle Fazzari on 2015-05-20

Update HACKING to explicitly discuss HTML coverage report.

327. By Kyle Fazzari on 2015-05-20

Remove tests' explicit link to gcov.

Replace by taking advantage of cmake-extras v0.4's TESTS parameter.

[dobey (dobey)]

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:327
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/602/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-wily/7/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/12/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-wily/7/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-amd64/8
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-amd64/8/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/602/rebuild

review: Approve (continuous-integration)

[Kyle Fazzari (kyrofa)]

My most recent push should resolve your comment. Looks like CI picked it up okay, huh?

[lp:~kyrofa/unity-scope-click/1457170_update-cmake-extras]

328. By Kyle Fazzari on 2015-05-21

Remove redundant check for coverage build type.

Also add gcovr and lcov to build depends in debian/control.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:328
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/603/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-wily/8/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/13/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-wily/8/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-amd64/9
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-amd64/9/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/603/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-05-07 16:11:57 +0000
+++ CMakeLists.txt	2015-05-21 12:25:58 +0000
@@ -47,8 +47,6 @@
 set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
 set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
 
-option(enable_coverage "Add coverage targets.")
-
 add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
 
 # Add our own subdirectories.
@@ -60,12 +58,11 @@
 add_subdirectory(po)
 add_subdirectory(tools)
 
-if(enable_coverage)
-  include(EnableCoverageReport)
-  ENABLE_COVERAGE_REPORT(TARGETS ${SCOPE_LIB_NAME} ${STORE_LIB_UNVERSIONED} ${APPS_LIB_UNVERSIONED}
-    FILTER /usr/include ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*
-  )
-endif()
+include(EnableCoverageReport)
+ENABLE_COVERAGE_REPORT(TARGETS ${SCOPE_LIB_NAME} ${STORE_LIB_UNVERSIONED} ${APPS_LIB_UNVERSIONED}
+  TESTS click_scope_integration_tests libclick-scope-tests fake_launcher click-scope-tests apps-scope-tests download_manager_tool click_interface_tool init-departments
+  FILTER /usr/include ${CMAKE_BINARY_DIR}/*
+)
 
 # Custom targets for the tests
 add_custom_target (test

=== modified file 'HACKING'
--- HACKING	2015-05-07 16:11:57 +0000
+++ HACKING	2015-05-21 12:25:58 +0000
@@ -68,11 +68,17 @@
 To run the coverage tests you'll need to install the gcovr and lcov packages.
 Then you need to compile with coverage enabled, like this:
 
-    $ cmake .. -Denable_coverage=ON
+    $ cmake .. -DCMAKE_BUILD_TYPE=coverage
+    $ make
     $ make test
     $ make coverage
 
-The html will be left on the coveragereport directory.
+
+If you want the coverage report in pretty HTML, use:
+
+    $ make coverage-html
+
+The html will be left in the coveragereport directory.
 
 Updating departments db
 -----------------------

=== modified file 'debian/control'
--- debian/control	2015-05-07 16:11:57 +0000
+++ debian/control	2015-05-21 12:25:58 +0000
@@ -10,8 +10,10 @@
                debhelper (>= 9),
                dh-translations,
                g++-4.9:native,
+               gcovr,
                google-mock,
                intltool,
+               lcov,
                libboost-locale-dev,
                libglib2.0-dev (>= 2.32),
                libjsoncpp-dev,

=== modified file 'libclickscope/tests/CMakeLists.txt'
--- libclickscope/tests/CMakeLists.txt	2015-05-08 14:44:43 +0000
+++ libclickscope/tests/CMakeLists.txt	2015-05-21 12:25:58 +0000
@@ -58,10 +58,6 @@
   ${CMAKE_THREAD_LIBS_INIT}
 )
 
-if(enable_coverage)
-  target_link_libraries(${LIBCLICKSCOPE_TESTS_TARGET} gcov)
-endif()
-
 add_custom_target (test-libclickscope
   COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${LIBCLICKSCOPE_TESTS_TARGET}
   DEPENDS ${LIBCLICKSCOPE_TESTS_TARGET}

=== modified file 'libclickscope/tests/integration/CMakeLists.txt'
--- libclickscope/tests/integration/CMakeLists.txt	2015-05-01 14:52:32 +0000
+++ libclickscope/tests/integration/CMakeLists.txt	2015-05-21 12:25:58 +0000
@@ -26,10 +26,6 @@
   ${CMAKE_THREAD_LIBS_INIT}
 )
 
-if(enable_coverage)
-  target_link_libraries(${INTEGRATION_TARGET} gcov)
-endif()
-
 add_custom_target (test-integration-click-scope
   COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${INTEGRATION_TARGET}
   DEPENDS ${INTEGRATION_TARGET}

=== modified file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	2015-05-08 14:44:43 +0000
+++ scope/tests/CMakeLists.txt	2015-05-21 12:25:58 +0000
@@ -63,11 +63,6 @@
   ${CMAKE_THREAD_LIBS_INIT}
 )
 
-if(enable_coverage)
-  target_link_libraries(${CLICKSCOPE_TESTS_TARGET} gcov)
-  target_link_libraries(${APPS_SCOPE_TESTS_TARGET} gcov)
-endif()
-
 add_custom_target (test-click-scope
   COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${CLICKSCOPE_TESTS_TARGET}
   DEPENDS ${CLICKSCOPE_TESTS_TARGET}

=== modified file 'scope/tests/click_interface_tool/CMakeLists.txt'
--- scope/tests/click_interface_tool/CMakeLists.txt	2015-05-01 14:52:32 +0000
+++ scope/tests/click_interface_tool/CMakeLists.txt	2015-05-21 12:25:58 +0000
@@ -12,7 +12,3 @@
 target_link_libraries (${CLICK_INTERFACE_TOOL_TARGET}
   ${STORE_LIB_UNVERSIONED}
 )
-
-if(enable_coverage)
-  target_link_libraries(${CLICK_INTERFACE_TOOL_TARGET} gcov)
-endif()

=== modified file 'scope/tests/download_manager_tool/CMakeLists.txt'
--- scope/tests/download_manager_tool/CMakeLists.txt	2015-05-01 14:52:32 +0000
+++ scope/tests/download_manager_tool/CMakeLists.txt	2015-05-21 12:25:58 +0000
@@ -12,7 +12,3 @@
 target_link_libraries (${DOWNLOAD_MANAGER_TOOL_TARGET}
   ${STORE_LIB_UNVERSIONED}
 )
-
-if(enable_coverage)
-  target_link_libraries(${DOWNLOAD_MANAGER_TOOL_TARGET} gcov)
-endif()

=== modified file 'scope/tests/fake_launcher/CMakeLists.txt'
--- scope/tests/fake_launcher/CMakeLists.txt	2015-05-01 14:52:32 +0000
+++ scope/tests/fake_launcher/CMakeLists.txt	2015-05-21 12:25:58 +0000
@@ -12,7 +12,3 @@
 target_link_libraries (${FAKE_LAUNCHER_TARGET}
   ${STORE_LIB_UNVERSIONED}
 )
-
-if(enable_coverage)
-  target_link_libraries(${FAKE_LAUNCHER_TARGET} gcov)
-endif()

=== modified file 'tools/init-departments/CMakeLists.txt'
--- tools/init-departments/CMakeLists.txt	2015-05-01 14:52:32 +0000
+++ tools/init-departments/CMakeLists.txt	2015-05-21 12:25:58 +0000
@@ -20,8 +20,4 @@
   ${CMAKE_THREAD_LIBS_INIT}
 )
 
-if(enable_coverage)
-  target_link_libraries(${INITDEPTS} gcov)
-endif()
-
 install(TARGETS ${INITDEPTS} DESTINATION sbin)