Mir

Merge lp:~alan-griffiths/mir/fix-FTBFS-on-artful-clang into lp:mir

Proposed by Alan Griffiths on 2017-09-14
Status: Merged
Approved by: Alan Griffiths on 2017-09-15
Approved revision: 4251
Merged at revision: 4252
Proposed branch: lp:~alan-griffiths/mir/fix-FTBFS-on-artful-clang
Merge into: lp:mir
Diff against target: 46 lines (+16/-16)
1 file modified
src/miral/set_window_management_policy.cpp (+16/-16)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-FTBFS-on-artful-clang
Reviewer Review Type Date Requested Status
Gerry Boland 2017-09-14 Approve on 2017-09-15
Mir CI Bot continuous-integration Needs Fixing on 2017-09-14
Review via email: mp+330735@code.launchpad.net

Commit message

Workaround for clang crashing on artful

To post a comment you must log in.
4251. By Alan Griffiths on 2017-09-14

Better workaround for clang crash on artful

Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:4251
https://mir-jenkins.ubuntu.com/job/mir-ci/3660/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5009/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5237
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5225
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5225
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5225
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5048
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5048/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5048/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5048
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5048/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5048
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5048/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5048/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5048
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5048/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5048
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5048/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5048
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5048/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3660/rebuild

review: Needs Fixing (continuous-integration)
Gerry Boland (gerboland) wrote :

Weird, but ok

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/miral/set_window_management_policy.cpp'
2--- src/miral/set_window_management_policy.cpp 2017-08-21 14:18:55 +0000
3+++ src/miral/set_window_management_policy.cpp 2017-09-14 10:35:39 +0000
4@@ -32,22 +32,6 @@
5 char const* const trace_option = "window-management-trace";
6 }
7
8-MIRAL_FAKE_OLD_SYMBOL(
9- _ZN5miral24SetWindowManagmentPolicyC1ERKSt8functionIFSt10unique_ptrINS_22WindowManagementPolicyESt14default_deleteIS3_EERKNS_18WindowManagerToolsEEE,
10- _ZN5miral25SetWindowManagementPolicyC1ERKSt8functionIFSt10unique_ptrINS_22WindowManagementPolicyESt14default_deleteIS3_EERKNS_18WindowManagerToolsEEE)
11-
12-MIRAL_FAKE_OLD_SYMBOL(
13- _ZNK5miral24SetWindowManagmentPolicyclERN3mir6ServerE,
14- _ZNK5miral25SetWindowManagementPolicyclERN3mir6ServerE)
15-
16-MIRAL_FAKE_OLD_SYMBOL(
17- _ZN5miral24SetWindowManagmentPolicyD1Ev,
18- _ZN5miral25SetWindowManagementPolicyD1Ev)
19-
20-MIRAL_FAKE_OLD_SYMBOL(
21- _ZN5miral24SetWindowManagmentPolicyD2Ev,
22- _ZN5miral25SetWindowManagementPolicyD2Ev)
23-
24 miral::SetWindowManagementPolicy::SetWindowManagementPolicy(WindowManagementPolicyBuilder const& builder) :
25 builder{builder}
26 {
27@@ -89,3 +73,19 @@
28 builder);
29 });
30 }
31+
32+MIRAL_FAKE_OLD_SYMBOL(
33+ _ZN5miral24SetWindowManagmentPolicyC1ERKSt8functionIFSt10unique_ptrINS_22WindowManagementPolicyESt14default_deleteIS3_EERKNS_18WindowManagerToolsEEE,
34+ _ZN5miral25SetWindowManagementPolicyC1ERKSt8functionIFSt10unique_ptrINS_22WindowManagementPolicyESt14default_deleteIS3_EERKNS_18WindowManagerToolsEEE)
35+
36+MIRAL_FAKE_OLD_SYMBOL(
37+ _ZNK5miral24SetWindowManagmentPolicyclERN3mir6ServerE,
38+ _ZNK5miral25SetWindowManagementPolicyclERN3mir6ServerE)
39+
40+MIRAL_FAKE_OLD_SYMBOL(
41+ _ZN5miral24SetWindowManagmentPolicyD1Ev,
42+ _ZN5miral25SetWindowManagementPolicyD1Ev)
43+
44+MIRAL_FAKE_OLD_SYMBOL(
45+ _ZN5miral24SetWindowManagmentPolicyD2Ev,
46+ _ZN5miral25SetWindowManagementPolicyD2Ev)

Subscribers

People subscribed via source and target branches