1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-05-16 18:09:57 +0000
3
+++ CMakeLists.txt	2017-02-07 19:50:14 +0000
4
@@ -85,9 +85,6 @@
5
85
85
6
86
# testing & coverage
86
# testing & coverage
7
87
if (${enable_tests})
87
if (${enable_tests})
8
88
  set (GTEST_SOURCE_DIR /usr/src/gtest/src)
9
89
  set (GTEST_INCLUDE_DIR ${GTEST_SOURCE_DIR}/..)
10
90
  set (GTEST_LIBS -lpthread)
11
91
  enable_testing ()
88
  enable_testing ()
12
92
  if (${enable_lcov})
89
  if (${enable_lcov})
13
93
    include(GCov)
90
    include(GCov)
14
94
91
15
=== modified file 'debian/control'
16
--- debian/control	2016-07-19 10:25:12 +0000
17
+++ debian/control	2017-02-07 19:50:14 +0000
18
@@ -3,6 +3,7 @@
19
3
Priority: optional
3
Priority: optional
20
4
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
4
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
21
5
Build-Depends: cmake,
5
Build-Depends: cmake,
22
6
               cmake-extras (>= 0.10),
23
6
               libnotify-dev (>= 0.7.6),
7
               libnotify-dev (>= 0.7.6),
24
7
               libglib2.0-dev (>= 2.36),
8
               libglib2.0-dev (>= 2.36),
25
8
               libgudev-1.0-dev,
9
               libgudev-1.0-dev,
26
@@ -15,7 +16,7 @@
27
15
               dh-translations,
16
               dh-translations,
28
16
               intltool,
17
               intltool,
29
17
# for tests
18
# for tests
31
18
               libgtest-dev,
19
               googletest | google-mock,
32
19
               python3-dbusmock,
20
               python3-dbusmock,
33
20
               dbus-test-runner,
21
               dbus-test-runner,
34
21
               libdbustest1-dev,
22
               libdbustest1-dev,
35
22
23
36
=== modified file 'tests/CMakeLists.txt'
37
--- tests/CMakeLists.txt	2016-05-16 17:59:03 +0000
38
+++ tests/CMakeLists.txt	2017-02-07 19:50:14 +0000
39
@@ -1,9 +1,5 @@
46
1
# build libgtest
1
find_package(GMock)
47
2
add_library (gtest STATIC 
2
include_directories(${GMOCK_INCLUDE_DIRS})
42
3
             ${GTEST_SOURCE_DIR}/gtest-all.cc 
43
4
             ${GTEST_SOURCE_DIR}/gtest_main.cc)
44
5
set_target_properties (gtest PROPERTIES INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIR})
45
6
set_target_properties (gtest PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS} -w)
48
7
3
49
8
# dbustest
4
# dbustest
50
9
pkg_check_modules(DBUSTEST REQUIRED
5
pkg_check_modules(DBUSTEST REQUIRED
51
@@ -50,7 +46,7 @@
52
50
  add_executable (${TEST_NAME} ${TEST_NAME}.cc gschemas.compiled)
46
  add_executable (${TEST_NAME} ${TEST_NAME}.cc gschemas.compiled)
53
51
  add_test (${TEST_NAME} ${TEST_NAME})
47
  add_test (${TEST_NAME} ${TEST_NAME})
54
52
  add_dependencies (${TEST_NAME} ${SERVICE_LIB})
48
  add_dependencies (${TEST_NAME} ${SERVICE_LIB})
56
53
  target_link_libraries (${TEST_NAME} ${SERVICE_LIB} gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS})
49
  target_link_libraries (${TEST_NAME} ${SERVICE_LIB} ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GMOCK_LIBRARIES})
57
54
endfunction()
50
endfunction()
58
55
add_test_by_name(test-notify)
51
add_test_by_name(test-notify)
59
56
add_test(NAME dear-reader-the-next-test-takes-80-seconds COMMAND true)
52
add_test(NAME dear-reader-the-next-test-takes-80-seconds COMMAND true)
60
57
53
61
=== removed file 'tests/Makefile.am.strings'
62
--- tests/Makefile.am.strings	2012-05-24 14:49:30 +0000
63
+++ tests/Makefile.am.strings	1970-01-01 00:00:00 +0000
64
@@ -1,38 +0,0 @@
65
1
TESTS += \
66
2
	test-ellipsis \
67
3
	test-space-ellipsis \
68
4
	test-ascii-quotes
69
5
70
6
#####
71
7
# Tests for there being proper ellipsis instead of three periods in a row
72
8
#####
73
9
test-ellipsis: $(top_srcdir)/po
74
10
	@echo "#!/bin/bash" > $@
75
11
	@echo "(cd $(top_srcdir)/po && make $(GETTEXT_PACKAGE).pot)" >> $@
76
12
	@echo "grep -c -e \"^msgid.*\.\.\.\\\"\" $(top_srcdir)/po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"Ellipsis found in user visible strings\" >&2 && exit 1" >> $@
77
13
	@echo "exit 0" >> $@
78
14
	@chmod +x $@
79
15
80
16
#####
81
17
# Tests for there being a space before an ellipsis
82
18
#####
83
19
test-space-ellipsis: $(top_srcdir)/po
84
20
	@echo "#!/bin/bash" > $@
85
21
	@echo "(cd $(top_srcdir)/po && make $(GETTEXT_PACKAGE).pot)" >> $@
86
22
	@echo "grep -c -e \"^msgid.* …\\\"\" $(top_srcdir)/po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"Space before ellipsis found in user visible strings\" >&2 && exit 1" >> $@
87
23
	@echo "exit 0" >> $@
88
24
	@chmod +x $@
89
25
90
26
#####
91
27
# Tests for ASCII quote types
92
28
#####
93
29
test-ascii-quotes: $(top_srcdir)/po
94
30
	@echo "#!/bin/bash" > $@
95
31
	@echo "(cd $(top_srcdir)/po && make $(GETTEXT_PACKAGE).pot)" >> $@
96
32
	@echo "grep -c -e \"^msgid \\\".*'.*\\\"\" $(top_srcdir)/po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"ASCII apostrophy found in user visible strings\" >&2 && exit 1" >> $@
97
33
	@echo "grep -c -e \"^msgid \\\".*\\\".*\\\"\" $(top_srcdir)/po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"ASCII quote found in user visible strings\" >&2 && exit 1" >> $@
98
34
	@echo "grep -c -e \"^msgid \\\".*\\\`.*\\\"\" $(top_srcdir)/po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"ASCII backtick found in user visible strings\" >&2 && exit 1" >> $@
99
35
	@echo "exit 0" >> $@
100
36
	@chmod +x $@
101
37
102
38
CLEANFILES += $(TESTS)
Status:	Merged
Approved by:	dobey on 2017-02-08
Approved revision:	304
Merged at revision:	305
Proposed branch:	lp:~dobey/indicator-power/fix-gtest
Merge into:	lp:indicator-power
Diff against target:	102 lines (+5/-49) 4 files modified CMakeLists.txt (+0/-3) debian/control (+2/-1) tests/CMakeLists.txt (+3/-7) tests/Makefile.am.strings (+0/-38)
To merge this branch:	bzr merge lp:~dobey/indicator-power/fix-gtest
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Charles Kerr (community)			Approve on 2017-02-10
Ted Gould (community)		2017-02-07	Approve on 2017-02-07
unity-api-1-bot	continuous-integration		Approve on 2017-02-07
Review via email: mp+316614@code.launchpad.net