Merge lp:~om26er/kubuntu-packaging/qtsystems_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtsystems-opensource-src

[Omer Akram]

Run unittests during build, disable failing tests

Run unittests during build, disable failing tests

[Timo Jyrinki (timo-jyrinki)]

bzr bd fails:
Applying patch disable_qservicemanager_ipc.patch
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|=== modified file 'tests/auto/serviceframework/serviceframework.pro'
|--- tests/auto/serviceframework/serviceframework.pro 2013-06-14 10:32:13 +0000
|+++ tests/auto/serviceframework/serviceframework.pro 2013-12-10 17:11:31 +0000
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
Patch disable_qservicemanager_ipc.patch does not apply (enforce with -f)

review: Needs Fixing

[lp:~om26er/kubuntu-packaging/qtsystems_unittests]

24. By Omer Akram on 2013-12-11

fix the patch

[Omer Akram (om26er)]

sorry about that. Fixed the patch now.

[lp:~om26er/kubuntu-packaging/qtsystems_unittests]

25. By Omer Akram on 2013-12-13

add patch to skip failing tests

26. By Omer Akram on 2013-12-13

revert last commit

27. By Omer Akram on 2013-12-13

skip more failing tests

28. By Omer Akram on 2013-12-16

delete newly added patches

29. By Omer Akram on 2013-12-16

add DEP3 compiliant patch to skip failing tests

30. By Omer Akram on 2013-12-17

add missing build-dep for successfully running unittests

[Timo Jyrinki (timo-jyrinki)]

Seems great now on three archs! https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-daily/+sourcepub/3737985/+listing-archive-extra

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-07-11 12:58:03 +0000
+++ debian/control	2013-12-17 09:25:21 +0000
@@ -7,6 +7,7 @@
                qt5-default,
                qtbase5-private-dev,
                qtdeclarative5-private-dev,
+               libqt5sql5-sqlite,
 Standards-Version: 3.9.4
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtsystems.git
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-09-30 06:12:54 +0000
+++ debian/patches/series	2013-12-17 09:25:21 +0000
@@ -2,3 +2,4 @@
 add_license_files.patch
 build_with_udisk.patch
 wlan_detect.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	2013-12-17 09:25:21 +0000
@@ -0,0 +1,42 @@
+Description: Disable the failing tests
+Forwarded: not-needed
+Bug: https://bugreports.qt-project.org/browse/QTBUG-35662
+Bug-Ubuntu: https://launchpad.net/bugs/1261411
+Author: Omer Akram <[e-mail]>
+
+=== modified file 'tests/auto/serviceframework/qremoteserviceregister/tst_qremoteserviceregister.cpp'
+--- a/tests/auto/serviceframework/qremoteserviceregister/tst_qremoteserviceregister.cpp	2013-06-14 10:32:13 +0000
++++ b/tests/auto/serviceframework/qremoteserviceregister/tst_qremoteserviceregister.cpp	2013-12-12 13:18:44 +0000
+@@ -229,6 +229,7 @@
+ 
+ void tst_QRemoteServiceRegister::tst_instanceClosed()
+ {
++    QSKIP("QTBUG-35662: fails due to missing /etc/machine-id");
+     qRegisterMetaType<QRemoteServiceRegister::Entry>("QRemoteServiceRegister::Entry");
+     if(!servicePublished)
+         serviceRegister->publishEntries("qt_sfw_example_rsr_unittest");
+
+=== modified file 'tests/auto/serviceframework/servicedeletion/tst_servicedeletion.cpp'
+--- a/tests/auto/serviceframework/servicedeletion/tst_servicedeletion.cpp	2013-06-14 10:32:13 +0000
++++ b/tests/auto/serviceframework/servicedeletion/tst_servicedeletion.cpp	2013-12-12 13:26:29 +0000
+@@ -116,6 +116,7 @@
+ 
+ void tst_QServiceDeletion::publishService()
+ {
++    QSKIP("LP: #1261411 fails due to missing /etc/machine-id");
+     QRemoteServiceRegister *serviceRegister = new QRemoteServiceRegister(this);
+ 
+     QString serviceName = "TestService";
+
+=== modified file 'tests/auto/serviceframework/serviceframework.pro'
+--- a/tests/auto/serviceframework/serviceframework.pro	2013-06-14 10:32:13 +0000
++++ b/tests/auto/serviceframework/serviceframework.pro	2013-12-10 17:11:31 +0000
+@@ -5,7 +5,7 @@
+            qservicefilter \
+            qserviceinterfacedescriptor \
+            qservicemanager \
+-           qservicemanager_ipc \
++#          qservicemanager_ipc \   #(is failing on Ubuntu)
+            qservicemetadata \
+            servicedeletion
+ #           serviceobject
 
=== modified file 'debian/rules'
--- debian/rules	2013-08-09 08:44:14 +0000
+++ debian/rules	2013-12-17 09:25:21 +0000
@@ -40,3 +40,7 @@
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
+override_dh_auto_test:
+	export LD_LIBRARY_PATH=$(CURDIR)/lib
+	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && make -f Makefile check
+