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
=== added file 'debian/patches/disable_failing_tests.patch'
--- debian/patches/disable_failing_tests.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/disable_failing_tests.patch 2014-01-10 06:54:34 +0000
@@ -0,0 +1,47 @@
1diff -ruN a/tests/auto/auto.pro b/tests/auto/auto.pro
2--- a/tests/auto/auto.pro 2013-12-08 22:10:16.000000000 +0500
3+++ b/tests/auto/auto.pro 2014-01-06 18:40:39.277408238 +0500
4@@ -12,7 +12,7 @@
5 SUBDIRS += \
6 quick \
7 particles \
8- qmltest
9+# qmltest (Requires OpenGL)
10 }
11
12 installed_cmake.depends = cmake
13diff -ruN a/tests/auto/qml/debugger/debugger.pro b/tests/auto/qml/debugger/debugger.pro
14--- a/tests/auto/qml/debugger/debugger.pro 2013-12-08 22:10:16.000000000 +0500
15+++ b/tests/auto/qml/debugger/debugger.pro 2014-01-10 11:32:16.909469326 +0500
16@@ -1,14 +1,14 @@
17 TEMPLATE = subdirs
18
19 PUBLICTESTS += \
20- qqmlenginedebugservice \
21+# qqmlenginedebugservice \ (QTBUG-35974)
22 qqmldebugjs \
23 qpacketprotocol \
24 # qv8profilerservice \
25 # qdebugmessageservice \
26 qqmlenginedebuginspectorintegrationtest \
27 qqmlinspector \
28- qqmlprofilerservice
29+# qqmlprofilerservice (QTBUG-35923)
30
31 PRIVATETESTS += \
32 qqmldebugclient \
33diff -ruN a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
34--- a/tests/auto/quick/quick.pro 2013-12-08 22:10:17.000000000 +0500
35+++ b/tests/auto/quick/quick.pro 2014-01-06 18:42:42.257411531 +0500
36@@ -2,10 +2,10 @@
37
38 PUBLICTESTS += \
39 geometry \
40- rendernode \
41+# rendernode \ (QTBUG-35924)
42 qquickpixmapcache
43
44-qtHaveModule(widgets): PUBLICTESTS += nodes
45+#qtHaveModule(widgets): PUBLICTESTS += nodes
46
47 !cross_compile: PRIVATETESTS += examples
048
=== added file 'debian/patches/fix_binary_location_for_tests.patch'
--- debian/patches/fix_binary_location_for_tests.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/fix_binary_location_for_tests.patch 2014-01-10 06:54:34 +0000
@@ -0,0 +1,72 @@
1diff -ruN a/tests/auto/qml/qmlmin/tst_qmlmin.cpp b/tests/auto/qml/qmlmin/tst_qmlmin.cpp
2--- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp 2013-11-21 01:16:04.000000000 +0500
3+++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp 2013-12-21 14:55:25.614708078 +0500
4@@ -75,7 +75,7 @@
5
6 void tst_qmlmin::initTestCase()
7 {
8- qmlminPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmlmin");
9+ qmlminPath = QLatin1String("../../../../bin") + QLatin1String("/qmlmin");
10 #ifdef Q_OS_WIN
11 qmlminPath += QLatin1String(".exe");
12 #endif
13diff -ruN a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
14--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp 2013-11-21 01:16:05.000000000 +0500
15+++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp 2013-12-21 14:55:28.574708157 +0500
16@@ -66,7 +66,7 @@
17
18 void tst_qmlplugindump::initTestCase()
19 {
20- qmlplugindumpPath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
21+ qmlplugindumpPath = QLatin1String("../../../../bin");
22
23 #if defined(Q_OS_WIN)
24 qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
25diff -ruN a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
26--- a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp 2013-12-08 22:10:16.000000000 +0500
27+++ b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp 2014-01-03 12:20:08.520795476 +0500
28@@ -833,7 +833,7 @@
29 bool tst_QQmlDebugJS::init(const QString &qmlFile, bool blockMode)
30 {
31 connection = new QQmlDebugConnection();
32- process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this);
33+ process = new QQmlDebugProcess(QLatin1String("../../../../../bin") + "/qmlscene", this);
34 client = new QJSDebugClient(connection);
35
36 if (blockMode)
37diff -ruN a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
38--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp 2013-12-08 22:10:16.000000000 +0500
39+++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp 2014-01-03 12:21:06.904797040 +0500
40@@ -108,7 +108,7 @@
41 const QString argument = "-qmljsdebugger=port:" STR_PORT_FROM "," STR_PORT_TO ",block";
42
43 // ### Still using qmlscene because of QTBUG-33376
44- m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath)
45+ m_process = new QQmlDebugProcess(QLatin1String("../../../../../bin")
46 + "/qmlscene", this);
47 m_process->start(QStringList() << argument << testFile("qtquick2.qml"));
48 QVERIFY2(m_process->waitForSessionStart(),
49diff -ruN a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
50--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp 2013-12-08 22:10:16.000000000 +0500
51+++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp 2014-01-03 12:23:24.248800718 +0500
52@@ -90,7 +90,7 @@
53 const QString argument = "-qmljsdebugger=port:" STR_PORT_FROM "," STR_PORT_TO ",block";
54
55 // ### This should be using qml instead of qmlscene, but can't because of QTBUG-33376 (same as the XFAIL testcase)
56- m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this);
57+ m_process = new QQmlDebugProcess(QLatin1String("../../../../../bin") + "/qmlscene", this);
58 m_process->start(QStringList() << argument << testFile("qtquick2.qml"));
59 QVERIFY2(m_process->waitForSessionStart(),
60 "Could not launch application, or did not get 'Waiting for connection'.");
61diff -ruN a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
62--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp 2013-12-08 22:10:16.000000000 +0500
63+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp 2014-01-03 12:22:18.392798954 +0500
64@@ -298,7 +298,7 @@
65 void tst_QQmlProfilerService::connect(bool block, const QString &testFile)
66 {
67 // ### Still using qmlscene due to QTBUG-33377
68- const QString executable = QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene";
69+ const QString executable = QLatin1String("../../../../../bin") + "/qmlscene";
70 QStringList arguments;
71 if (block)
72 arguments << QString("-qmljsdebugger=port:" STR_PORT_FROM "," STR_PORT_TO ",block");
073
=== modified file 'debian/patches/series'
--- debian/patches/series 2014-01-08 13:55:25 +0000
+++ debian/patches/series 2014-01-10 06:54:34 +0000
@@ -2,3 +2,5 @@
2fix_qtbug_32004.patch2fix_qtbug_32004.patch
3qtquick_delegate_creation_range_itemviews.patch3qtquick_delegate_creation_range_itemviews.patch
4syncqt_create_headers.patch4syncqt_create_headers.patch
5fix_binary_location_for_tests.patch
6disable_failing_tests.patch
57
=== modified file 'debian/rules'
--- debian/rules 2013-12-17 09:01:49 +0000
+++ debian/rules 2014-01-10 06:54:34 +0000
@@ -14,7 +14,7 @@
14 dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtdeclarative5-dbg14 dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtdeclarative5-dbg
1515
16override_dh_auto_configure:16override_dh_auto_configure:
17 qmake17 qmake QT_BUILD_PARTS+=tests
1818
19override_dh_auto_build-indep:19override_dh_auto_build-indep:
20 dh_auto_build -Smakefile -- docs20 dh_auto_build -Smakefile -- docs
@@ -49,5 +49,15 @@
49override_dh_builddeb:49override_dh_builddeb:
50 dh_builddeb -- -Zxz50 dh_builddeb -- -Zxz
5151
52# Requires X so disabled for now
53override_dh_auto_test:52override_dh_auto_test:
53 cp -a src/imports/qtquick2/qmldir qml/QtQuick.2
54 cp -a src/imports/folderlistmodel/qmldir qml/Qt/labs/folderlistmodel/
55 cp -a src/imports/settings/qmldir qml/Qt/labs/settings/
56 cp -a src/imports/window/qmldir qml/QtQuick/Window.2/
57 cp -a src/imports/models/qmldir qml/QtQml/Models.2/
58 cp -a src/imports/testlib/qmldir qml/QtTest
59 cp -a src/imports/testlib/TestCase.qml qml/QtTest
60 cp -a src/imports/testlib/SignalSpy.qml qml/QtTest
61 cp -a src/imports/testlib/testlogger.js qml/QtTest
62 make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib QML2_IMPORT_PATH=$(CURDIR)/qml QT_QPA_PLATFORM=minimal
63

Subscribers

People subscribed via source and target branches

to all changes: