Merge lp:~thomas-voss/unity/new-gmock into lp:unity
Proposed by
Thomas Voß
Status: | Merged |
---|---|
Approved by: | Didier Roche-Tolomelli |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3419 |
Proposed branch: | lp:~thomas-voss/unity/new-gmock |
Merge into: | lp:unity |
Diff against target: |
158 lines (+46/-23) 4 files modified
CMakeLists.txt (+31/-9) debian/control (+1/-1) tests/CMakeLists.txt (+7/-11) tests/test-gestures/CMakeLists.txt (+7/-2) |
To merge this branch: | bzr merge lp:~thomas-voss/unity/new-gmock |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Didier Roche-Tolomelli | Approve | ||
Review via email: mp+173450@code.launchpad.net |
Commit message
Adjust CMake setup to account for new GMock version.
Description of the change
Adjust CMake setup to account for new GMock version.
To post a comment you must log in.
FAILED: Continuous integration, rev:3408 jenkins. qa.ubuntu. com/job/ unity-ci/ 191/ jenkins. qa.ubuntu. com/job/ unity-saucy- amd64-ci/ 79/console jenkins. qa.ubuntu. com/job/ unity-saucy- armhf-ci/ 79/console jenkins. qa.ubuntu. com/job/ unity-saucy- i386-ci/ 79/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ unity-ci/ 191/rebuild
http://