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

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

Description of the change

Enabled the make check and fixed the failing tests.

To post a comment you must log in.
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-16 10:44:35 +0000
3+++ debian/changelog 2013-12-18 09:37:51 +0000
4@@ -1,10 +1,14 @@
5 qtscript-opensource-src (5.2.0+dfsg-0ubuntu1) UNRELEASED; urgency=low
6
7+ [ Timo Jyrinki ]
8 * Sync with Debian, no remaining differences.
9 * New upstream release.
10 * Bump dependencies to 5.2.0
11
12- -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Mon, 02 Sep 2013 12:40:58 +0000
13+ [ Iftikhar Ahmad (QA Engineer) ]
14+ * Enable make check and fix the failing tests.
15+
16+ -- Iftikhar Ahmad (QA Engineer) <iftikhar.ahmad@canonical.com> Wed, 18 Dec 2013 13:51:29 +0500
17
18 qtscript-opensource-src (5.1.0+dfsg-3) unstable; urgency=low
19
20
21=== modified file 'debian/control'
22--- debian/control 2013-11-13 14:31:16 +0000
23+++ debian/control 2013-12-18 09:37:51 +0000
24@@ -12,7 +12,8 @@
25 Build-Depends: debhelper (>= 9),
26 dpkg-dev (>= 1.16.1),
27 pkg-kde-tools (>= 0.15.8~),
28- qtbase5-private-dev (>= 5.2.0~)
29+ qtbase5-private-dev (>= 5.2.0~),
30+ xvfb
31 Build-Depends-Indep: libqt5sql5-sqlite,
32 qttools5-dev-tools (>= 5.2.0~)
33 Standards-Version: 3.9.4
34
35=== added file 'debian/patches/enable-make-check.patch'
36--- debian/patches/enable-make-check.patch 1970-01-01 00:00:00 +0000
37+++ debian/patches/enable-make-check.patch 2013-12-18 09:37:51 +0000
38@@ -0,0 +1,11 @@
39+--- a/tests/auto/qscriptextensionplugin/test/test.pro
40++++ b/tests/auto/qscriptextensionplugin/test/test.pro
41+@@ -14,7 +14,7 @@ CONFIG(debug_and_release) {
42+ DESTDIR = ../release
43+ }
44+ } else {
45+- DESTDIR = ..
46++ DESTDIR = .
47+ }
48+
49+ DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
50
51=== modified file 'debian/patches/series'
52--- debian/patches/series 2013-08-30 06:48:51 +0000
53+++ debian/patches/series 2013-12-18 09:37:51 +0000
54@@ -1,2 +1,3 @@
55+enable-make-check.patch
56 disable_v8_sunspider_tests.patch
57 s390x_jscore.diff
58
59=== modified file 'debian/rules'
60--- debian/rules 2013-12-16 10:42:06 +0000
61+++ debian/rules 2013-12-18 09:37:51 +0000
62@@ -7,6 +7,7 @@
63 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
64 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
65 export QT_SELECT := qt5
66+export QT_QPA_PLATFORM := minimal
67
68 %:
69 dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtscript5-dbg
70@@ -35,3 +36,6 @@
71 prune-nonfree:
72 rm -rf tests/benchmarks/script/sunspider/*
73 rm -rf tests/benchmarks/script/v8/*
74+
75+override_dh_auto_test:
76+ cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run make -f Makefile check

Subscribers

People subscribed via source and target branches

to all changes: