diff -Nru qtsystems-opensource-src-5.0~git20141206~44f70d99/debian/changelog qtsystems-opensource-src-5.0~git20141206~44f70d99/debian/changelog --- qtsystems-opensource-src-5.0~git20141206~44f70d99/debian/changelog 2016-02-22 12:14:57.000000000 +0000 +++ qtsystems-opensource-src-5.0~git20141206~44f70d99/debian/changelog 2016-03-08 12:48:25.000000000 +0000 @@ -1,3 +1,10 @@ +qtsystems-opensource-src (5.0~git20141206~44f70d99-0ubuntu8) xenial; urgency=medium + + * skip_failing_tests.patch: Re-enable two tests. + * debian/rules: use dbus-run-session to run the tests. + + -- Timo Jyrinki Tue, 08 Mar 2016 12:48:22 +0000 + qtsystems-opensource-src (5.0~git20141206~44f70d99-0ubuntu7) xenial; urgency=medium * debian/patches/WIP-Add-QInputDeviceInfo.patch: diff -Nru qtsystems-opensource-src-5.0~git20141206~44f70d99/debian/control qtsystems-opensource-src-5.0~git20141206~44f70d99/debian/control --- qtsystems-opensource-src-5.0~git20141206~44f70d99/debian/control 2016-02-22 12:14:57.000000000 +0000 +++ qtsystems-opensource-src-5.0~git20141206~44f70d99/debian/control 2016-03-08 12:48:25.000000000 +0000 @@ -2,7 +2,8 @@ Section: libs Priority: optional Maintainer: Timo Jyrinki -Build-Depends: debhelper (>= 9), +Build-Depends: dbus, + debhelper (>= 9), libevdev-dev, libqt5sql5-sqlite (>= 5.5.1~), libudev-dev, diff -Nru qtsystems-opensource-src-5.0~git20141206~44f70d99/debian/patches/skip_failing_tests.patch qtsystems-opensource-src-5.0~git20141206~44f70d99/debian/patches/skip_failing_tests.patch --- qtsystems-opensource-src-5.0~git20141206~44f70d99/debian/patches/skip_failing_tests.patch 2016-02-22 12:14:57.000000000 +0000 +++ qtsystems-opensource-src-5.0~git20141206~44f70d99/debian/patches/skip_failing_tests.patch 2016-03-08 12:48:25.000000000 +0000 @@ -4,30 +4,6 @@ Bug-Ubuntu: https://launchpad.net/bugs/1261411 Author: Omer Akram -=== 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"); - 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 diff -Nru qtsystems-opensource-src-5.0~git20141206~44f70d99/debian/rules qtsystems-opensource-src-5.0~git20141206~44f70d99/debian/rules --- qtsystems-opensource-src-5.0~git20141206~44f70d99/debian/rules 2016-02-22 12:14:57.000000000 +0000 +++ qtsystems-opensource-src-5.0~git20141206~44f70d99/debian/rules 2016-03-08 12:48:25.000000000 +0000 @@ -31,4 +31,4 @@ 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 + cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && dbus-run-session make -f Makefile check