Merge lp:~allanlesage/kubuntu-packaging/qtlocation-amend-test-enablement into lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src

[Allan LeSage]

Sorry to make us do this again but a review of changes to qt3d made me want to clean up my earlier changes to qtlocation.

I'm aware that some tests were failing specifically on arm but I don't have an environment to reproduce those failures; I propose to try under this new method to see if there's improvement.

Also note that we're setting aside the coverage bit as we'll just apply the necessary changes during a Jenkins build.

[Timo Jyrinki (timo-jyrinki)]

Hi. Armhf still fails a bit:

https://launchpadlibrarian.net/162911783/buildlog_ubuntu-trusty-armhf.qtlocation-opensource-src_5.2.0-0ubuntu1~trusty1~test9_FAILEDTOBUILD.txt.gz

But I'll merge this anyhow and do test disabling those three tests that are failing to see if it then is ok.

review: Approve

[Timo Jyrinki (timo-jyrinki)]

As an update, it was enough to disable the three individual tests and now tests pass also on arm.

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-18 13:04:40 +0000
+++ debian/changelog	2014-01-08 20:13:27 +0000
@@ -14,12 +14,11 @@
     - Skip additional tests that fail on armhf.
 
   [ Allan LeSage ]
+  * Add tests to QT_BUILD_PARTS.
   * Depend on xvfb for existing tests requiring a display.
-  * Add dh_override_auto_test to make check under xvfb-run.
+  * Add dh_override_auto_test to make dh_auto_test under xvfb-run.
   * debian/patches/skip_failing_tests.patch
     - Skip some failing tests pending investigation.
-  * debian/patches/enable_coverage_reporting.patch
-    - Enable standard coverage reporting for Jenkins consumption.
 
  -- Timo Jyrinki <[e-mail]>  Thu, 14 Nov 2013 05:14:27 +0000
 

