kubuntu-packaging

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

  1. qtdeclarative_unittests
  2. Merge into qtdeclarative-opensource-src
Proposed by Omer Akram
Status: Merged
Merged at revision: 107
Proposed branch: lp:~om26er/kubuntu-packaging/qtdeclarative_unittests
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src
Diff against target: 168 lines (+133/-2)
4 files modified
debian/patches/disable_failing_tests.patch (+47/-0)
debian/patches/fix_binary_location_for_tests.patch (+72/-0)
debian/patches/series (+2/-0)
debian/rules (+12/-2)
To merge this branch: bzr merge lp:~om26er/kubuntu-packaging/qtdeclarative_unittests
Reviewer Review Type Date Requested Status
Timo Jyrinki Needs Fixing
Review via email: mp+198425@code.launchpad.net

Commit message

Run unittests during build

Description of the change

Run unittests during build

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

About all tests failing:

https://launchpadlibrarian.net/159472784/buildlog_ubuntu-trusty-amd64.qtdeclarative-opensource-src_5.2.0~rc1-0ubuntu1~trusty1~test4_FAILEDTOBUILD.txt.gz

review: Needs Fixing
Revision history for this message
Omer Akram (om26er) wrote :

ouch, I should have tested against Qt 5.2

On Wed, Dec 11, 2013 at 5:36 PM, Timo Jyrinki <email address hidden>wrote:

> Review: Needs Fixing
>
> About all tests failing:
>
>
> https://launchpadlibrarian.net/159472784/buildlog_ubuntu-trusty-amd64.qtdeclarative-opensource-src_5.2.0~rc1-0ubuntu1~trusty1~test4_FAILEDTOBUILD.txt.gz
> --
>
> https://code.launchpad.net/~om26er/kubuntu-packaging/qtdeclarative_unittests/+merge/198425
> You are the owner of lp:~om26er/kubuntu-packaging/qtdeclarative_unittests.
>

Revision history for this message
Omer Akram (om26er) wrote :

The branch is now ready to review.

Revision history for this message
Omer Akram (om26er) wrote :

Not so ready. What works locally is failing in the launchpad builders :/

Revision history for this message
Omer Akram (om26er) wrote :

The branch is now ready to merge

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Thanks! Seems to also work with the newer snapshot. Merged.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/patches/disable_failing_tests.patch'
2--- debian/patches/disable_failing_tests.patch 1970-01-01 00:00:00 +0000
3+++ debian/patches/disable_failing_tests.patch 2014-01-10 06:54:34 +0000
4@@ -0,0 +1,47 @@
5+diff -ruN a/tests/auto/auto.pro b/tests/auto/auto.pro
6+--- a/tests/auto/auto.pro 2013-12-08 22:10:16.000000000 +0500
7++++ b/tests/auto/auto.pro 2014-01-06 18:40:39.277408238 +0500
8+@@ -12,7 +12,7 @@
9+ SUBDIRS += \
10+ quick \
11+ particles \
12+- qmltest
13++# qmltest (Requires OpenGL)
14+ }
15+
16+ installed_cmake.depends = cmake
17+diff -ruN a/tests/auto/qml/debugger/debugger.pro b/tests/auto/qml/debugger/debugger.pro
18+--- a/tests/auto/qml/debugger/debugger.pro 2013-12-08 22:10:16.000000000 +0500
19++++ b/tests/auto/qml/debugger/debugger.pro 2014-01-10 11:32:16.909469326 +0500
20+@@ -1,14 +1,14 @@
21+ TEMPLATE = subdirs
22+
23+ PUBLICTESTS += \
24+- qqmlenginedebugservice \
25++# qqmlenginedebugservice \ (QTBUG-35974)
26+ qqmldebugjs \
27+ qpacketprotocol \
28+ # qv8profilerservice \
29+ # qdebugmessageservice \
30+ qqmlenginedebuginspectorintegrationtest \
31+ qqmlinspector \
32+- qqmlprofilerservice
33++# qqmlprofilerservice (QTBUG-35923)
34+
35+ PRIVATETESTS += \
36+ qqmldebugclient \
37+diff -ruN a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
38+--- a/tests/auto/quick/quick.pro 2013-12-08 22:10:17.000000000 +0500
39++++ b/tests/auto/quick/quick.pro 2014-01-06 18:42:42.257411531 +0500
40+@@ -2,10 +2,10 @@
41+
42+ PUBLICTESTS += \
43+ geometry \
44+- rendernode \
45++# rendernode \ (QTBUG-35924)
46+ qquickpixmapcache
47+
48+-qtHaveModule(widgets): PUBLICTESTS += nodes
49++#qtHaveModule(widgets): PUBLICTESTS += nodes
50+
51+ !cross_compile: PRIVATETESTS += examples
52
53=== added file 'debian/patches/fix_binary_location_for_tests.patch'
54--- debian/patches/fix_binary_location_for_tests.patch 1970-01-01 00:00:00 +0000
55+++ debian/patches/fix_binary_location_for_tests.patch 2014-01-10 06:54:34 +0000
56@@ -0,0 +1,72 @@
57+diff -ruN a/tests/auto/qml/qmlmin/tst_qmlmin.cpp b/tests/auto/qml/qmlmin/tst_qmlmin.cpp
58+--- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp 2013-11-21 01:16:04.000000000 +0500
59++++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp 2013-12-21 14:55:25.614708078 +0500
60+@@ -75,7 +75,7 @@
61+
62+ void tst_qmlmin::initTestCase()
63+ {
64+- qmlminPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmlmin");
65++ qmlminPath = QLatin1String("../../../../bin") + QLatin1String("/qmlmin");
66+ #ifdef Q_OS_WIN
67+ qmlminPath += QLatin1String(".exe");
68+ #endif
69+diff -ruN a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
70+--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp 2013-11-21 01:16:05.000000000 +0500
71++++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp 2013-12-21 14:55:28.574708157 +0500
72+@@ -66,7 +66,7 @@
73+
74+ void tst_qmlplugindump::initTestCase()
75+ {
76+- qmlplugindumpPath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
77++ qmlplugindumpPath = QLatin1String("../../../../bin");
78+
79+ #if defined(Q_OS_WIN)
80+ qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
81+diff -ruN a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
82+--- a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp 2013-12-08 22:10:16.000000000 +0500
83++++ b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp 2014-01-03 12:20:08.520795476 +0500
84+@@ -833,7 +833,7 @@
85+ bool tst_QQmlDebugJS::init(const QString &qmlFile, bool blockMode)
86+ {
87+ connection = new QQmlDebugConnection();
88+- process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this);
89++ process = new QQmlDebugProcess(QLatin1String("../../../../../bin") + "/qmlscene", this);
90+ client = new QJSDebugClient(connection);
91+
92+ if (blockMode)
93+diff -ruN a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
94+--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp 2013-12-08 22:10:16.000000000 +0500
95++++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp 2014-01-03 12:21:06.904797040 +0500
96+@@ -108,7 +108,7 @@
97+ const QString argument = "-qmljsdebugger=port:" STR_PORT_FROM "," STR_PORT_TO ",block";
98+
99+ // ### Still using qmlscene because of QTBUG-33376
100+- m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath)
101++ m_process = new QQmlDebugProcess(QLatin1String("../../../../../bin")
102+ + "/qmlscene", this);
103+ m_process->start(QStringList() << argument << testFile("qtquick2.qml"));
104+ QVERIFY2(m_process->waitForSessionStart(),
105+diff -ruN a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
106+--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp 2013-12-08 22:10:16.000000000 +0500
107++++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp 2014-01-03 12:23:24.248800718 +0500
108+@@ -90,7 +90,7 @@
109+ const QString argument = "-qmljsdebugger=port:" STR_PORT_FROM "," STR_PORT_TO ",block";
110+
111+ // ### This should be using qml instead of qmlscene, but can't because of QTBUG-33376 (same as the XFAIL testcase)
112+- m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this);
113++ m_process = new QQmlDebugProcess(QLatin1String("../../../../../bin") + "/qmlscene", this);
114+ m_process->start(QStringList() << argument << testFile("qtquick2.qml"));
115+ QVERIFY2(m_process->waitForSessionStart(),
116+ "Could not launch application, or did not get 'Waiting for connection'.");
117+diff -ruN a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
118+--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp 2013-12-08 22:10:16.000000000 +0500
119++++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp 2014-01-03 12:22:18.392798954 +0500
120+@@ -298,7 +298,7 @@
121+ void tst_QQmlProfilerService::connect(bool block, const QString &testFile)
122+ {
123+ // ### Still using qmlscene due to QTBUG-33377
124+- const QString executable = QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene";
125++ const QString executable = QLatin1String("../../../../../bin") + "/qmlscene";
126+ QStringList arguments;
127+ if (block)
128+ arguments << QString("-qmljsdebugger=port:" STR_PORT_FROM "," STR_PORT_TO ",block");
129
130=== modified file 'debian/patches/series'
131--- debian/patches/series 2014-01-08 13:55:25 +0000
132+++ debian/patches/series 2014-01-10 06:54:34 +0000
133@@ -2,3 +2,5 @@
134 fix_qtbug_32004.patch
135 qtquick_delegate_creation_range_itemviews.patch
136 syncqt_create_headers.patch
137+fix_binary_location_for_tests.patch
138+disable_failing_tests.patch
139
140=== modified file 'debian/rules'
141--- debian/rules 2013-12-17 09:01:49 +0000
142+++ debian/rules 2014-01-10 06:54:34 +0000
143@@ -14,7 +14,7 @@
144 dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtdeclarative5-dbg
145
146 override_dh_auto_configure:
147- qmake
148+ qmake QT_BUILD_PARTS+=tests
149
150 override_dh_auto_build-indep:
151 dh_auto_build -Smakefile -- docs
152@@ -49,5 +49,15 @@
153 override_dh_builddeb:
154 dh_builddeb -- -Zxz
155
156-# Requires X so disabled for now
157 override_dh_auto_test:
158+ cp -a src/imports/qtquick2/qmldir qml/QtQuick.2
159+ cp -a src/imports/folderlistmodel/qmldir qml/Qt/labs/folderlistmodel/
160+ cp -a src/imports/settings/qmldir qml/Qt/labs/settings/
161+ cp -a src/imports/window/qmldir qml/QtQuick/Window.2/
162+ cp -a src/imports/models/qmldir qml/QtQml/Models.2/
163+ cp -a src/imports/testlib/qmldir qml/QtTest
164+ cp -a src/imports/testlib/TestCase.qml qml/QtTest
165+ cp -a src/imports/testlib/SignalSpy.qml qml/QtTest
166+ cp -a src/imports/testlib/testlogger.js qml/QtTest
167+ make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib QML2_IMPORT_PATH=$(CURDIR)/qml QT_QPA_PLATFORM=minimal
168+

Subscribers

People subscribed via source and target branches

to all changes: