Unity

Merge lp:~3v1n0/unity/renable-arm64-tests into lp:unity

  1. renable-arm64-tests
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 4042
Proposed branch: lp:~3v1n0/unity/renable-arm64-tests
Merge into: lp:unity
Diff against target: 25 lines (+0/-9)
1 file modified
debian/rules (+0/-9)
To merge this branch: bzr merge lp:~3v1n0/unity/renable-arm64-tests
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+277040@code.launchpad.net

Commit message

debian/rules: enable unit tests on arm64 again

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:4037
http://jenkins.qa.ubuntu.com/job/unity-ci/1347/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/124/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/123/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/122/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1347/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Azzarone (azzar1) wrote :

+1

Revision history for this message
Andrea Azzarone (azzar1) :
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 2015-10-30 16:13:00 +0000
3+++ debian/rules 2015-11-09 18:13:29 +0000
4@@ -9,10 +9,6 @@
5
6 DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
7
8-# avoid template instance removal (lp:1286284)
9-export DEB_CXXFLAGS_MAINT_STRIP=-O3
10-export DEB_CXXFLAGS_MAINT_APPEND=-O2
11-
12 # http://ccache.samba.org/manual.html#_precompiled_headers
13 CCACHE_SLOPPINESS=time_macros
14
15@@ -28,11 +24,6 @@
16 cmake_gl_options := -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON
17 endif
18
19-# Workaround for bug #1511542
20-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), arm64))
21- cmake_pch_options := -DENABLE_UNIT_TESTS=OFF
22-endif
23-
24 override_dh_auto_configure:
25 dh_auto_configure -- $(cmake_base_options) $(cmake_gl_options) $(cmake_pch_options)
26