Merge lp:~om26er/kubuntu-packaging/qtdeclarative_skip_failing into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

Proposed by Omer Akram
Status: Merged
Merge reported by: Timo Jyrinki
Merged at revision: not available
Proposed branch: lp:~om26er/kubuntu-packaging/qtdeclarative_skip_failing
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src
Diff against target: 19 lines (+12/-0)
1 file modified
debian/patches/disable_failing_tests.patch (+12/-0)
To merge this branch: bzr merge lp:~om26er/kubuntu-packaging/qtdeclarative_skip_failing
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Kubuntu Packagers Pending
Review via email: mp+201819@code.launchpad.net
To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

This or equivalent is certainly already merged. The tests are enabled and functional on all 6 archs.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/patches/disable_failing_tests.patch'
--- debian/patches/disable_failing_tests.patch 2014-01-10 06:46:27 +0000
+++ debian/patches/disable_failing_tests.patch 2014-01-15 17:50:35 +0000
@@ -45,3 +45,15 @@
45+#qtHaveModule(widgets): PUBLICTESTS += nodes45+#qtHaveModule(widgets): PUBLICTESTS += nodes
46 46
47 !cross_compile: PRIVATETESTS += examples47 !cross_compile: PRIVATETESTS += examples
48
49diff -ruN a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
50--- a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp 2014-01-08 00:10:48.000000000 +0500
51+++ b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp 2014-01-15 22:33:56.872973911 +0500
52@@ -1275,6 +1275,7 @@
53
54 void tst_QQmlDebugJS::stepIn()
55 {
56+ QSKIP("QTBUG-36206");
57 //void continueDebugging(StepAction stepAction, int stepCount = 1);
58
59 int sourceLine = 54;

Subscribers

People subscribed via source and target branches

to all changes: