[SCM] qtmultimedia packaging branch, ubuntu, updated. debian/5.5.0-3-12-g4bd50bd
Timo Jyrinki
timo at moszumanska.debian.org
Tue Oct 13 13:06:29 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=4bd50bd
The following commit has been merged in the ubuntu branch:
commit 4bd50bdaadca40528d46fbab12a6a44e7f9858bf
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Tue Oct 13 13:06:15 2015 +0000
Enable tests
---
debian/changelog | 1 +
debian/control | 3 +++
debian/patches/skip_failing_tests.patch | 20 ++++++++++++++++++++
debian/rules | 6 ++++++
4 files changed, 30 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 57bb5c6..43f9c23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtmultimedia-opensource-src (5.5.0-3ubuntu1) UNRELEASED; urgency=medium
- Transitional package for 14.04 LTS -> 16.04 LTS
- Own .symbols files
- Three patches
+ - Enable tests
* debian/patches/Add-audio-role-API-to-QMediaPlayer.patch
debian/patches/Added-new-playlist-QML-type.patch:
- The Audio role API and Playlist type patches were upstreamed for
diff --git a/debian/control b/debian/control
index 4a1ba30..7645662 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,12 @@ Build-Depends: debhelper (>= 9.0.0),
libpulse-dev,
libqt5opengl5-dev (>= 5.5.0+dfsg~),
pkg-kde-tools,
+ qml-module-qtquick2,
+ qml-module-qttest,
qtbase5-dev (>= 5.5.0+dfsg~),
qtbase5-private-dev (>= 5.5.0+dfsg~),
qtdeclarative5-private-dev (>= 5.5.0~),
+ xvfb,
zlib1g-dev
Build-Depends-Indep: libqt5sql5-sqlite (>= 5.5.0+dfsg~),
qtbase5-doc-html (>= 5.5.0+dfsg~),
diff --git a/debian/patches/skip_failing_tests.patch b/debian/patches/skip_failing_tests.patch
index 4713f67..eaa5a27 100644
--- a/debian/patches/skip_failing_tests.patch
+++ b/debian/patches/skip_failing_tests.patch
@@ -28,6 +28,15 @@ Author: Omer Akram <om26er at ubuntu.com>
=== modified file 'tests/auto/unit/multimedia.pro'
--- a/tests/auto/unit/multimedia.pro 2013-05-23 19:47:12 +0000
+++ b/tests/auto/unit/multimedia.pro 2013-12-12 19:46:46 +0000
+@@ -13,7 +13,7 @@
+ qmediacontent \
+ qmediaobject \
+ qmediaplayer \
+- qmediaplaylist \
++# qmediaplaylist \
+ qmediaplaylistnavigator \
+ qmediapluginloader \
+ qmediarecorder \
@@ -19,7 +19,7 @@
qmediarecorder \
qmediaresource \
@@ -37,3 +46,14 @@ Author: Omer Akram <om26er at ubuntu.com>
qmediatimerange \
qmetadatareadercontrol \
qmetadatawritercontrol \
+=== modified file 'tests/auto/unit/unit.pro'
+--- a/tests/auto/unit/unit.pro 2015-06-29 20:05:38.000000000 +0000
++++ b/tests/auto/unit/unit.pro 2015-10-13 12:18:36.808963658 +0000
+@@ -2,4 +2,5 @@
+
+ SUBDIRS += multimedia.pro
+ qtHaveModule(widgets): SUBDIRS += multimediawidgets.pro
+-qtHaveModule(qml): SUBDIRS += multimediaqml.pro
++# Does not find the multimedia module despite paths being set
++#qtHaveModule(qml): SUBDIRS += multimediaqml.pro
+
diff --git a/debian/rules b/debian/rules
index d747468..1c6fd1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,12 @@ override_dh_auto_configure:
override_dh_auto_build-indep:
dh_auto_build -Smakefile -- docs
+override_dh_auto_test-arch:
+ cd tests/auto/unit && qmake unit.pro && xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib QML2_IMPORT_PATH=$(CURDIR)/qml
+
+# Do not attempt to run tests during indep build
+override_dh_auto_test-indep:
+
override_dh_auto_install-arch:
dh_auto_install
--
qtmultimedia packaging
More information about the pkg-kde-commits
mailing list