=== removed file 'debian/patches/enable_coverage_reporting.patch'
--- debian/patches/enable_coverage_reporting.patch	2013-12-17 22:08:15 +0000
+++ debian/patches/enable_coverage_reporting.patch	1970-01-01 00:00:00 +0000
@@ -1,156 +0,0 @@
---- a/qtlocation.pro
-+++ b/qtlocation.pro
-@@ -1,3 +1,4 @@
-+include(coverage.pri)
- load(configure)
- qtCompileTest(geoclue)
- qtCompileTest(geoclue-satellite)
---- a/src/3rdparty/3rdparty.pro
-+++ b/src/3rdparty/3rdparty.pro
-@@ -1,2 +1,4 @@
-+include(../../coverage.pri)
-+
- TEMPLATE = subdirs
- SUBDIRS += poly2tri
---- a/src/3rdparty/poly2tri/poly2tri.pro
-+++ b/src/3rdparty/poly2tri/poly2tri.pro
-@@ -1,3 +1,5 @@
-+include(../../../coverage.pri)
-+
- TEMPLATE = lib
- TARGET = poly2tri
- 
---- a/src/imports/location/location.pro
-+++ b/src/imports/location/location.pro
-@@ -1,3 +1,5 @@
-+include(../../../coverage.pri)
-+
- QT += quick-private network positioning-private location-private qml-private 3d core-private gui-private
- 
- INCLUDEPATH += ../../location
---- a/src/location/location.pro
-+++ b/src/location/location.pro
-@@ -1,3 +1,5 @@
-+include(../../coverage.pri)
-+
- TARGET = QtLocation
- QT = core-private positioning
- 
---- a/src/location/maps/maps.pri
-+++ b/src/location/maps/maps.pri
-@@ -1,3 +1,4 @@
-+include(../../../coverage.pri)
- 
- INCLUDEPATH += maps
- 
---- a/src/plugins/geoservices/osm/osm.pro
-+++ b/src/plugins/geoservices/osm/osm.pro
-@@ -1,3 +1,5 @@
-+include(../../../../coverage.pri)
-+
- TARGET = qtgeoservices_osm
- QT += location-private network
- 
---- a/src/plugins/position/geoclue/geoclue.pro
-+++ b/src/plugins/position/geoclue/geoclue.pro
-@@ -1,3 +1,5 @@
-+include(../../../../coverage.pri)
-+
- TARGET = qtposition_geoclue
- QT = core positioning
- 
---- a/src/plugins/position/gypsy/gypsy.pro
-+++ b/src/plugins/position/gypsy/gypsy.pro
-@@ -1,3 +1,5 @@
-+include(../../../../coverage.pri)
-+
- TARGET = qtposition_gypsy
- QT = core positioning
- 
---- a/src/plugins/position/position.pro
-+++ b/src/plugins/position/position.pro
-@@ -1,3 +1,5 @@
-+include(../../coverage.pri)
-+
- TEMPLATE = subdirs
- 
- config_geoclue:SUBDIRS += geoclue
---- a/src/plugins/position/simulator/simulator.pro
-+++ b/src/plugins/position/simulator/simulator.pro
-@@ -1,3 +1,5 @@
-+include(../../../../coverage.pri)
-+
- TARGET = qtposition_simulator
- QT += positioning gui
- 
---- a/src/plugins/position/ubuntu/ubuntu.pro
-+++ b/src/plugins/position/ubuntu/ubuntu.pro
-@@ -1,3 +1,5 @@
-+include(../../../../coverage.pri)
-+
- TARGET = qtposition_ubuntu
- QT += location gui
- 
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -1,3 +1,5 @@
-+include(../coverage.pri)
-+
- TEMPLATE = subdirs
- CONFIG += ordered
- 
---- /dev/null
-+++ b/coverage.pri
-@@ -0,0 +1,44 @@
-+# Coverage
-+CONFIG(coverage) {
-+    LIBS += -lgcov
-+    QMAKE_CXXFLAGS += --coverage
-+    QMAKE_LDFLAGS += --coverage
-+
-+    QMAKE_EXTRA_TARGETS += clean-gcno clean-gcda coverage-html \
-+        generate-coverage-html clean-coverage-html coverage-gcovr \
-+        generate-gcovr generate-coverage-gcovr clean-coverage-gcovr
-+
-+    clean-gcno.commands = \
-+        "@echo Removing old coverage instrumentation"; \
-+        "find -name '*.gcno' -print | xargs -r rm"
-+
-+    clean-gcda.commands = \
-+        "@echo Removing old coverage results"; \
-+        "find -name '*.gcda' -print | xargs -r rm"
-+
-+    coverage-html.depends = clean-gcda check generate-coverage-html
-+
-+    generate-coverage-html.commands = \
-+        "@echo Collecting coverage data"; \
-+        "lcov --directory $${TOP_SRC_DIR} --capture --output-file coverage.info --no-checksum --compat-libtool"; \
-+        "lcov --extract coverage.info \"*/src/*.cpp\" -o coverage.info"; \
-+        "lcov --remove coverage.info \"moc_*.cpp\" -o coverage.info"; \
-+        "LANG=C genhtml --prefix $${TOP_SRC_DIR} --output-directory coverage-html --title \"Code Coverage\" --legend --show-details coverage.info"
-+
-+    clean-coverage-html.depends = clean-gcda
-+    clean-coverage-html.commands = \
-+        "lcov --directory $${TOP_SRC_DIR} -z"; \
-+        "rm -rf coverage.info coverage-html"
-+
-+    coverage-gcovr.depends = clean-gcda check generate-coverage-gcovr
-+
-+    generate-coverage-gcovr.commands = \
-+        "@echo Generating coverage GCOVR report"; \
-+        "gcovr -x -r $${TOP_SRC_DIR} -o $${TOP_SRC_DIR}/coverage.xml -e \".*/moc_.*\" -e \"tests/.*\" -e \".*\\.h\""
-+
-+    clean-coverage-gcovr.depends = clean-gcda
-+    clean-coverage-gcovr.commands = \
-+        "rm -rf $${TOP_SRC_DIR}/coverage.xml"
-+
-+    QMAKE_CLEAN += *.gcda *.gcno coverage.info coverage.xml
-+}
---- a/src/plugins/geoservices/nokia/nokia.pro
-+++ b/src/plugins/geoservices/nokia/nokia.pro
-@@ -1,3 +1,5 @@
-+include(../../../../coverage.pri)
-+
- TARGET = qtgeoservices_nokia
- QT += location-private network
- 

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-17 22:08:15 +0000
+++ debian/patches/series	2014-01-08 20:13:27 +0000
@@ -1,3 +1,2 @@
 add_support_for_ubuntu_platform.patch
 skip_failing_tests.patch
