ubuntu-system-settings

Merge lp:~saviq/ubuntu-system-settings/no-test-powerpc into lp:ubuntu-system-settings

  1. no-test-powerpc
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Jonas G. Drange
Approved revision: 1676
Merged at revision: 1681
Proposed branch: lp:~saviq/ubuntu-system-settings/no-test-powerpc
Merge into: lp:ubuntu-system-settings
Diff against target: 36 lines (+5/-8)
1 file modified
debian/rules (+5/-8)
To merge this branch: bzr merge lp:~saviq/ubuntu-system-settings/no-test-powerpc
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Jonas G. Drange (community) Approve
Michael Terry (community) Needs Fixing
Review via email: mp+301271@code.launchpad.net

Commit message

Skip tests on powerpc due to Qt 5.6 bug (LP: #1606927)

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

I *hate* skipping tests. But at least here it's a net-zero change. And swapping in an arch I care more about too.

LGTM

review: Approve
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1674
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/57/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1047/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1047
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/944
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/944
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/944
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/935/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/935/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/935/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/935/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/935/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/935/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/935/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/935/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/935/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/57/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Terry (mterry) wrote :

Uh, are those CI failures relevant?

Revision history for this message
Michael Terry (mterry) wrote :

From IRC, in case you missed:

Saviq, there are two override_dh_auto_test stanzas in debian/rules...
Saviq, that's why an empty one does something -- the first is taken in that case I bet

I think we just need to get rid of second stanza altogether and make first look like:

override_dh_auto_test:
ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
 mkdir -p $(BUILDHOME)
 HOME=$(BUILDHOME) dh_auto_test
endif

review: Needs Fixing
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1675
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/58/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1058/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1058
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/955
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/955
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/955
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/946/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/946/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/946/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/946/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/946/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/946/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/946/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/946/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/946/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/58/rebuild

review: Needs Fixing (continuous-integration)
lp:~saviq/ubuntu-system-settings/no-test-powerpc updated
1676. By Michał Sawicz

Merge trunk

Revision history for this message
Michał Sawicz (saviq) wrote :

W dniu 28.07.2016 o 02:20, Michael Terry pisze:
> Saviq, there are two override_dh_auto_test stanzas in debian/rules...
> Saviq, that's why an empty one does something -- the first is taken in that case I bet

Gah gah gah, this landed between when I started looking at it and when
it started building in the silo - was a bad merge <facepalm/>.

Fixeded.

Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

Great, thanks!

review: Approve
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1676
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/59/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1061
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/213
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1061
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/958
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/958
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/958
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/949
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/949/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/949
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/949/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/949
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/949/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/949
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/949/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/949
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/949/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/949
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/949/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/949
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/949/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/949
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/949/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/949
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/949/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/59/rebuild

review: Needs Fixing (continuous-integration)

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-07-22 14:37:36 +0000
3+++ debian/rules 2016-07-28 08:50:30 +0000
4@@ -5,9 +5,9 @@
5 export DH_VERBOSE=1
6
7 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
8-# Skip tests on the archs they are known to be flaky with current configuration
9-# Ref.: https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/1585942
10-testskip_architectures := arm64
11+# Skip tests on the archs they are known to be broken with current configuration
12+# Ref.: https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1606927
13+testskip_architectures := powerpc
14
15 include /usr/share/dpkg/buildflags.mk
16 include /usr/share/dpkg/architecture.mk
17@@ -28,8 +28,10 @@
18 rm -rf $(BUILDHOME)
19
20 override_dh_auto_test:
21+ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
22 mkdir -p $(BUILDHOME)
23 HOME=$(BUILDHOME) dh_auto_test
24+endif
25
26 override_dh_install:
27 cd tests/autopilot; \
28@@ -44,8 +46,3 @@
29
30 %:
31 dh $@ --fail-missing --with python3,migrations
32-
33-override_dh_auto_test:
34-ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
35- dh_auto_test
36-endif

Subscribers

People subscribed via source and target branches