Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/enable_arm64_unittests into lp:ubuntu-ui-toolkit/staging

Proposed by Timo Jyrinki on 2016-04-18
Status: Merged
Approved by: Timo Jyrinki on 2016-09-28
Approved revision: 1952
Merged at revision: 2133
Proposed branch: lp:~timo-jyrinki/ubuntu-ui-toolkit/enable_arm64_unittests
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 51 lines (+8/-1)
2 files modified
debian/rules (+3/-1)
tests/unit/swipearea/tst_swipearea.cpp (+5/-0)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-ui-toolkit/enable_arm64_unittests
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve on 2016-09-28
Zsombor Egri Approve on 2016-09-28
Timo Jyrinki (community) Needs Information on 2016-05-10
Christian Dywan (community) 2016-04-18 Needs Information on 2016-05-04
Review via email: mp+292144@code.launchpad.net

Commit message

Enable arm64 unit tests on xenial and newer.

To post a comment you must log in.
Christian Dywan (kalikiana) wrote :

Where do I see if they pass? We probably need a Jenkins arm64 configuration first?

review: Needs Information
Timo Jyrinki (timo-jyrinki) wrote :

We don't have arm64 hardware to run on at the moment. However at the same time we should be enabling arm64 support...

We can (manually) do builds in PPAs though.

Timo Jyrinki (timo-jyrinki) wrote :

I tested it now, this MP needs to be on hold until bug #1580172 is fixed.

review: Needs Information
Timo Jyrinki (timo-jyrinki) wrote :

With xenial and yakkety and Qt 5.6 being enabled, this should be next.

Timo Jyrinki (timo-jyrinki) wrote :

Just one thing still: xenial and vivid tests running still.

Timo Jyrinki (timo-jyrinki) wrote :

(vivid arm64)

Timo Jyrinki (timo-jyrinki) wrote :

(that is, skipping vivid arm64 successfully works while all other enabled still including xenial and yakkety arm64)

Zsombor Egri (zsombi) wrote :

Looks good to me, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2016-09-22 15:21:37 +0000
3+++ debian/rules 2016-09-28 07:56:34 +0000
4@@ -12,7 +12,7 @@
5 DEB_HOST_SERIES ?= $(shell lsb_release -c -s)
6
7 # Skip tests on the archs they are known to be flaky with current configuration
8-testskip_architectures := powerpc arm64 ppc64el s390x
9+testskip_architectures := powerpc ppc64el s390x
10 testskip_series :=
11
12 override_dh_auto_configure:
13@@ -27,6 +27,7 @@
14 echo $(testskip_series)
15 ifneq ($(DEB_HOST_SERIES),$(findstring $(DEB_HOST_SERIES), $(testskip_series)))
16 ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
17+ifneq ("$(DEB_HOST_ARCH)$(DEB_HOST_SERIES)","arm64vivid")
18 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
19 mkdir -p debian/tmp/home/run
20 chmod +x tests/xvfb.sh
21@@ -34,6 +35,7 @@
22 endif
23 endif
24 endif
25+endif
26
27 override_dh_build:
28 dh_auto_build --parallel
29
30=== modified file 'tests/unit/swipearea/tst_swipearea.cpp'
31--- tests/unit/swipearea/tst_swipearea.cpp 2016-09-09 17:49:07 +0000
32+++ tests/unit/swipearea/tst_swipearea.cpp 2016-09-28 07:56:34 +0000
33@@ -16,6 +16,7 @@
34
35 #include <QtCore/QObject>
36 #include <QtCore/QPointer>
37+#include <QtCore/QSysInfo>
38 #include <QtQuick/QQuickView>
39 #include <QtQuick/private/qquickmousearea_p.h>
40 #include <QtQuick/private/qquickwindow_p.h>
41@@ -770,6 +771,10 @@
42
43 void tst_UCSwipeArea::givesUpWhenLosesTouch()
44 {
45+ // Fails on arm64 at the moment LP: #1628066
46+ if (QSysInfo::buildCpuArchitecture() == "arm64") {
47+ QSKIP("Skipping test on arm64");
48+ }
49 UCSwipeArea *edgeDragArea =
50 m_view->rootObject()->findChild<UCSwipeArea*>("hpDragArea");
51 Q_ASSERT(edgeDragArea != 0);

Subscribers

People subscribed via source and target branches