Merge lp:~bregma/mir/lp-1195265 into lp:~mir-team/mir/trunk
Proposed by
Stephen M. Webb
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Stephen M. Webb | ||||||||
Approved revision: | no longer in the source branch. | ||||||||
Merged at revision: | 854 | ||||||||
Proposed branch: | lp:~bregma/mir/lp-1195265 | ||||||||
Merge into: | lp:~mir-team/mir/trunk | ||||||||
Diff against target: |
136 lines (+22/-12) 4 files modified
cmake/MirCommon.cmake (+2/-1) debian/control (+9/-9) debian/rules (+8/-1) tests/integration-tests/CMakeLists.txt (+3/-1) |
||||||||
To merge this branch: | bzr merge lp:~bregma/mir/lp-1195265 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Didier Roche-Tolomelli | Needs Fixing | ||
Kevin DuBois (community) | Approve | ||
Alan Griffiths | Needs Information | ||
Review via email:
|
Commit message
disable running the integration test suite on arm architecture during the packaging builds (lp: #1195265)
Description of the change
(1) lets packaging builds complete even if valgrind is not installed
(2) disables the running of the integration test suite on arm architecture during the packaging builds because they hang and the results are meaningless (lp: #1195265)
With this change I can get a successful package build on at least my arm hardware.
To post a comment you must log in.
FAILED: Continuous integration, rev:806 jenkins. qa.ubuntu. com/job/ mir-ci/ 1000/ jenkins. qa.ubuntu. com/job/ mir-android- saucy-i386- build/1299/ console jenkins. qa.ubuntu. com/job/ mir-clang- saucy-amd64- build/1184 jenkins. qa.ubuntu. com/job/ mir-saucy- amd64-ci/ 238 jenkins. qa.ubuntu. com/job/ mir-saucy- amd64-ci/ 238/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-vm- ci-build/ ./distribution= quantal, flavor= amd64/636
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ mir-ci/ 1000/rebuild
http://