Merge lp:~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src

Proposed by I Ahmad
Status: Merged
Merged at revision: 53
Proposed branch: lp:~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src
Diff against target: 90 lines (+41/-2)
5 files modified
debian/changelog (+5/-1)
debian/control (+2/-1)
debian/patches/enable-make-check.patch (+28/-0)
debian/patches/series (+1/-0)
debian/rules (+5/-0)
To merge this branch: bzr merge lp:~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
Review via email: mp+198898@code.launchpad.net

Description of the change

Enabled the make check and conditionally disabled the network dependent test cases.

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :
review: Needs Fixing
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Additionally: please don't bump the version number in changelog, ubuntu1 is not yet released.

54. By I Ahmad

add xvfb dependency

55. By I Ahmad

catchup with trunk

56. By I Ahmad

Undo the version bump

Revision history for this message
I Ahmad (iahmad) wrote :

Fixed the xvfb dependency and version number. Also tested in pbuilder and everything looks fine. Please give it anther try in ppa. Thanks.

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :
Revision history for this message
Timo Jyrinki (timo-jyrinki) :
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-13 06:26:38 +0000
3+++ debian/changelog 2013-12-13 13:05:33 +0000
4@@ -8,7 +8,11 @@
5 * Sync with Debian, no remaining differences
6 * Bump build-deps to 5.1.1
7
8- -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 30 Aug 2013 06:38:12 +0000
9+ [ Iftikhar Ahmad (QA Engineer) ]
10+ * Enable make check.
11+ * Conditionally skip the network dependent unit tests.
12+
13+ -- Iftikhar Ahmad (QA Engineer) <iftikhar.ahmad@canonical.com> Fri, 13 Dec 2013 17:36:45 +0500
14
15 qtxmlpatterns-opensource-src (5.1.0-2) unstable; urgency=low
16
17
18=== modified file 'debian/control'
19--- debian/control 2013-11-13 14:13:53 +0000
20+++ debian/control 2013-12-13 13:05:33 +0000
21@@ -12,7 +12,8 @@
22 Build-Depends: debhelper (>= 9),
23 dpkg-dev (>= 1.16.1),
24 pkg-kde-tools,
25- qtbase5-private-dev (>= 5.2.0~)
26+ qtbase5-private-dev (>= 5.2.0~),
27+ xvfb
28 Build-Depends-Indep: libqt5sql5-sqlite,
29 qttools5-dev-tools (>= 5.2.0~)
30 Standards-Version: 3.9.4
31
32=== added directory 'debian/patches'
33=== added file 'debian/patches/enable-make-check.patch'
34--- debian/patches/enable-make-check.patch 1970-01-01 00:00:00 +0000
35+++ debian/patches/enable-make-check.patch 2013-12-13 13:05:33 +0000
36@@ -0,0 +1,28 @@
37+--- a/tests/auto/auto.pro
38++++ b/tests/auto/auto.pro
39+@@ -19,12 +19,10 @@ SUBDIRS=\
40+ qxmlname \
41+ qxmlnamepool \
42+ qxmlnodemodelindex \
43+- qxmlquery \
44+ qxmlresultitems \
45+ qxmlschema \
46+ qxmlschemavalidator \
47+ qxmlserializer \
48+- xmlpatterns \
49+ xmlpatternsdiagnosticsts \
50+ xmlpatternsschema \
51+ xmlpatternsschemats \
52+@@ -32,7 +30,11 @@ SUBDIRS=\
53+ xmlpatternsvalidator \
54+ xmlpatternsview \
55+ xmlpatternsxqts \
56+- xmlpatternsxslts \
57++ xmlpatternsxslts
58++
59++#skip the network tests for unix platform.
60++!unix:SUBDIRS += qxmlquery
61++!unix:SUBDIRS += xmlpatterns
62+
63+ xmlpatternsdiagnosticsts.depends = xmlpatternssdk
64+ xmlpatternsview.depends = xmlpatternssdk
65
66=== added file 'debian/patches/series'
67--- debian/patches/series 1970-01-01 00:00:00 +0000
68+++ debian/patches/series 2013-12-13 13:05:33 +0000
69@@ -0,0 +1,1 @@
70+enable-make-check.patch
71
72=== modified file 'debian/rules'
73--- debian/rules 2013-12-13 09:49:16 +0000
74+++ debian/rules 2013-12-13 13:05:33 +0000
75@@ -7,6 +7,7 @@
76 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
77 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
78 export QT_SELECT := qt5
79+export QT_QPA_PLATFORM := minimal
80
81 %:
82 dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtxmlpatterns5-dbg
83@@ -35,3 +36,7 @@
84
85 override_dh_builddeb:
86 dh_builddeb -- -Zxz
87+
88+override_dh_auto_test:
89+ cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run -a make -f Makefile check
90+

Subscribers

People subscribed via source and target branches

to all changes: