Merge lp:~raof/mir/hate-hate-hate-on-the-cmake into lp:mir
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt |
Approved revision: | no longer in the source branch. |
Merged at revision: | 1475 |
Proposed branch: | lp:~raof/mir/hate-hate-hate-on-the-cmake |
Merge into: | lp:mir |
Diff against target: |
46 lines (+22/-1) 3 files modified
cmake/MirCommon.cmake (+9/-1) cmake/src/mir/CMakeLists.txt (+5/-0) cmake/src/mir/fail_on_success.sh (+8/-0) |
To merge this branch: | bzr merge lp:~raof/mir/hate-hate-hate-on-the-cmake |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kevin DuBois (community) | Approve | ||
Alan Griffiths | Approve | ||
Daniel van Vugt | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+210793@code.launchpad.net |
Commit message
Make memcheck-test work with DISABLE_
memcheck-test is a test to check that valgrind fails with an error when run against a program that generates a known-bad memory access. So, for the test to pass, valgrind needs to return 1, which it does, but this normally indicates that a test has *failed*, so we need to invert the test success condition.
We were trying to do this by effectively embedding a shell script into CMakeList.txt, but
CMake's escaping rules make this roughly impossible, or at least mind-bendingly awkward.
Use a real, if trivial, shell script to invert the return value instead.
Description of the change
Make memcheck-test work with DISABLE_
The trick, of course, is to use CMake as little as possible
PASSED: Continuous integration, rev:1473 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- ci/1064/ jenkins. qa.ubuntu. com/job/ mir-android- trusty- i386-build/ 1228 jenkins. qa.ubuntu. com/job/ mir-clang- trusty- amd64-build/ 1226 jenkins. qa.ubuntu. com/job/ mir-mediumtests -trusty- touch/810 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- amd64-ci/ 796 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- amd64-ci/ 796/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- armhf-ci/ 801 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- armhf-ci/ 801/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- trusty- armhf/811 jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- trusty- armhf/811/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -runner- mako/755 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 4749
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- team-mir- development- branch- ci/1064/ rebuild
http://