Omer Akram has proposed merging
lp:~om26er/kubuntu-packaging/qtdeclarative_unittests into
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
Commit message:
Run unittests during build
Requested reviews:
Timo Jyrinki (timo-jyrinki)
For more details, see:
https://code.launchpad.net/~om26er/kubuntu-packaging/qtdeclarative_unittests/+merge/198425
Run unittests during build
--
https://code.launchpad.net/~om26er/kubuntu-packaging/qtdeclarative_unittests/+merge/198425
Your team Kubuntu Packagers is subscribed to branch
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
=== 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 @@
+diff -ruN a/tests/auto/auto.pro b/tests/auto/auto.pro
+--- a/tests/auto/auto.pro 2013-12-08 22:10:16.000000000 +0500
++++ b/tests/auto/auto.pro 2014-01-06 18:40:39.277408238 +0500
+@@ -12,7 +12,7 @@
+ SUBDIRS += \
+ quick \
+ particles \
+- qmltest
++# qmltest (Requires OpenGL)
+ }
+
+ installed_cmake.depends = cmake
+diff -ruN a/tests/auto/qml/debugger/debugger.pro b/tests/auto/qml/debugger/debugger.pro
+--- a/tests/auto/qml/debugger/debugger.pro 2013-12-08 22:10:16.000000000 +0500
++++ b/tests/auto/qml/debugger/debugger.pro 2014-01-10 11:32:16.909469326 +0500
+@@ -1,14 +1,14 @@
+ TEMPLATE = subdirs
+
+ PUBLICTESTS += \
+- qqmlenginedebugservice \
++# qqmlenginedebugservice \ (QTBUG-35974)
+ qqmldebugjs \
+ qpacketprotocol \
+ # qv8profilerservice \
+ # qdebugmessageservice \
+ qqmlenginedebuginspectorintegrationtest \
+ qqmlinspector \
+- qqmlprofilerservice
++# qqmlprofilerservice (QTBUG-35923)
+
+ PRIVATETESTS += \
+ qqmldebugclient \
+diff -ruN a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
+--- a/tests/auto/quick/quick.pro 2013-12-08 22:10:17.000000000 +0500
++++ b/tests/auto/quick/quick.pro 2014-01-06 18:42:42.257411531 +0500
+@@ -2,10 +2,10 @@
+
+ PUBLICTESTS += \
+ geometry \
+- rendernode \
++# rendernode \ (QTBUG-35924)
+ qquickpixmapcache
+
+-qtHaveModule(widgets): PUBLICTESTS += nodes
++#qtHaveModule(widgets): PUBLICTESTS += nodes
+
+ !cross_compile: PRIVATETESTS += examples
=== 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 @@
+diff -ruN a/tests/auto/qml/qmlmin/tst_qmlmin.cpp b/tests/auto/qml/qmlmin/tst_qmlmin.cpp
+--- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp 2013-11-21 01:16:04.000000000 +0500
++++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp 2013-12-21 14:55:25.614708078 +0500
+@@ -75,7 +75,7 @@
+
+ void tst_qmlmin::initTestCase()
+ {
+- qmlminPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmlmin");
++ qmlminPath = QLatin1String("../../../../bin") + QLatin1String("/qmlmin");
+ #ifdef Q_OS_WIN
+ qmlminPath += QLatin1String(".exe");
+ #endif
+diff -ruN a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp 2013-11-21 01:16:05.000000000 +0500
++++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp 2013-12-21 14:55:28.574708157 +0500
+@@ -66,7 +66,7 @@
+
+ void tst_qmlplugindump::initTestCase()
+ {
+- qmlplugindumpPath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
++ qmlplugindumpPath = QLatin1String("../../../../bin");
+
+ #if defined(Q_OS_WIN)
+ qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
+diff -ruN a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
+--- a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp 2013-12-08 22:10:16.000000000 +0500
++++ b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp 2014-01-03 12:20:08.520795476 +0500
+@@ -833,7 +833,7 @@
+ bool tst_QQmlDebugJS::init(const QString &qmlFile, bool blockMode)
+ {
+ connection = new QQmlDebugConnection();
+- process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this);
++ process = new QQmlDebugProcess(QLatin1String("../../../../../bin") + "/qmlscene", this);
+ client = new QJSDebugClient(connection);
+
+ if (blockMode)
+diff -ruN a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp 2013-12-08 22:10:16.000000000 +0500
++++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp 2014-01-03 12:21:06.904797040 +0500
+@@ -108,7 +108,7 @@
+ const QString argument = "-qmljsdebugger=port:" STR_PORT_FROM "," STR_PORT_TO ",block";
+
+ // ### Still using qmlscene because of QTBUG-33376
+- m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath)
++ m_process = new QQmlDebugProcess(QLatin1String("../../../../../bin")
+ + "/qmlscene", this);
+ m_process->start(QStringList() << argument << testFile("qtquick2.qml"));
+ QVERIFY2(m_process->waitForSessionStart(),
+diff -ruN a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp 2013-12-08 22:10:16.000000000 +0500
++++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp 2014-01-03 12:23:24.248800718 +0500
+@@ -90,7 +90,7 @@
+ const QString argument = "-qmljsdebugger=port:" STR_PORT_FROM "," STR_PORT_TO ",block";
+
+ // ### This should be using qml instead of qmlscene, but can't because of QTBUG-33376 (same as the XFAIL testcase)
+- m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this);
++ m_process = new QQmlDebugProcess(QLatin1String("../../../../../bin") + "/qmlscene", this);
+ m_process->start(QStringList() << argument << testFile("qtquick2.qml"));
+ QVERIFY2(m_process->waitForSessionStart(),
+ "Could not launch application, or did not get 'Waiting for connection'.");
+diff -ruN a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp 2013-12-08 22:10:16.000000000 +0500
++++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp 2014-01-03 12:22:18.392798954 +0500
+@@ -298,7 +298,7 @@
+ void tst_QQmlProfilerService::connect(bool block, const QString &testFile)
+ {
+ // ### Still using qmlscene due to QTBUG-33377
+- const QString executable = QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene";
++ const QString executable = QLatin1String("../../../../../bin") + "/qmlscene";
+ QStringList arguments;
+ if (block)
+ arguments << QString("-qmljsdebugger=port:" STR_PORT_FROM "," STR_PORT_TO ",block");
=== 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 @@
fix_qtbug_32004.patch
qtquick_delegate_creation_range_itemviews.patch
syncqt_create_headers.patch
+fix_binary_location_for_tests.patch
+disable_failing_tests.patch
=== 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 @@
dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtdeclarative5-dbg
override_dh_auto_configure:
- qmake
+ qmake QT_BUILD_PARTS+=tests
override_dh_auto_build-indep:
dh_auto_build -Smakefile -- docs
@@ -49,5 +49,15 @@
override_dh_builddeb:
dh_builddeb -- -Zxz
-# Requires X so disabled for now
override_dh_auto_test:
+ cp -a src/imports/qtquick2/qmldir qml/QtQuick.2
+ cp -a src/imports/folderlistmodel/qmldir qml/Qt/labs/folderlistmodel/
+ cp -a src/imports/settings/qmldir qml/Qt/labs/settings/
+ cp -a src/imports/window/qmldir qml/QtQuick/Window.2/
+ cp -a src/imports/models/qmldir qml/QtQml/Models.2/
+ cp -a src/imports/testlib/qmldir qml/QtTest
+ cp -a src/imports/testlib/TestCase.qml qml/QtTest
+ cp -a src/imports/testlib/SignalSpy.qml qml/QtTest
+ cp -a src/imports/testlib/testlogger.js qml/QtTest
+ make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib QML2_IMPORT_PATH=$(CURDIR)/qml QT_QPA_PLATFORM=minimal
+
--
kubuntu-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