-enable_coverage_reporting.patch

=== modified file 'debian/patches/skip_failing_tests.patch'
--- debian/patches/skip_failing_tests.patch	2013-12-18 13:04:40 +0000
+++ debian/patches/skip_failing_tests.patch	2014-01-08 20:13:27 +0000
@@ -1,55 +1,20 @@
+Description: Skip failing tests
+ While enabling tests during build, skip those found failing pending
+ investigation.
+ .
+Author: Allan LeSage <[e-mail]>
+Forwarded: no
+Last-Updated: 2014-01-08
+
 --- a/tests/auto/auto.pro
 +++ b/tests/auto/auto.pro
-@@ -24,9 +24,10 @@
-            qplacesearchreply \
-            qplacesearchsuggestionreply \
-            qplaceuser \
--           qplacemanager \
--           qplacemanager_nokia \
--           qplacemanager_unsupported \
-+           # skip some failling tests
-+           #qplacemanager \
-+           #qplacemanager_nokia \
-+           #qplacemanager_unsupported \
-            placesplugin_unsupported
- 
-     #misc tests
-@@ -47,13 +48,15 @@
-            qgeoroutereply \
-            qgeorouterequest \
-            qgeoroutesegment \
--           qgeoroutingmanager \
-+           # skip some failing tests
-+           #qgeoroutingmanager \
-            qgeoroutingmanagerplugins \
-            qgeotilespec \
-            qgeoroutexmlparser \
-            qgeomapcontroller \
-            maptype \
--           nokia_services \
-+           # skip some failing tests
-+           #nokia_services \
-            qgeocameratiles
- 
-     qtHaveModule(quick) {
-@@ -68,14 +71,15 @@
-            positionplugin \
-            positionplugintest \
-            qgeoaddress \
--           qgeoareamonitor \
-+           #qgeoareamonitor \
-            qgeoshape \
-            qgeorectangle \
-            qgeocircle \
--           qgeocoordinate \
-+           #qgeocoordinate \
+@@ -75,7 +75,8 @@
+            qgeocoordinate \
             qgeolocation \
             qgeopositioninfo \
 -           qgeopositioninfosource \
-+           # skip some failing tests
++           # skip this failing test
 +           #qgeopositioninfosource \
             qgeosatelliteinfo \
             qgeosatelliteinfosource \
--           qnmeapositioninfosource
-+           #qnmeapositioninfosource
-
+            qnmeapositioninfosource

=== modified file 'debian/rules'
--- debian/rules	2013-12-17 22:08:15 +0000
+++ debian/rules	2014-01-08 20:13:27 +0000
@@ -12,7 +12,7 @@
 	dh $@ --fail-missing --parallel --with pkgkde_symbolshelper --dbg-package=qtlocation5-dbg
 
 override_dh_auto_configure:
-	qmake "CONFIG+=debug"
+	qmake "CONFIG+=debug" QT_BUILD_PARTS+=tests
 
 override_dh_auto_install:
 	dh_auto_install
@@ -27,8 +27,7 @@
 	rm -f debian/tmp/usr/lib/*/qt5/examples/qtlocation/declarative/mapviewer/qml_location_mapviewer
 
 override_dh_auto_test:
-	export LD_LIBRARY_PATH=$(CURDIR)/lib
-	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run -a make -f Makefile check
+	xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz