1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-12-07 17:06:29 +0000
3
+++ CMakeLists.txt	2017-02-10 16:17:38 +0000
4
@@ -13,9 +13,6 @@
5
13
set(SERVICE_LIB ${PACKAGE})
13
set(SERVICE_LIB ${PACKAGE})
6
14
set(SERVICE_EXEC "${PACKAGE}-service")
14
set(SERVICE_EXEC "${PACKAGE}-service")
7
15
15
8
16
option(enable_tests "Build the package's automatic tests." ON)
9
17
option(enable_coverage "Generate code coverage reports." ON)
10
18
11
19
##
16
##
12
20
##  GNU standard paths
17
##  GNU standard paths
13
21
## 
18
## 
14
@@ -67,22 +64,22 @@
15
67
    list(APPEND CXX_WARNING_ARGS -Wall -Wextra -Wpedantic)
64
    list(APPEND CXX_WARNING_ARGS -Wall -Wextra -Wpedantic)
16
68
endif()
65
endif()
17
69
66
30
70
add_compile_options(-std=c++14 -fPIC -g)
67
add_compile_options(-std=c++14 -fPIC)
19
71
20
72
##
21
73
##  Testing & Coverage
22
74
##
23
75
24
76
if(${enable_tests})
25
77
  enable_testing()
26
78
  if(${enable_coverage})
27
79
    find_package(CoverageReport)
28
80
  endif()
29
81
endif()
31
82
68
32
83
add_subdirectory(src)
69
add_subdirectory(src)
33
84
add_subdirectory(data)
70
add_subdirectory(data)
34
85
add_subdirectory(po)
71
add_subdirectory(po)
38
86
if (${enable_tests})
72
39
87
  add_subdirectory(tests)
73
##
40
88
endif ()
74
##  Testing & Coverage
41
75
##
42
76
43
77
enable_testing()
44
78
add_subdirectory(tests)
45
79
find_package(CoverageReport)
46
80
ENABLE_COVERAGE_REPORT(
47
81
  TARGETS ${SERVICE_LIB} ${SERVICE_EXEC}
48
82
  TESTS ${COVERAGE_TEST_TARGETS}
49
83
  FILTER /usr/include ${CMAKE_BINARY_DIR}/*
50
84
)
51
85
52
89
86
53
=== modified file 'debian/control'
54
--- debian/control	2016-12-07 17:06:29 +0000
55
+++ debian/control	2017-02-10 16:17:38 +0000
56
@@ -10,6 +10,7 @@
57
10
               libgudev-1.0-dev,
10
               libgudev-1.0-dev,
58
11
               libproperties-cpp-dev,
11
               libproperties-cpp-dev,
59
12
# for coverage reports
12
# for coverage reports
60
13
               gcovr,
61
13
               lcov,
14
               lcov,
62
14
# for tests
15
# for tests
63
15
               qt5-default,
16
               qt5-default,
64
16
17
65
=== modified file 'tests/CMakeLists.txt'
66
--- tests/CMakeLists.txt	2016-03-11 20:06:34 +0000
67
+++ tests/CMakeLists.txt	2017-02-10 16:17:38 +0000
68
@@ -33,3 +33,8 @@
69
33
add_subdirectory(integration)
33
add_subdirectory(integration)
70
34
add_subdirectory(unit)
34
add_subdirectory(unit)
71
35
add_subdirectory(utils)
35
add_subdirectory(utils)
72
36
73
37
set(COVERAGE_TEST_TARGETS
74
38
  ${COVERAGE_TEST_TARGETS}
75
39
  PARENT_SCOPE
76
40
)
77
36
41
78
=== modified file 'tests/integration/CMakeLists.txt'
79
--- tests/integration/CMakeLists.txt	2016-03-16 00:25:33 +0000
80
+++ tests/integration/CMakeLists.txt	2017-02-10 16:17:38 +0000
81
@@ -16,9 +16,15 @@
82
16
16
83
17
function(add_qt_test_by_name name)
17
function(add_qt_test_by_name name)
84
18
  set(TEST_NAME ${name})
18
  set(TEST_NAME ${name})
85
19
  set(COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
86
19
  add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
20
  add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
87
20
  add_test(${TEST_NAME} ${TEST_NAME})
21
  add_test(${TEST_NAME} ${TEST_NAME})
88
21
  set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
22
  set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
89
22
  target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${QT_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES} ${THREAD_LINK_LIBRARIES})
23
  target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${QT_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES} ${THREAD_LINK_LIBRARIES})
90
23
endfunction()
24
endfunction()
91
24
add_qt_test_by_name(usb-manager-test)
25
add_qt_test_by_name(usb-manager-test)
92
26
93
27
set(COVERAGE_TEST_TARGETS
94
28
  ${COVERAGE_TEST_TARGETS}
95
29
  PARENT_SCOPE
96
30
)
97
25
31
98
=== modified file 'tests/unit/CMakeLists.txt'
99
--- tests/unit/CMakeLists.txt	2016-04-21 00:57:03 +0000
100
+++ tests/unit/CMakeLists.txt	2017-02-10 16:17:38 +0000
101
@@ -20,6 +20,7 @@
102
20
20
103
21
function(add_test_by_name name)
21
function(add_test_by_name name)
104
22
  set(TEST_NAME ${name})
22
  set(TEST_NAME ${name})
105
23
  set(COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
106
23
  add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
24
  add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
107
24
  add_test(${TEST_NAME} ${TEST_NAME})
25
  add_test(${TEST_NAME} ${TEST_NAME})
108
25
  set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
26
  set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
109
@@ -30,6 +31,7 @@
110
30
31
111
31
function(add_qt_test_by_name name)
32
function(add_qt_test_by_name name)
112
32
  set(TEST_NAME ${name})
33
  set(TEST_NAME ${name})
113
34
  set(COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
114
33
  add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
35
  add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
115
34
  add_test(${TEST_NAME} ${TEST_NAME})
36
  add_test(${TEST_NAME} ${TEST_NAME})
116
35
  set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
37
  set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
117
@@ -37,3 +39,8 @@
118
37
endfunction()
39
endfunction()
119
38
add_qt_test_by_name(greeter-test)
40
add_qt_test_by_name(greeter-test)
120
39
add_qt_test_by_name(usb-snap-test)
41
add_qt_test_by_name(usb-snap-test)
121
42
122
43
set(COVERAGE_TEST_TARGETS
123
44
  ${COVERAGE_TEST_TARGETS}
124
45
  PARENT_SCOPE
125
46
)
Status:	Merged
Approved by:	dobey on 2017-02-10
Approved revision:	27
Merged at revision:	28
Proposed branch:	lp:~dobey/indicator-display/fix-coverage
Merge into:	lp:indicator-display
Prerequisite:	lp:~dobey/indicator-display/fix-i18n
Diff against target:	125 lines (+34/-18) 5 files modified CMakeLists.txt (+15/-18) debian/control (+1/-0) tests/CMakeLists.txt (+5/-0) tests/integration/CMakeLists.txt (+6/-0) tests/unit/CMakeLists.txt (+7/-0)
To merge this branch:	bzr merge lp:~dobey/indicator-display/fix-coverage
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
unity-api-1-bot	continuous-integration		Approve on 2017-02-13
Pete Woods (community)			Approve on 2017-02-10
Ted Gould (community)		2017-02-07	Needs Information on 2017-02-07
Review via email: mp+316601@code.launchpad.net
1	=== modified file 'CMakeLists.txt'
2	--- CMakeLists.txt 2016-12-07 17:06:29 +0000
3	+++ CMakeLists.txt 2017-02-10 16:17:38 +0000
4	@@ -13,9 +13,6 @@
5	13	set(SERVICE_LIB ${PACKAGE})	13	set(SERVICE_LIB ${PACKAGE})
6	14	set(SERVICE_EXEC "${PACKAGE}-service")	14	set(SERVICE_EXEC "${PACKAGE}-service")
7	15		15
8	16	option(enable_tests "Build the package's automatic tests." ON)
9	17	option(enable_coverage "Generate code coverage reports." ON)
10	18
11	19	##	16	##
12	20	## GNU standard paths	17	## GNU standard paths
13	21	##	18	##
14	@@ -67,22 +64,22 @@
15	67	list(APPEND CXX_WARNING_ARGS -Wall -Wextra -Wpedantic)	64	list(APPEND CXX_WARNING_ARGS -Wall -Wextra -Wpedantic)
16	68	endif()	65	endif()
17	69		66
30	70	add_compile_options(-std=c++14 -fPIC -g)	67	add_compile_options(-std=c++14 -fPIC)
19	71
20	72	##
21	73	## Testing & Coverage
22	74	##
23	75
24	76	if(${enable_tests})
25	77	enable_testing()
26	78	if(${enable_coverage})
27	79	find_package(CoverageReport)
28	80	endif()
29	81	endif()
31	82		68
32	83	add_subdirectory(src)	69	add_subdirectory(src)
33	84	add_subdirectory(data)	70	add_subdirectory(data)
34	85	add_subdirectory(po)	71	add_subdirectory(po)
38	86	if (${enable_tests})	72
39	87	add_subdirectory(tests)	73	##
40	88	endif ()	74	## Testing & Coverage
41			75	##
42			76
43			77	enable_testing()
44			78	add_subdirectory(tests)
45			79	find_package(CoverageReport)
46			80	ENABLE_COVERAGE_REPORT(
47			81	TARGETS ${SERVICE_LIB} ${SERVICE_EXEC}
48			82	TESTS ${COVERAGE_TEST_TARGETS}
49			83	FILTER /usr/include ${CMAKE_BINARY_DIR}/*
50			84	)
51			85
52	89		86
53	=== modified file 'debian/control'
54	--- debian/control 2016-12-07 17:06:29 +0000
55	+++ debian/control 2017-02-10 16:17:38 +0000
56	@@ -10,6 +10,7 @@
57	10	libgudev-1.0-dev,	10	libgudev-1.0-dev,
58	11	libproperties-cpp-dev,	11	libproperties-cpp-dev,
59	12	# for coverage reports	12	# for coverage reports
60			13	gcovr,
61	13	lcov,	14	lcov,
62	14	# for tests	15	# for tests
63	15	qt5-default,	16	qt5-default,
64	16		17
65	=== modified file 'tests/CMakeLists.txt'
66	--- tests/CMakeLists.txt 2016-03-11 20:06:34 +0000
67	+++ tests/CMakeLists.txt 2017-02-10 16:17:38 +0000
68	@@ -33,3 +33,8 @@
69	33	add_subdirectory(integration)	33	add_subdirectory(integration)
70	34	add_subdirectory(unit)	34	add_subdirectory(unit)
71	35	add_subdirectory(utils)	35	add_subdirectory(utils)
72			36
73			37	set(COVERAGE_TEST_TARGETS
74			38	${COVERAGE_TEST_TARGETS}
75			39	PARENT_SCOPE
76			40	)
77	36		41
78	=== modified file 'tests/integration/CMakeLists.txt'
79	--- tests/integration/CMakeLists.txt 2016-03-16 00:25:33 +0000
80	+++ tests/integration/CMakeLists.txt 2017-02-10 16:17:38 +0000
81	@@ -16,9 +16,15 @@
82	16		16
83	17	function(add_qt_test_by_name name)	17	function(add_qt_test_by_name name)
84	18	set(TEST_NAME ${name})	18	set(TEST_NAME ${name})
85			19	set(COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
86	19	add_executable (${TEST_NAME} ${TEST_NAME}.cpp)	20	add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
87	20	add_test(${TEST_NAME} ${TEST_NAME})	21	add_test(${TEST_NAME} ${TEST_NAME})
88	21	set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})	22	set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
89	22	target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${QT_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES} ${THREAD_LINK_LIBRARIES})	23	target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${QT_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES} ${THREAD_LINK_LIBRARIES})
90	23	endfunction()	24	endfunction()
91	24	add_qt_test_by_name(usb-manager-test)	25	add_qt_test_by_name(usb-manager-test)
92			26
93			27	set(COVERAGE_TEST_TARGETS
94			28	${COVERAGE_TEST_TARGETS}
95			29	PARENT_SCOPE
96			30	)
97	25		31
98	=== modified file 'tests/unit/CMakeLists.txt'
99	--- tests/unit/CMakeLists.txt 2016-04-21 00:57:03 +0000
100	+++ tests/unit/CMakeLists.txt 2017-02-10 16:17:38 +0000
101	@@ -20,6 +20,7 @@
102	20		20
103	21	function(add_test_by_name name)	21	function(add_test_by_name name)
104	22	set(TEST_NAME ${name})	22	set(TEST_NAME ${name})
105			23	set(COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
106	23	add_executable (${TEST_NAME} ${TEST_NAME}.cpp)	24	add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
107	24	add_test(${TEST_NAME} ${TEST_NAME})	25	add_test(${TEST_NAME} ${TEST_NAME})
108	25	set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})	26	set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
109	@@ -30,6 +31,7 @@
110	30		31
111	31	function(add_qt_test_by_name name)	32	function(add_qt_test_by_name name)
112	32	set(TEST_NAME ${name})	33	set(TEST_NAME ${name})
113			34	set(COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
114	33	add_executable (${TEST_NAME} ${TEST_NAME}.cpp)	35	add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
115	34	add_test(${TEST_NAME} ${TEST_NAME})	36	add_test(${TEST_NAME} ${TEST_NAME})
116	35	set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})	37	set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
117	@@ -37,3 +39,8 @@
118	37	endfunction()	39	endfunction()
119	38	add_qt_test_by_name(greeter-test)	40	add_qt_test_by_name(greeter-test)
120	39	add_qt_test_by_name(usb-snap-test)	41	add_qt_test_by_name(usb-snap-test)
121			42
122			43	set(COVERAGE_TEST_TARGETS
123			44	${COVERAGE_TEST_TARGETS}
124			45	PARENT_SCOPE
125			46	)