Merge lp:~chris.gagnon/kubuntu-packaging/qtgraphicaleffects-opensource-src-enable-unit-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtgraphicaleffects-opensource-src

Proposed by Chris Gagnon
Status: Merged
Merged at revision: 27
Proposed branch: lp:~chris.gagnon/kubuntu-packaging/qtgraphicaleffects-opensource-src-enable-unit-tests
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/qtgraphicaleffects-opensource-src
Diff against target: 43 lines (+10/-1)
3 files modified
debian/changelog (+4/-0)
debian/control (+2/-0)
debian/rules (+4/-1)
To merge this branch: bzr merge lp:~chris.gagnon/kubuntu-packaging/qtgraphicaleffects-opensource-src-enable-unit-tests
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
Kubuntu Packagers Pending
Review via email: mp+198846@code.launchpad.net

Description of the change

enable unit tests to run during build time

To post a comment you must log in.
28. By Chris Gagnon

depend on qtdeclarative5-qtquick2-plugin

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-12-03 12:21:49 +0000
3+++ debian/changelog 2013-12-12 23:56:25 +0000
4@@ -4,6 +4,10 @@
5 - Transitional package for upgrades from Ubuntu 13.04
6 * New upstream release.
7
8+ [ Chris Gagnon ]
9+ * Run unit tests during build:
10+ - Chris Gagnon <chris.gagnon@canonical.com>
11+
12 -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Mon, 02 Sep 2013 12:39:20 +0000
13
14 qtgraphicaleffects-opensource-src (5.1.1-1) unstable; urgency=low
15
16=== modified file 'debian/control'
17--- debian/control 2013-09-02 12:36:39 +0000
18+++ debian/control 2013-12-12 23:56:25 +0000
19@@ -14,6 +14,8 @@
20 pkg-kde-tools,
21 qtbase5-private-dev (>= 5.1.1+dfsg~),
22 qtdeclarative5-private-dev (>= 5.1.1~),
23+ qtdeclarative5-qtquick2-plugin,
24+ xvfb,
25 Build-Depends-Indep: libqt5sql5-sqlite,
26 qttools5-dev-tools (>= 5.1.1~)
27 Standards-Version: 3.9.4
28
29=== modified file 'debian/rules'
30--- debian/rules 2013-11-15 09:22:31 +0000
31+++ debian/rules 2013-12-12 23:56:25 +0000
32@@ -12,7 +12,10 @@
33 dh $@ --parallel
34
35 override_dh_auto_configure:
36- qmake "CONFIG+=debug"
37+ qmake "CONFIG+=debug" QT_BUILD_PARTS+=tests
38+
39+override_dh_auto_test:
40+ xvfb-run -a make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
41
42 override_dh_auto_build-indep:
43 dh_auto_build -Smakefile -- docs

Subscribers

People subscribed via source and target branches