kubuntu-packaging

Merge lp:~allanlesage/kubuntu-packaging/qtlocation-enable-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src

  1. qtlocation-enable-tests
  2. Merge into qtlocation-opensource-src
Proposed by Allan LeSage
Status: Merged
Merged at revision: 47
Proposed branch: lp:~allanlesage/kubuntu-packaging/qtlocation-enable-tests
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src
Diff against target: 269 lines (+216/-0)
6 files modified
debian/changelog (+9/-0)
debian/control (+1/-0)
debian/patches/enable_coverage_reporting.patch (+156/-0)
debian/patches/series (+2/-0)
debian/patches/skip_failing_tests.patch (+44/-0)
debian/rules (+4/-0)
To merge this branch: bzr merge lp:~allanlesage/kubuntu-packaging/qtlocation-enable-tests
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
Review via email: mp+199367@code.launchpad.net

Description of the change

Add tests to the Debian build; enable coverage reporting for Jenkins consumption; skip some failing tests.

Do we want a "make check" target at the root level of this project? The layout is unfamiliar to me, coming from autotools-type projects, however I don't know the common patterns of Qt projects, maybe this is standard.

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Fails to build on armhf: https://launchpadlibrarian.net/160092190/buildlog_ubuntu-trusty-armhf.qtlocation-opensource-src_5.2.0-0ubuntu1~trusty1~test3_FAILEDTOBUILD.txt.gz

