Merge lp:~saviq/ubuntu-system-settings/no-test-powerpc into lp:ubuntu-system-settings
| Status: | Merged |
|---|---|
| Approved by: | Jonas G. Drange on 2016-07-28 |
| 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 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| system-apps-ci-bot | continuous-integration | Needs Fixing on 2016-07-29 | |
| Jonas G. Drange (community) | Approve on 2016-07-28 | ||
| Michael Terry (community) | 2016-07-27 | Needs Fixing on 2016-07-28 | |
|
Review via email:
|
|||
Commit Message
Skip tests on powerpc due to Qt 5.6 bug (LP: #1606927)
FAILED: Continuous integration, rev:1674
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
| Michael Terry (mterry) wrote : | # |
Uh, are those CI failures relevant?
| Michael Terry (mterry) wrote : | # |
From IRC, in case you missed:
Saviq, there are two override_
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_
ifneq ($(DEB_
mkdir -p $(BUILDHOME)
HOME=$(BUILDHOME) dh_auto_test
endif
FAILED: Continuous integration, rev:1675
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 1676. By Michał Sawicz on 2016-07-28
-
Merge trunk
| Michał Sawicz (saviq) wrote : | # |
W dniu 28.07.2016 o 02:20, Michael Terry pisze:
> Saviq, there are two override_
> 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.
FAILED: Continuous integration, rev:1676
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
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