Merge lp:~vanvugt/mir/fix-1283951 into lp:mir
Proposed by
Daniel van Vugt
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt |
Approved revision: | no longer in the source branch. |
Merged at revision: | 1436 |
Proposed branch: | lp:~vanvugt/mir/fix-1283951 |
Merge into: | lp:mir |
Diff against target: |
275 lines (+31/-30) 14 files modified
examples/CMakeLists.txt (+0/-1) examples/render_overlays.cpp (+2/-2) include/shared/testdraw/draw_pattern_checkered-inl.h (+3/-3) include/shared/testdraw/graphics_region_factory.h (+3/-3) include/shared/testdraw/patterns.h (+3/-3) src/shared/CMakeLists.txt (+1/-0) src/shared/testdraw/CMakeLists.txt (+2/-0) src/shared/testdraw/android_graphics_region_factory.cpp (+4/-4) src/shared/testdraw/mesa_graphics_region_factory.cpp (+4/-4) src/shared/testdraw/patterns.cpp (+4/-4) tests/CMakeLists.txt (+0/-1) tests/integration-tests/client/test_client_render.cpp (+2/-2) tests/integration-tests/graphics/android/test_buffer_integration.cpp (+2/-2) tests/unit-tests/draw/test_draw_patterns.cpp (+1/-1) |
To merge this branch: | bzr merge lp:~vanvugt/mir/fix-1283951 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Alan Griffiths | Approve | ||
Kevin DuBois (community) | Approve | ||
Alexandros Frantzis | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2014-02-24.
Commit message
Fix FTBFS in examples/ when MIR_ENABLE_
To post a comment you must log in.
Building examples shouldn't depend on tests being enabled. Making this dependency explicit, although an improvement over the current state, is only a band-aid fix. Since a fix is not urgently, I think we should do it the right way and move mirtestdraw functionality to somewhere where both examples and tests can use it independently.