Merge lp:~charlesk/keeper/fix-coverage-report-for-helpers-and-service into lp:keeper

[Charles Kerr]

Include all of src/helper/ and of src/service/ are included in the coverage reports

Include all of src/helper/ and src/service/ are included in the coverage reports

[Xavi Garcia (xavi-garcia-mena)]

LGTM, thanks.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-07-28 13:52:30 +0000
+++ CMakeLists.txt	2016-07-31 17:26:28 +0000
@@ -262,5 +262,5 @@
         ${CMAKE_SOURCE_DIR}/tests/*
         ${CMAKE_BINARY_DIR}/*
     TESTS
-        ${UNIT_TEST_TARGETS}
+        ${COVERAGE_TEST_TARGETS}
 )

=== modified file 'src/helper/CMakeLists.txt'
--- src/helper/CMakeLists.txt	2016-07-22 03:59:19 +0000
+++ src/helper/CMakeLists.txt	2016-07-31 17:26:28 +0000
@@ -9,8 +9,13 @@
   ${BACKUP_HELPER_DEPENDENCIES_INCLUDE_DIRS}
 )
 
+set(
+  HELPER_LIB
+  backup-helper
+)
+
 add_library(
-  backup-helper
+  ${HELPER_LIB}
   STATIC
   helper.cpp
   backup-helper.cpp
@@ -19,13 +24,13 @@
 )
 
 set_target_properties(
-  backup-helper
+  ${HELPER_LIB}
   PROPERTIES
   AUTOMOC TRUE
 )
 
 target_link_libraries(
-  backup-helper
+  ${HELPER_LIB}
   ${BACKUP_HELPER_DEPENDENCIES_LIBRARIES}
   Qt5::Core
   Qt5::DBus
@@ -36,3 +41,10 @@
   FILES ${CMAKE_SOURCE_DIR}/src/helper/exec-tool
   DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/ubuntu-app-launch/backup-helper
 )
+
+set(
+  COVERAGE_REPORT_TARGETS
+  ${COVERAGE_REPORT_TARGETS}
+  ${HELPER_LIB}
+  PARENT_SCOPE
+)

=== modified file 'src/service/CMakeLists.txt'
--- src/service/CMakeLists.txt	2016-07-22 04:01:28 +0000
+++ src/service/CMakeLists.txt	2016-07-31 17:26:28 +0000
@@ -19,13 +19,6 @@
   ${SERVICE_LIB_SOURCES}
 )
 
-set(
-  COVERAGE_REPORT_TARGETS
-  ${COVERAGE_REPORT_TARGETS}
-  ${SERVICE_LIB}
-  PARENT_SCOPE
-)
-
 set(SERVICE_EXEC_SOURCES
   main.cpp
 )
@@ -60,6 +53,7 @@
 set(
   COVERAGE_REPORT_TARGETS
   ${COVERAGE_REPORT_TARGETS}
+  ${SERVICE_LIB}
   ${SERVICE_EXEC}
   PARENT_SCOPE
 )

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-07-28 14:21:55 +0000
+++ tests/CMakeLists.txt	2016-07-31 17:26:28 +0000
@@ -72,7 +72,7 @@
 add_subdirectory(integration)
 
 set(
-  UNIT_TEST_TARGETS
-  ${UNIT_TEST_TARGETS}
+  COVERAGE_TEST_TARGETS
+  ${COVERAGE_TEST_TARGETS}
   PARENT_SCOPE
 )

=== modified file 'tests/dbusmock/CMakeLists.txt'
--- tests/dbusmock/CMakeLists.txt	2016-07-27 10:13:02 +0000
+++ tests/dbusmock/CMakeLists.txt	2016-07-31 17:26:28 +0000
@@ -43,3 +43,13 @@
     ${TEST_NAME}
     ${TEST_NAME}
 )
+
+#
+#
+#
+set(
+  COVERAGE_TEST_TARGETS
+  ${COVERAGE_TEST_TARGETS}
+  ${TEST_NAME}
+  PARENT_SCOPE
+)

=== modified file 'tests/integration/CMakeLists.txt'
--- tests/integration/CMakeLists.txt	2016-07-27 10:13:02 +0000
+++ tests/integration/CMakeLists.txt	2016-07-31 17:26:28 +0000
@@ -13,3 +13,9 @@
 )
 
 add_subdirectory(helpers)
+
+set(
+  COVERAGE_TEST_TARGETS
+  ${COVERAGE_TEST_TARGETS}
+  PARENT_SCOPE
+)

=== modified file 'tests/integration/helpers/CMakeLists.txt'
--- tests/integration/helpers/CMakeLists.txt	2016-07-27 10:13:02 +0000
+++ tests/integration/helpers/CMakeLists.txt	2016-07-31 17:26:28 +0000
@@ -52,8 +52,8 @@
 )
 
 set(
-  UNIT_TEST_TARGETS
-  ${UNIT_TEST_TARGETS}
+  COVERAGE_TEST_TARGETS
+  ${COVERAGE_TEST_TARGETS}
   ${HELPERS_TEST}
   PARENT_SCOPE
 )

=== modified file 'tests/unit/CMakeLists.txt'
--- tests/unit/CMakeLists.txt	2016-07-27 10:13:02 +0000
+++ tests/unit/CMakeLists.txt	2016-07-31 17:26:28 +0000
@@ -32,7 +32,7 @@
 add_subdirectory(tar)
 
 set(
-  UNIT_TEST_TARGETS
-  ${UNIT_TEST_TARGETS}
+  COVERAGE_TEST_TARGETS
+  ${COVERAGE_TEST_TARGETS}
   PARENT_SCOPE
 )

=== modified file 'tests/unit/helper/CMakeLists.txt'
--- tests/unit/helper/CMakeLists.txt	2016-07-28 13:52:30 +0000
+++ tests/unit/helper/CMakeLists.txt	2016-07-31 17:26:28 +0000
@@ -43,8 +43,8 @@
 #
 
 set(
-  UNIT_TEST_TARGETS
-  ${UNIT_TEST_TARGETS}
+  COVERAGE_TEST_TARGETS
+  ${COVERAGE_TEST_TARGETS}
   ${SPEED_TEST}
   PARENT_SCOPE
 )

=== modified file 'tests/unit/metadata-providers/CMakeLists.txt'
--- tests/unit/metadata-providers/CMakeLists.txt	2016-07-22 13:13:05 +0000
+++ tests/unit/metadata-providers/CMakeLists.txt	2016-07-31 17:26:28 +0000
@@ -22,8 +22,8 @@
 )
 
 set(
-  UNIT_TEST_TARGETS
-  ${UNIT_TEST_TARGETS}
+  COVERAGE_TEST_TARGETS
+  ${COVERAGE_TEST_TARGETS}
   ${TEST_NAME}
   PARENT_SCOPE
 )

=== modified file 'tests/unit/tar/CMakeLists.txt'
--- tests/unit/tar/CMakeLists.txt	2016-07-22 22:45:59 +0000
+++ tests/unit/tar/CMakeLists.txt	2016-07-31 17:26:28 +0000
@@ -56,8 +56,8 @@
 #
 #
 set(
-  UNIT_TEST_TARGETS
-  ${UNIT_TEST_TARGETS}
+  COVERAGE_TEST_TARGETS
+  ${COVERAGE_TEST_TARGETS}
   ${TAR_CREATOR_TEST}
   ${KEEPER_TAR_CREATE_TEST}
   PARENT_SCOPE