kubuntu-packaging

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

  1. enable-tests-qtimageformats-opensource-src
  2. Merge into qtimageformats-opensource-src
Proposed by Chris Gagnon
Status: Needs review
Proposed branch: lp:~chris.gagnon/kubuntu-packaging/enable-tests-qtimageformats-opensource-src
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/qtimageformats-opensource-src
Diff against target: 30 lines (+7/-2)
2 files modified
debian/control (+2/-1)
debian/rules (+5/-1)
To merge this branch: bzr merge lp:~chris.gagnon/kubuntu-packaging/enable-tests-qtimageformats-opensource-src
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+219192@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

Thanks. I see no reason to diverge from Debian here, so I've committed the changes directly to Debian Git, with some (usual) fixes:

- Build-dependency on xauth;
- Using dh_auto_test to take care about DEB_BUILD_OPTIONS=nocheck;
- Removing some unneeded make variables, only plugins path is really helpful.

Reply
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

It also turned out that the tests were failing on powerpc, I have proposed https://codereview.qt-project.org/86275 to fix that.

Reply

Unmerged revisions

10. By Chris Gagnon

add xvfb to debian control so tests will run

9. By Chris Gagnon

enable tests

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-02-06 17:13:42 +0000
3+++ debian/control 2014-05-12 13:46:55 +0000
4@@ -14,7 +14,8 @@
5 pkg-kde-tools,
6 qtbase5-private-dev (>= 5.2.1+dfsg~),
7 libmng-dev,
8- libtiff-dev
9+ libtiff-dev,
10+ xvfb
11 Standards-Version: 3.9.4
12 Homepage: http://qt-project.org/
13 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtimageformats.git
14
15=== modified file 'debian/rules'
16--- debian/rules 2013-09-03 07:28:41 +0000
17+++ debian/rules 2014-05-12 13:46:55 +0000
18@@ -12,7 +12,11 @@
19 dh $@ --parallel
20
21 override_dh_auto_configure:
22- qmake
23+ qmake QT_BUILD_PARTS+=tests
24
25 override_dh_builddeb:
26 dh_builddeb -- -Zxz
27+
28+override_dh_auto_test:
29+ xvfb-run -a make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib PATH=$(CURDIR)/bin:$(PATH)
30+

Subscribers

People subscribed via source and target branches