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

Proposed by Chris Gagnon
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 66
Merged at revision: 66
Proposed branch: lp:~chris.gagnon/kubuntu-packaging/qtscript-opensource-src-enable-tests-again
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/qtscript-opensource-src
Diff against target: 37 lines (+16/-1)
3 files modified
debian/patches/enable-tests.patch (+14/-0)
debian/patches/series (+1/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~chris.gagnon/kubuntu-packaging/qtscript-opensource-src-enable-tests-again
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Kubuntu Packagers Pending
Review via email: mp+215068@code.launchpad.net

Commit message

enable tens of thousands of tests again, while disabling one bad test

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

LGTM.

Actually, the disable is not necessary as the tests succeed in a clean environment (where cmake is not pulled in). Other modules' tests also fail when cmake is installed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'debian/patches/enable-tests.patch'
--- debian/patches/enable-tests.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/enable-tests.patch 2014-04-10 01:04:36 +0000
@@ -0,0 +1,14 @@
1Index: qtscript-opensource-src-5.2.1+dfsg/tests/auto/auto.pro
2===================================================================
3--- qtscript-opensource-src-5.2.1+dfsg.orig/tests/auto/auto.pro 2014-04-09 20:41:59.767274525 -0400
4+++ qtscript-opensource-src-5.2.1+dfsg/tests/auto/auto.pro 2014-04-09 20:42:59.931274554 -0400
5@@ -15,7 +15,8 @@
6 qscriptvaluegenerated \
7 qscriptvalueiterator \
8 qscriptqwidgets \
9- cmake \
10+# remove failing test that needs to be fixed
11+# cmake \
12
13 !contains(QT_CONFIG, private_tests): SUBDIRS -= \
14 qscriptcontext \
015
=== modified file 'debian/patches/series'
--- debian/patches/series 2014-03-10 15:39:03 +0000
+++ debian/patches/series 2014-04-10 01:04:36 +0000
@@ -2,3 +2,4 @@
2disable_v8_sunspider_tests.patch2disable_v8_sunspider_tests.patch
3s390x_jscore.diff3s390x_jscore.diff
4aarch64.patch4aarch64.patch
5enable-tests.patch
56
=== modified file 'debian/rules'
--- debian/rules 2014-03-10 14:25:18 +0000
+++ debian/rules 2014-04-10 01:04:36 +0000
@@ -39,4 +39,4 @@
3939
40override_dh_auto_test:40override_dh_auto_test:
41 # Do not run tests at least until we get the transition sorted out.41 # Do not run tests at least until we get the transition sorted out.
42 #xvfb-run -a dh_auto_test42 xvfb-run -a dh_auto_test

Subscribers

People subscribed via source and target branches