1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2017-02-10 16:21:31 +0000
3
+++ CMakeLists.txt	2017-02-10 16:21:32 +0000
4
@@ -13,9 +13,6 @@
5
13
  -DLOW_BATTERY_SOUND="Low battery.ogg"
13
  -DLOW_BATTERY_SOUND="Low battery.ogg"
6
14
)
14
)
7
15
15
8
16
option (enable_tests "Build the package's automatic tests." ON)
9
17
option (enable_lcov "Generate lcov code coverage reports." ON)
10
18
11
19
set(SERVICE_LIB "indicatorpowerservice")
16
set(SERVICE_LIB "indicatorpowerservice")
12
20
set(SERVICE_EXEC "indicator-power-service")
17
set(SERVICE_EXEC "indicator-power-service")
13
21
add_definitions(-DSERVICE_EXEC="${SERVICE_EXEC}")
18
add_definitions(-DSERVICE_EXEC="${SERVICE_EXEC}")
14
@@ -59,9 +56,6 @@
15
59
                   COMMAND bzr export --root=${ARCHIVE_NAME} ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.gz
56
                   COMMAND bzr export --root=${ARCHIVE_NAME} ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.gz
16
60
                   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
57
                   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
17
61
58
18
62
add_custom_target (clean-coverage
19
63
                   COMMAND find ${CMAKE_BINARY_DIR} -name '*.gcda' | xargs rm -f)
20
64
21
65
add_custom_target (cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2 --inline-suppr
59
add_custom_target (cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2 --inline-suppr
22
66
                   ${CMAKE_SOURCE_DIR}/src
60
                   ${CMAKE_SOURCE_DIR}/src
23
67
                   ${CMAKE_SOURCE_DIR}/tests)
61
                   ${CMAKE_SOURCE_DIR}/tests)
24
@@ -83,19 +77,17 @@
25
83
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
77
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
26
84
include_directories (${CMAKE_CURRENT_BINARY_DIR}/include)
78
include_directories (${CMAKE_CURRENT_BINARY_DIR}/include)
27
85
79
28
86
# testing & coverage
29
87
if (${enable_tests})
30
88
  enable_testing ()
31
89
  if (${enable_lcov})
32
90
    include(GCov)
33
91
  endif ()
34
92
endif ()
35
93
36
94
# actually build things
80
# actually build things
37
95
add_subdirectory(src)
81
add_subdirectory(src)
38
96
add_subdirectory(data)
82
add_subdirectory(data)
39
97
add_subdirectory(po)
83
add_subdirectory(po)
40
98
if (${enable_tests})
41
99
  add_subdirectory(tests)
42
100
endif ()
43
101
84
44
85
# testing & coverage
45
86
enable_testing ()
46
87
add_subdirectory(tests)
47
88
find_package(CoverageReport)
48
89
ENABLE_COVERAGE_REPORT(
49
90
  TARGETS ${SERVICE_LIB} ${SERVICE_EXEC}
50
91
  TESTS ${COVERAGE_TEST_TARGETS}
51
92
  FILTER /usr/include ${CMAKE_BINARY_DIR}/*
52
93
)
53
102
94
54
=== removed file 'cmake/GCov.cmake'
55
--- cmake/GCov.cmake	2014-07-14 04:43:41 +0000
56
+++ cmake/GCov.cmake	1970-01-01 00:00:00 +0000
57
@@ -1,51 +0,0 @@
58
1
if (CMAKE_BUILD_TYPE MATCHES coverage)
59
2
  set(GCOV_FLAGS "${GCOV_FLAGS} --coverage")
60
3
  set(CMAKE_EXE_LINKER_FLAGS    "${CMAKE_EXE_LINKER_FLAGS}    ${GCOV_FLAGS}")
61
4
  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${GCOV_FLAGS}")
62
5
  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GCOV_FLAGS}")
63
6
  set(GCOV_LIBS ${GCOV_LIBS} gcov)
64
7
65
8
  find_program(GCOVR_EXECUTABLE gcovr HINTS ${GCOVR_ROOT} "${GCOVR_ROOT}/bin")
66
9
  if (NOT GCOVR_EXECUTABLE)
67
10
    message(STATUS "Gcovr binary was not found, can not generate XML coverage info.")
68
11
  else ()
69
12
    message(STATUS "Gcovr found, can generate XML coverage info.")
70
13
    add_custom_target (coverage-xml
71
14
      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
72
15
      COMMAND "${GCOVR_EXECUTABLE}" --exclude="test.*" -x -r "${CMAKE_SOURCE_DIR}" 
73
16
      --object-directory=${CMAKE_BINARY_DIR} -o coverage.xml)
74
17
  endif()
75
18
76
19
  find_program(LCOV_EXECUTABLE lcov HINTS ${LCOV_ROOT} "${GCOVR_ROOT}/bin")
77
20
  find_program(GENHTML_EXECUTABLE genhtml HINTS ${GENHTML_ROOT})
78
21
  if (NOT LCOV_EXECUTABLE)
79
22
    message(STATUS "Lcov binary was not found, can not generate HTML coverage info.")
80
23
  else ()
81
24
    if(NOT GENHTML_EXECUTABLE)
82
25
      message(STATUS "Genthml binary not found, can not generate HTML coverage info.")
83
26
    else()
84
27
      message(STATUS "Lcov and genhtml found, can generate HTML coverage info.")
85
28
      add_custom_target (coverage-html
86
29
        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
87
30
        COMMAND "${CMAKE_CTEST_COMMAND}" --force-new-ctest-process --verbose
88
31
        COMMAND "${LCOV_EXECUTABLE}" --directory ${CMAKE_BINARY_DIR} --capture | ${CMAKE_SOURCE_DIR}/trim-lcov.py > dconf-lcov.info
89
32
        COMMAND "${LCOV_EXECUTABLE}" -r dconf-lcov.info /usr/include/\\*  -o nosys-lcov.info
90
33
        COMMAND LANG=C "${GENHTML_EXECUTABLE}" --prefix ${CMAKE_BINARY_DIR} --output-directory lcov-html --legend --show-details nosys-lcov.info
91
34
        COMMAND ${CMAKE_COMMAND} -E echo ""
92
35
        COMMAND ${CMAKE_COMMAND} -E echo "file://${CMAKE_BINARY_DIR}/lcov-html/index.html"
93
36
        COMMAND ${CMAKE_COMMAND} -E echo "")
94
37
        #COMMAND "${LCOV_EXECUTABLE}" --directory ${CMAKE_BINARY_DIR} --capture --output-file coverage.info --no-checksum
95
38
        #COMMAND "${GENHTML_EXECUTABLE}" --prefix ${CMAKE_BINARY_DIR} --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
96
39
        #COMMAND ${CMAKE_COMMAND} -E echo "\\#define foo \\\"bar\\\"" 
97
40
        #)
98
41
    endif()
99
42
  endif()
100
43
endif()
101
44
102
45
103
46
	#$(MAKE) $(AM_MAKEFLAGS) check
104
47
	#lcov --directory $(top_builddir) --capture --test-name dconf | $(top_srcdir)/trim-lcov.py > dconf-lcov.info
105
48
	#LANG=C genhtml --prefix $(top_builddir) --output-directory lcov-html --legend --show-details dconf-lcov.info
106
49
	#@echo
107
50
	#@echo "     file://$(abs_top_builddir)/lcov-html/index.html"
108
51
	#@echo
109
52
0
110
=== modified file 'debian/control'
111
--- debian/control	2017-02-10 16:21:31 +0000
112
+++ debian/control	2017-02-10 16:21:32 +0000
113
@@ -4,6 +4,8 @@
114
4
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
4
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
115
5
Build-Depends: cmake,
5
Build-Depends: cmake,
116
6
               cmake-extras (>= 0.10),
6
               cmake-extras (>= 0.10),
117
7
               gcovr,
118
8
               lcov,
119
7
               libnotify-dev (>= 0.7.6),
9
               libnotify-dev (>= 0.7.6),
120
8
               libglib2.0-dev (>= 2.36),
10
               libglib2.0-dev (>= 2.36),
121
9
               libgudev-1.0-dev,
11
               libgudev-1.0-dev,
122
10
12
123
=== modified file 'src/CMakeLists.txt'
124
--- src/CMakeLists.txt	2016-05-16 17:59:03 +0000
125
+++ src/CMakeLists.txt	2017-02-10 16:21:32 +0000
126
@@ -42,7 +42,7 @@
127
42
set(C_WARNING_ARGS "${C_WARNING_ARGS} -Wno-assign-enum") # GParamFlags
42
set(C_WARNING_ARGS "${C_WARNING_ARGS} -Wno-assign-enum") # GParamFlags
128
43
set(C_WARNING_ARGS "${C_WARNING_ARGS} -Wno-switch-enum")
43
set(C_WARNING_ARGS "${C_WARNING_ARGS} -Wno-switch-enum")
129
44
set_source_files_properties(${SERVICE_MANUAL_SOURCES}
44
set_source_files_properties(${SERVICE_MANUAL_SOURCES}
131
45
                            PROPERTIES COMPILE_FLAGS "${C_WARNING_ARGS} ${GCOV_FLAGS} -g -std=c99")
45
                            PROPERTIES COMPILE_FLAGS "${C_WARNING_ARGS} -std=c99")
132
46
46
133
47
# the service library for tests to link against (basically, everything except main())
47
# the service library for tests to link against (basically, everything except main())
134
48
add_library(${SERVICE_LIB} STATIC ${SERVICE_MANUAL_SOURCES} ${SERVICE_GENERATED_SOURCES})
48
add_library(${SERVICE_LIB} STATIC ${SERVICE_MANUAL_SOURCES} ${SERVICE_GENERATED_SOURCES})
135
@@ -51,7 +51,7 @@
136
51
51
137
52
# the executable: lib + main()
52
# the executable: lib + main()
138
53
add_executable (${SERVICE_EXEC} main.c)
53
add_executable (${SERVICE_EXEC} main.c)
141
54
set_source_files_properties(${SERVICE_SOURCES} main.c PROPERTIES COMPILE_FLAGS "${C_WARNING_ARGS} -g -std=c99")
54
set_source_files_properties(${SERVICE_SOURCES} main.c PROPERTIES COMPILE_FLAGS "${C_WARNING_ARGS} -std=c99")
142
55
target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES} ${GCOV_LIBS})
55
target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES})
143
56
install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
56
install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
144
57
57
145
58
58
146
=== modified file 'tests/CMakeLists.txt'
147
--- tests/CMakeLists.txt	2017-02-10 16:21:31 +0000
148
+++ tests/CMakeLists.txt	2017-02-10 16:21:32 +0000
149
@@ -7,7 +7,7 @@
150
7
include_directories (SYSTEM ${DBUSTEST_INCLUDE_DIRS})
7
include_directories (SYSTEM ${DBUSTEST_INCLUDE_DIRS})
151
8
8
152
9
# add warnings
9
# add warnings
154
10
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -g ${C_WARNING_ARGS}")
10
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${C_WARNING_ARGS}")
155
11
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-weak-vtables -Wno-global-constructors") # Google Test
11
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-weak-vtables -Wno-global-constructors") # Google Test
156
12
12
157
13
# build the necessary schemas
13
# build the necessary schemas
158
@@ -43,6 +43,7 @@
159
43
43
160
44
function(add_test_by_name name)
44
function(add_test_by_name name)
161
45
  set (TEST_NAME ${name})
45
  set (TEST_NAME ${name})
162
46
  set (COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
163
46
  add_executable (${TEST_NAME} ${TEST_NAME}.cc gschemas.compiled)
47
  add_executable (${TEST_NAME} ${TEST_NAME}.cc gschemas.compiled)
164
47
  add_test (${TEST_NAME} ${TEST_NAME})
48
  add_test (${TEST_NAME} ${TEST_NAME})
165
48
  add_dependencies (${TEST_NAME} ${SERVICE_LIB})
49
  add_dependencies (${TEST_NAME} ${SERVICE_LIB})
166
@@ -51,3 +52,8 @@
167
51
add_test_by_name(test-notify)
52
add_test_by_name(test-notify)
168
52
add_test(NAME dear-reader-the-next-test-takes-80-seconds COMMAND true)
53
add_test(NAME dear-reader-the-next-test-takes-80-seconds COMMAND true)
169
53
add_test_by_name(test-device)
54
add_test_by_name(test-device)
170
55
171
56
set(COVERAGE_TEST_TARGETS
172
57
  ${COVERAGE_TEST_TARGETS}
173
58
  PARENT_SCOPE
174
59
)
Status:	Merged
Approved by:	dobey on 2017-02-10
Approved revision:	308
Merged at revision:	306
Proposed branch:	lp:~dobey/indicator-power/fix-coverage
Merge into:	lp:indicator-power
Prerequisite:	lp:~dobey/indicator-power/fix-gtest
Diff against target:	174 lines (+21/-72) 5 files modified CMakeLists.txt (+9/-17) cmake/GCov.cmake (+0/-51) debian/control (+2/-0) src/CMakeLists.txt (+3/-3) tests/CMakeLists.txt (+7/-1)
To merge this branch:	bzr merge lp:~dobey/indicator-power/fix-coverage
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Pete Woods (community)			Approve on 2017-02-10
Ted Gould (community)		2017-02-07	Needs Information on 2017-02-07
unity-api-1-bot	continuous-integration		Approve on 2017-02-07
Review via email: mp+316621@code.launchpad.net