Merge lp://staging/~albaguirre/mir/workaround-for-1482274 into lp://staging/mir
| Status: | Merged |
|---|---|
| Approved by: | Alberto Aguirre |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 2820 |
| Proposed branch: | lp://staging/~albaguirre/mir/workaround-for-1482274 |
| Merge into: | lp://staging/mir |
| Diff against target: |
12 lines (+1/-1) 1 file modified
tests/unit-tests/test_glib_main_loop.cpp (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~albaguirre/mir/workaround-for-1482274 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Kevin DuBois (community) | Approve | ||
| Alan Griffiths | Approve | ||
|
Review via email:
|
|||
Commit message
Workaround for GLibMainLoopTes
The test fails with GCC5 when using -O2 options in armhf which seems to be caused by using identical lambda definitions.
As a workaround the exception message is changed to force the compiler to generate a unique implementation instead of sharing one;this allows the exception to be caught as expected.
Description of the change
Workaround for GLibMainLoopTes
The test fails with GCC5 when using -O2 options in armhf which seems to be caused by using identical lambda definitions.
As a workaround the exception message is changed to force the compiler to generate a unique implementation instead of sharing one;this allows the exception to be caught as expected.
| PS Jenkins bot (ps-jenkins) wrote | # |
WTF?!