Merging anyway, I hope disabling that one more test helps.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-12-03 12:18:51 +0000
+++ debian/changelog 2013-12-17 22:39:34 +0000
@@ -1,5 +1,6 @@
1qtlocation-opensource-src (5.2.0~rc1-0ubuntu1) UNRELEASED; urgency=low1qtlocation-opensource-src (5.2.0~rc1-0ubuntu1) UNRELEASED; urgency=low
22
3 [ Timo Jyrinki ]
3 * New upstream rc release.4 * New upstream rc release.
4 * Add libqt5positioning5 and qtdeclarative5-qtpositioning-plugin packages5 * Add libqt5positioning5 and qtdeclarative5-qtpositioning-plugin packages
5 * Refresh add_support_for_ubuntu_platform.patch6 * Refresh add_support_for_ubuntu_platform.patch
@@ -10,6 +11,14 @@
10 * Drop debian/patches/disable_nokia_plugin.patch:11 * Drop debian/patches/disable_nokia_plugin.patch:
11 - Compiles and has been updated again.12 - Compiles and has been updated again.
1213
14 [ Allan LeSage ]
15 * Depend on xvfb for existing tests requiring a display.
16 * Add dh_override_auto_test to make check under xvfb-run.
17 * debian/patches/skip_failing_tests.patch
18 - Skip some failing tests pending investigation.
19 * debian/patches/enable_coverage_reporting.patch
20 - Enable standard coverage reporting for Jenkins consumption.
21
13 -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Thu, 14 Nov 2013 05:14:27 +000022 -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Thu, 14 Nov 2013 05:14:27 +0000
1423
15qtlocation-opensource-src (5.0~git20130805-0ubuntu3) saucy; urgency=low24qtlocation-opensource-src (5.0~git20130805-0ubuntu3) saucy; urgency=low
1625
=== modified file 'debian/control'
--- debian/control 2013-11-21 06:44:07 +0000
+++ debian/control 2013-12-17 22:39:34 +0000
@@ -12,6 +12,7 @@
12 qtbase5-private-dev (>= 5.2.0~),12 qtbase5-private-dev (>= 5.2.0~),
13 qtdeclarative5-private-dev (>= 5.2.0~),13 qtdeclarative5-private-dev (>= 5.2.0~),
14 qtdeclarative5-qtquick2-plugin (>= 5.2.0~),14 qtdeclarative5-qtquick2-plugin (>= 5.2.0~),
15 xvfb,
15Standards-Version: 3.9.416Standards-Version: 3.9.4
16Homepage: http://qt-project.org/17Homepage: http://qt-project.org/
17Vcs-Bzr: lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src18Vcs-Bzr: lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src
1819
=== added file 'debian/patches/enable_coverage_reporting.patch'
--- debian/patches/enable_coverage_reporting.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/enable_coverage_reporting.patch 2013-12-17 22:39:34 +0000
@@ -0,0 +1,156 @@
1--- a/qtlocation.pro
2+++ b/qtlocation.pro
3@@ -1,3 +1,4 @@
4+include(coverage.pri)
5 load(configure)
6 qtCompileTest(geoclue)
7 qtCompileTest(geoclue-satellite)
8--- a/src/3rdparty/3rdparty.pro
9+++ b/src/3rdparty/3rdparty.pro
10@@ -1,2 +1,4 @@
11+include(../../coverage.pri)
12+
13 TEMPLATE = subdirs
14 SUBDIRS += poly2tri
15--- a/src/3rdparty/poly2tri/poly2tri.pro
16+++ b/src/3rdparty/poly2tri/poly2tri.pro
17@@ -1,3 +1,5 @@
18+include(../../../coverage.pri)
19+
20 TEMPLATE = lib
21 TARGET = poly2tri
22
23--- a/src/imports/location/location.pro
24+++ b/src/imports/location/location.pro
25@@ -1,3 +1,5 @@
26+include(../../../coverage.pri)
27+
28 QT += quick-private network positioning-private location-private qml-private 3d core-private gui-private
29
30 INCLUDEPATH += ../../location
31--- a/src/location/location.pro
32+++ b/src/location/location.pro
33@@ -1,3 +1,5 @@
34+include(../../coverage.pri)
35+
36 TARGET = QtLocation
37 QT = core-private positioning
38
39--- a/src/location/maps/maps.pri
40+++ b/src/location/maps/maps.pri
41@@ -1,3 +1,4 @@
42+include(../../../coverage.pri)
43
44 INCLUDEPATH += maps
45
46--- a/src/plugins/geoservices/osm/osm.pro
47+++ b/src/plugins/geoservices/osm/osm.pro
48@@ -1,3 +1,5 @@
49+include(../../../../coverage.pri)
50+
51 TARGET = qtgeoservices_osm
52 QT += location-private network
53
54--- a/src/plugins/position/geoclue/geoclue.pro
55+++ b/src/plugins/position/geoclue/geoclue.pro
56@@ -1,3 +1,5 @@
57+include(../../../../coverage.pri)
58+
59 TARGET = qtposition_geoclue
60 QT = core positioning
61
62--- a/src/plugins/position/gypsy/gypsy.pro
63+++ b/src/plugins/position/gypsy/gypsy.pro
64@@ -1,3 +1,5 @@
65+include(../../../../coverage.pri)
66+
67 TARGET = qtposition_gypsy
68 QT = core positioning
69
70--- a/src/plugins/position/position.pro
71+++ b/src/plugins/position/position.pro
72@@ -1,3 +1,5 @@
73+include(../../coverage.pri)
74+
75 TEMPLATE = subdirs
76
77 config_geoclue:SUBDIRS += geoclue
78--- a/src/plugins/position/simulator/simulator.pro
79+++ b/src/plugins/position/simulator/simulator.pro
80@@ -1,3 +1,5 @@
81+include(../../../../coverage.pri)
82+
83 TARGET = qtposition_simulator
84 QT += positioning gui
85
86--- a/src/plugins/position/ubuntu/ubuntu.pro
87+++ b/src/plugins/position/ubuntu/ubuntu.pro
88@@ -1,3 +1,5 @@
89+include(../../../../coverage.pri)
90+
91 TARGET = qtposition_ubuntu
92 QT += location gui
93
94--- a/src/src.pro
95+++ b/src/src.pro
96@@ -1,3 +1,5 @@
97+include(../coverage.pri)
98+
99 TEMPLATE = subdirs
100 CONFIG += ordered
101
102--- /dev/null
103+++ b/coverage.pri
104@@ -0,0 +1,44 @@
105+# Coverage
106+CONFIG(coverage) {
107+ LIBS += -lgcov
108+ QMAKE_CXXFLAGS += --coverage
109+ QMAKE_LDFLAGS += --coverage
110+
111+ QMAKE_EXTRA_TARGETS += clean-gcno clean-gcda coverage-html \
112+ generate-coverage-html clean-coverage-html coverage-gcovr \
113+ generate-gcovr generate-coverage-gcovr clean-coverage-gcovr
114+
115+ clean-gcno.commands = \
116+ "@echo Removing old coverage instrumentation"; \
117+ "find -name '*.gcno' -print | xargs -r rm"
118+
119+ clean-gcda.commands = \
120+ "@echo Removing old coverage results"; \
121+ "find -name '*.gcda' -print | xargs -r rm"
122+
123+ coverage-html.depends = clean-gcda check generate-coverage-html
124+
125+ generate-coverage-html.commands = \
126+ "@echo Collecting coverage data"; \
127+ "lcov --directory $${TOP_SRC_DIR} --capture --output-file coverage.info --no-checksum --compat-libtool"; \
128+ "lcov --extract coverage.info \"*/src/*.cpp\" -o coverage.info"; \
129+ "lcov --remove coverage.info \"moc_*.cpp\" -o coverage.info"; \
130+ "LANG=C genhtml --prefix $${TOP_SRC_DIR} --output-directory coverage-html --title \"Code Coverage\" --legend --show-details coverage.info"
131+
132+ clean-coverage-html.depends = clean-gcda
133+ clean-coverage-html.commands = \
134+ "lcov --directory $${TOP_SRC_DIR} -z"; \
135+ "rm -rf coverage.info coverage-html"
136+
137+ coverage-gcovr.depends = clean-gcda check generate-coverage-gcovr
138+
139+ generate-coverage-gcovr.commands = \
140+ "@echo Generating coverage GCOVR report"; \
141+ "gcovr -x -r $${TOP_SRC_DIR} -o $${TOP_SRC_DIR}/coverage.xml -e \".*/moc_.*\" -e \"tests/.*\" -e \".*\\.h\""
142+
143+ clean-coverage-gcovr.depends = clean-gcda
144+ clean-coverage-gcovr.commands = \
145+ "rm -rf $${TOP_SRC_DIR}/coverage.xml"
146+
147+ QMAKE_CLEAN += *.gcda *.gcno coverage.info coverage.xml
148+}
149--- a/src/plugins/geoservices/nokia/nokia.pro
150+++ b/src/plugins/geoservices/nokia/nokia.pro
151@@ -1,3 +1,5 @@
152+include(../../../../coverage.pri)
153+
154 TARGET = qtgeoservices_nokia
155 QT += location-private network
156
0157
=== modified file 'debian/patches/series'
--- debian/patches/series 2013-11-21 06:37:49 +0000
+++ debian/patches/series 2013-12-17 22:39:34 +0000
@@ -1,1 +1,3 @@
1add_support_for_ubuntu_platform.patch1add_support_for_ubuntu_platform.patch
2skip_failing_tests.patch
3enable_coverage_reporting.patch
24
=== added file 'debian/patches/skip_failing_tests.patch'
--- debian/patches/skip_failing_tests.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/skip_failing_tests.patch 2013-12-17 22:39:34 +0000
@@ -0,0 +1,44 @@
1--- a/tests/auto/auto.pro
2+++ b/tests/auto/auto.pro
3@@ -24,9 +24,10 @@
4 qplacesearchreply \
5 qplacesearchsuggestionreply \
6 qplaceuser \
7- qplacemanager \
8- qplacemanager_nokia \
9- qplacemanager_unsupported \
10+ # skip some failling tests
11+ #qplacemanager \
12+ #qplacemanager_nokia \
13+ #qplacemanager_unsupported \
14 placesplugin_unsupported
15
16 #misc tests
17@@ -47,13 +48,15 @@
18 qgeoroutereply \
19 qgeorouterequest \
20 qgeoroutesegment \
21- qgeoroutingmanager \
22+ # skip some failing tests
23+ #qgeoroutingmanager \
24 qgeoroutingmanagerplugins \
25 qgeotilespec \
26 qgeoroutexmlparser \
27 qgeomapcontroller \
28 maptype \
29- nokia_services \
30+ # skip some failing tests
31+ #nokia_services \
32 qgeocameratiles
33
34 qtHaveModule(quick) {
35@@ -75,7 +78,8 @@
36 qgeocoordinate \
37 qgeolocation \
38 qgeopositioninfo \
39- qgeopositioninfosource \
40+ # skip some failing tests
41+ #qgeopositioninfosource \
42 qgeosatelliteinfo \
43 qgeosatelliteinfosource \
44 qnmeapositioninfosource
045
=== modified file 'debian/rules'
--- debian/rules 2013-11-21 06:44:07 +0000
+++ debian/rules 2013-12-17 22:39:34 +0000
@@ -26,6 +26,10 @@
26 # Remove binary that includes libtheora in itself26 # Remove binary that includes libtheora in itself
27 rm -f debian/tmp/usr/lib/*/qt5/examples/qtlocation/declarative/mapviewer/qml_location_mapviewer27 rm -f debian/tmp/usr/lib/*/qt5/examples/qtlocation/declarative/mapviewer/qml_location_mapviewer
2828
29override_dh_auto_test:
30 export LD_LIBRARY_PATH=$(CURDIR)/lib
31 cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run -a make -f Makefile check
32
29override_dh_builddeb:33override_dh_builddeb:
30 dh_builddeb -- -Zxz34 dh_builddeb -- -Zxz
3135

Subscribers

People subscribed via source and target branches