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

[Allan LeSage]

Enable testing: run tests under debian build (using xvfb), skip some failing tests, enable our standard coverage reporting.

[Dmitry Shachnev (mitya57)]

Thanks for your work here. We usually prefer when:

- tests are built in build target, not in override_dh_auto_test (i.e. use QT_BUILD_PARTS+=tests);
- you actually use dh_auto_test (i.e. 'dh_auto_test -- -C tests/auto/' is a much simplier command than yours);
- and if dh_auto_test for some reason doesn't work for you, make sure DEB_BUILD_OPTIONS=nocheck is honored.

Check qtsvg-opensource-src for an example of a good implementation.

review: Needs Fixing

[Allan LeSage (allanlesage)]

Thanks Dmitry, fixes in progress.

[Dmitry Shachnev (mitya57)]

I think the correct command would be just "xvfb-run -a dh_auto_test". Also, please add build-dependency on xauth (needed in some configurations) and DEP-3 headers to the patch.

[lp:~allanlesage/kubuntu-packaging/qt3d-enable-tests]

38. By Allan LeSage on 2014-01-14

Correct patch series, removing enable_coverage.patch.

[Timo Jyrinki (timo-jyrinki)]

This one on the other hand seemed completely fine. https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-daily/+sourcepub/3835682/+listing-archive-extra

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-18 06:58:29 +0000
+++ debian/changelog	2014-01-14 21:31:57 +0000
@@ -1,9 +1,18 @@
 qt3d-opensource-src (5.0~git20130731-0ubuntu2) UNRELEASED; urgency=medium
 
+  [ Timo Jyrinki ]
   * Rebuild against Qt 5.2.0, bump dependencies
   * Use QT_SELECT instead of depending on qt5-default
   * Add syncqt_create_headers.patch to fix build against 5.2.0
 
+  [ Allan LeSage ]
+  * Add tests to QT_BUILD_PARTS.
+  * Depend on xvfb for existing tests requiring a display.
+  * Add dh_override_auto_test to dh_auto_test under xvfb-run.
+  * debian/patches/skip_failing_tests.patch
+    - Skip some failing tests pending investigation.
+  * Depend on xauth, needed in some configurations.
+
  -- Timo Jyrinki <[e-mail]>  Tue, 17 Dec 2013 10:54:56 +0000
 
 qt3d-opensource-src (5.0~git20130731-0ubuntu1) saucy; urgency=low

=== modified file 'debian/control'
--- debian/control	2013-12-18 06:58:29 +0000
+++ debian/control	2014-01-14 21:31:57 +0000
@@ -7,6 +7,8 @@
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.2.0+dfsg~),
                qtdeclarative5-private-dev (>= 5.2.0~),
+               xauth,
+               xvfb,
                zlib1g-dev,
 Standards-Version: 3.9.3
 Homepage: http://qt-project.org/

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-18 06:58:29 +0000
+++ debian/patches/series	2014-01-14 21:31:57 +0000
@@ -1,3 +1,4 @@
 link_against_system_zlib.patch
 workaround_zlib_linking_issue.patch
 syncqt_create_headers.patch
+skip_failing_tests.patch

=== 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	2014-01-14 21:31:57 +0000
@@ -0,0 +1,61 @@
+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-07
+
+--- a/tests/auto/threed/threed.pro
++++ b/tests/auto/threed/threed.pro
+@@ -5,8 +5,9 @@
+     qbox3d \
+     qcolor4ub \
+     qcustomdataarray \
+-    qgeometrydata \
+-    qglabstractsurface \
++    # skip these failing tests
++    #qgeometrydata \
++    #qglabstractsurface \
+     qglattributedescription \
+     qglattributeset \
+     qglattributevalue \
+@@ -18,7 +19,8 @@
+     qglindexbuffer \
+     qgllightmodel \
+     qgllightparameters \
+-    qglmaterial \
++    # skip this failing test
++    #qglmaterial \
+     qglmaterialcollection \
+     qglpainter \
+     qglpickcolors \
+@@ -26,7 +28,8 @@
+     qglscenenode \
+     qglsection \
+     qglsphere \
+-    qglvertexbundle \
++    # skip this failing test
++    #qglvertexbundle \
+     qgraphicstransform3d \
+     qplane3d \
+     qray3d \
+--- a/tests/auto/auto.pro
++++ b/tests/auto/auto.pro
+@@ -3,9 +3,10 @@
+           cmake
+ 
+ qtHaveModule(qml): SUBDIRS += imports
+-qtHaveModule(qmltest) {
+-    SUBDIRS += qml3d
+-
+-    !win32 : SUBDIRS += qml3d_visual \
+-                        qml3d_cpp
+-}
++# skip these failing tests
++#qtHaveModule(qmltest) {
++#    SUBDIRS += qml3d
++#
++#    !win32 : SUBDIRS += qml3d_visual \
++#                        qml3d_cpp
++#}

=== modified file 'debian/rules'
--- debian/rules	2013-12-18 06:58:29 +0000
+++ debian/rules	2014-01-14 21:31:57 +0000
@@ -13,7 +13,7 @@
 	dh $@ --fail-missing --parallel --with pkgkde_symbolshelper --dbg-package=qt3d5-dbg
 
 override_dh_auto_configure:
-	qmake
+	qmake QT_BUILD_PARTS+=tests
 
 override_dh_auto_install:
 	dh_auto_install
@@ -24,6 +24,9 @@
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
+override_dh_auto_test:
+	xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+
 override_dh_builddeb:
 	dh_builddeb -- -Zxz