[SCM] qtdeclarative packaging branch, ubuntu, updated. debian/5.6.1-11-108-g2918e4a
Timo Jyrinki
timo at moszumanska.debian.org
Mon Oct 17 11:50:19 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=2918e4a
The following commit has been merged in the ubuntu branch:
commit 2918e4ac1c99e064e452117d612d1955e1dd9a9d
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Mon Oct 17 09:27:34 2016 +0000
Skip certain failing tests on i386 and ppc64el tests on xenial.
---
debian/changelog | 1 +
debian/control | 1 +
debian/patches/series | 1 +
debian/patches/skip_failing_i386_test.patch | 117 ++++++++++++++++++++++++++++
debian/rules | 4 +
5 files changed, 124 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index a7b123f..c043f09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtdeclarative-opensource-src (5.6.1-11ubuntu1) UNRELEASED; urgency=medium
* Update symbols.
* Merge with Debian 5.6.1-11 changes.
* Use fix-V4-on-big-endian.patch version from upstream 5.6 branch.
+ * Skip certain failing tests on i386 and ppc64el tests on xenial.
-- Timo Jyrinki <timo-jyrinki at ubuntu.com> Thu, 06 Oct 2016 14:39:07 +0000
diff --git a/debian/control b/debian/control
index 43d6c8f..a78d643 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 9),
libgl1-mesa-dri,
libqt5opengl5-dev (>= 5.6.1~),
libqt5xmlpatterns5-dev (>= 5.6.1~),
+ lsb-release,
pkg-kde-tools (>= 0.15.17~),
python,
qtbase5-private-dev (>= 5.6.1+dfsg~),
diff --git a/debian/patches/series b/debian/patches/series
index ed60ca5..d4e8dc0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ fix_test_remove_qlibraryinfo.patch
# Ubuntu patches
QML-Compilation-unit-caching-and-JIT-changes.patch
+skip_failing_i386_test.patch
diff --git a/debian/patches/skip_failing_i386_test.patch b/debian/patches/skip_failing_i386_test.patch
new file mode 100644
index 0000000..ed4294c
--- /dev/null
+++ b/debian/patches/skip_failing_i386_test.patch
@@ -0,0 +1,117 @@
+diff -urN qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qjsengine/tst_qjsengine.cpp qtdeclarative-opensource-src-5.6.1/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+--- qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qjsengine/tst_qjsengine.cpp 2016-05-20 20:56:32.000000000 +0000
++++ qtdeclarative-opensource-src-5.6.1/tests/auto/qml/qjsengine/tst_qjsengine.cpp 2016-10-17 09:19:57.062688737 +0000
+@@ -39,6 +39,7 @@
+ #include <qgraphicsitem.h>
+ #include <qstandarditemmodel.h>
+ #include <QtCore/qnumeric.h>
++#include <QtCore/QSysInfo>
+ #include <qqmlengine.h>
+ #include <qqmlcomponent.h>
+ #include <stdlib.h>
+@@ -3788,6 +3789,10 @@
+ // QTBUG-44039 and QTBUG-43885:
+ void tst_QJSEngine::toFixed()
+ {
++ // Fails on i386 at the moment LP: #1634063
++ if (QSysInfo::buildCpuArchitecture() == "i386") {
++ QSKIP("Skipping test on i386 LP: #1634063");
++ }
+ QJSEngine engine;
+ QJSValue result = engine.evaluate(QStringLiteral("(12.5).toFixed()"));
+ QVERIFY(result.isString());
+diff -urN qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp qtdeclarative-opensource-src-5.6.1/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp
+--- qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp 2016-05-20 20:56:32.000000000 +0000
++++ qtdeclarative-opensource-src-5.6.1/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp 2016-10-17 09:47:11.766889527 +0000
+@@ -41,6 +41,7 @@
+ #include <QDesktopServices>
+ #include <QDir>
+ #include <QCryptographicHash>
++#include <QtCore/QSysInfo>
+ #include <QtQuick/QQuickItem>
+ #include <QSignalSpy>
+ #include <QVector2D>
+@@ -263,6 +264,11 @@
+
+ void tst_qqmlqt::rect()
+ {
++ // Fails on i386 at the moment LP: #1634063
++ if (QSysInfo::buildCpuArchitecture() == "i386") {
++ QSKIP("Skipping test on i386 LP: #1634063");
++ }
++
+ QQmlComponent component(&engine, testFileUrl("rect.qml"));
+
+ QString warning1 = component.url().toString() + ":6: Error: Qt.rect(): Invalid arguments";
+@@ -284,6 +290,11 @@
+
+ void tst_qqmlqt::point()
+ {
++ // Fails on i386 at the moment LP: #1634063
++ if (QSysInfo::buildCpuArchitecture() == "i386") {
++ QSKIP("Skipping test on i386 LP: #1634063");
++ }
++
+ QQmlComponent component(&engine, testFileUrl("point.qml"));
+
+ QString warning1 = component.url().toString() + ":6: Error: Qt.point(): Invalid arguments";
+@@ -304,6 +315,11 @@
+
+ void tst_qqmlqt::size()
+ {
++ // Fails on i386 at the moment LP: #1634063
++ if (QSysInfo::buildCpuArchitecture() == "i386") {
++ QSKIP("Skipping test on i386 LP: #1634063");
++ }
++
+ QQmlComponent component(&engine, testFileUrl("size.qml"));
+
+ QString warning1 = component.url().toString() + ":7: Error: Qt.size(): Invalid arguments";
+@@ -325,6 +341,11 @@
+
+ void tst_qqmlqt::vector2d()
+ {
++ // Fails on i386 at the moment LP: #1634063
++ if (QSysInfo::buildCpuArchitecture() == "i386") {
++ QSKIP("Skipping test on i386 LP: #1634063");
++ }
++
+ QQmlComponent component(&engine, testFileUrl("vector2.qml"));
+
+ QString warning1 = component.url().toString() + ":6: Error: Qt.vector2d(): Invalid arguments";
+@@ -345,6 +366,11 @@
+
+ void tst_qqmlqt::vector3d()
+ {
++ // Fails on i386 at the moment LP: #1634063
++ if (QSysInfo::buildCpuArchitecture() == "i386") {
++ QSKIP("Skipping test on i386 LP: #1634063");
++ }
++
+ QQmlComponent component(&engine, testFileUrl("vector.qml"));
+
+ QString warning1 = component.url().toString() + ":6: Error: Qt.vector3d(): Invalid arguments";
+@@ -365,6 +391,11 @@
+
+ void tst_qqmlqt::vector4d()
+ {
++ // Fails on i386 at the moment LP: #1634063
++ if (QSysInfo::buildCpuArchitecture() == "i386") {
++ QSKIP("Skipping test on i386 LP: #1634063");
++ }
++
+ QQmlComponent component(&engine, testFileUrl("vector4.qml"));
+
+ QString warning1 = component.url().toString() + ":6: Error: Qt.vector4d(): Invalid arguments";
+@@ -385,6 +416,11 @@
+
+ void tst_qqmlqt::quaternion()
+ {
++ // Fails on i386 at the moment LP: #1634063
++ if (QSysInfo::buildCpuArchitecture() == "i386") {
++ QSKIP("Skipping test on i386 LP: #1634063");
++ }
++
+ QQmlComponent component(&engine, testFileUrl("quaternion.qml"));
+
+ QString warning1 = component.url().toString() + ":6: Error: Qt.quaternion(): Invalid arguments";
diff --git a/debian/rules b/debian/rules
index 40dcf61..74f0486 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@
#export DH_VERBOSE=1
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_SERIES ?= $(shell lsb_release -c -s)
PRIVATE_HEADERS = debian/qtdeclarative5-private-dev/usr/include/$(DEB_HOST_MULTIARCH)/qt5
export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
@@ -68,6 +70,7 @@ override_dh_makeshlibs:
dh_makeshlibs
override_dh_auto_test-arch:
+ifneq ("$(DEB_HOST_ARCH)$(DEB_HOST_SERIES)","ppc64elxenial")
$(MAKE) install -Csrc/imports INSTALL_ROOT=$(CURDIR)/test_root
mkdir -p $(CURDIR)/.local/share/QtProject/tst_qqmlengine
xvfb-run -a \
@@ -75,5 +78,6 @@ override_dh_auto_test-arch:
dh_auto_test --max-parallel=1 -- -k -Ctests/auto \
QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml \
HOME=$(CURDIR) LD_LIBRARY_PATH=$(CURDIR)/lib
+endif
override_dh_auto_test-indep:
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list