Merge lp:~alan-griffiths/mir/bump-mir-server-ABI into lp:mir
- bump-mir-server-ABI
- Merge into development-branch
Status: | Merged |
---|---|
Merged at revision: | 4223 |
Proposed branch: | lp:~alan-griffiths/mir/bump-mir-server-ABI |
Merge into: | lp:mir |
Diff against target: |
136 lines (+12/-17) 5 files modified
CMakeLists.txt (+2/-2) debian/control (+2/-2) debian/libmirserver45.install (+1/-1) src/server/CMakeLists.txt (+1/-1) src/server/symbols.map (+6/-11) |
To merge this branch: | bzr merge lp:~alan-griffiths/mir/bump-mir-server-ABI |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mir CI Bot | continuous-integration | Needs Fixing | |
Brandon Schaefer (community) | Approve | ||
Review via email: mp+328444@code.launchpad.net |
Commit message
Bump mirserver ABI (as we broke it)
Description of the change
Mir CI Bot (mir-ci-bot) wrote : | # |
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:4219
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Alan Griffiths (alan-griffiths) wrote : | # |
FAILURE: https:/
...
FAILURE: https:/
Hmm, did artful just switch toolchain?
13:38:01 11: ==10353== Use of uninitialised value of size 8
13:38:01 11: ==10353== at 0x50DED94: std::_Hashtable
13:38:01 11: ==10353== by 0x50DDFBF: std::_Hashtable
13:38:01 11: ==10353== by 0x50DDD77: std::pair<
13:38:01 11: ==10353== by 0x50DD1DA: std::pair<
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:4220
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:4221
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Alan Griffiths (alan-griffiths) wrote : | # |
Hmm there's also this:
07:14:49 21: [ RUN ] PersistentSurfa
07:14:49 21: ==15654== Use of uninitialised value of size 8
07:14:49 21: ==15654== at 0x6E16C01: _itoa_word (_itoa.c:180)
07:14:49 21: ==15654== by 0x6E1B412: vfprintf (vfprintf.c:1636)
07:14:49 21: ==15654== by 0x6EE44A3: __vsprintf_chk (vsprintf_chk.c:82)
07:14:49 21: ==15654== by 0x6EE43FC: __sprintf_chk (sprintf_chk.c:31)
07:14:49 21: ==15654== by 0x6102632: ??? (in /lib/x86_
07:14:49 21: ==15654== by 0x2E528C0: mir::shell:
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:4222
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
ABORTED: https:/
ABORTED: https:/
FAILURE: https:/
ABORTED: https:/
ABORTED: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
ABORTED: https:/
Click here to trigger a rebuild:
https:/
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:4223
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
ABORTED: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
ABORTED: https:/
Click here to trigger a rebuild:
https:/
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:4225
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Alan Griffiths (alan-griffiths) wrote : | # |
Reverted all the lp;1708635 related experiments
Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:4219
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Brandon Schaefer (brandontschaefer) wrote : | # |
lgtm
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Alan Griffiths (alan-griffiths) wrote : | # |
Not sure why the merge job reports failure when it clearly merged perfectly.
Preview Diff
1 | === modified file 'CMakeLists.txt' |
2 | --- CMakeLists.txt 2017-05-25 08:58:03 +0000 |
3 | +++ CMakeLists.txt 2017-08-07 08:32:21 +0000 |
4 | @@ -27,8 +27,8 @@ |
5 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) |
6 | set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) |
7 | |
8 | -set(MIR_VERSION_MAJOR 0) |
9 | -set(MIR_VERSION_MINOR 27) |
10 | +set(MIR_VERSION_MAJOR 1) |
11 | +set(MIR_VERSION_MINOR 0) |
12 | set(MIR_VERSION_PATCH 0) |
13 | |
14 | add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR}) |
15 | |
16 | === modified file 'debian/control' |
17 | --- debian/control 2017-05-25 08:58:03 +0000 |
18 | +++ debian/control 2017-08-07 08:32:21 +0000 |
19 | @@ -67,7 +67,7 @@ |
20 | |
21 | #TODO: Packaging infrastructure for better dependency generation, |
22 | # ala pkg-xorg's xviddriver:Provides and ABI detection. |
23 | -Package: libmirserver44 |
24 | +Package: libmirserver45 |
25 | Section: libs |
26 | Architecture: linux-any |
27 | Multi-Arch: same |
28 | @@ -146,7 +146,7 @@ |
29 | Architecture: linux-any |
30 | Multi-Arch: same |
31 | Pre-Depends: ${misc:Pre-Depends} |
32 | -Depends: libmirserver44 (= ${binary:Version}), |
33 | +Depends: libmirserver45 (= ${binary:Version}), |
34 | libmirplatform-dev (= ${binary:Version}), |
35 | libmircommon-dev (= ${binary:Version}), |
36 | libglm-dev, |
37 | |
38 | === renamed file 'debian/libmirserver44.install' => 'debian/libmirserver45.install' |
39 | --- debian/libmirserver44.install 2017-05-08 03:04:26 +0000 |
40 | +++ debian/libmirserver45.install 2017-08-07 08:32:21 +0000 |
41 | @@ -1,1 +1,1 @@ |
42 | -usr/lib/*/libmirserver.so.44 |
43 | +usr/lib/*/libmirserver.so.45 |
44 | |
45 | === modified file 'src/server/CMakeLists.txt' |
46 | --- src/server/CMakeLists.txt 2017-05-08 03:04:26 +0000 |
47 | +++ src/server/CMakeLists.txt 2017-08-07 08:32:21 +0000 |
48 | @@ -132,7 +132,7 @@ |
49 | ${CMAKE_SOURCE_DIR}/include/server/mir DESTINATION "include/mirserver" |
50 | ) |
51 | |
52 | -set(MIRSERVER_ABI 44) # Be sure to increment MIR_VERSION_MINOR at the same time |
53 | +set(MIRSERVER_ABI 45) # Be sure to increment MIR_VERSION_MINOR at the same time |
54 | set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map) |
55 | |
56 | set_target_properties( |
57 | |
58 | === modified file 'src/server/symbols.map' |
59 | --- src/server/symbols.map 2017-05-08 03:04:26 +0000 |
60 | +++ src/server/symbols.map 2017-08-07 08:32:21 +0000 |
61 | @@ -1,4 +1,4 @@ |
62 | -MIR_SERVER_0.27 { |
63 | +MIR_SERVER_1.0 { |
64 | global: |
65 | extern "C++" { |
66 | # Symbols not yet picked up by script |
67 | @@ -35,9 +35,6 @@ |
68 | mir::frontend::BufferStream::?BufferStream*; |
69 | mir::frontend::BufferStream::BufferStream*; |
70 | mir::frontend::BufferStream::operator*; |
71 | - mir::frontend::ClientBuffers::?ClientBuffers*; |
72 | - mir::frontend::ClientBuffers::ClientBuffers*; |
73 | - mir::frontend::ClientBuffers::operator*; |
74 | mir::frontend::PromptSession::operator*; |
75 | mir::frontend::PromptSession::?PromptSession*; |
76 | mir::frontend::PromptSession::PromptSession*; |
77 | @@ -190,6 +187,7 @@ |
78 | mir::Server::override_the_gl_config*; |
79 | mir::Server::override_the_host_lifecycle_event_listener*; |
80 | mir::Server::override_the_input_dispatcher*; |
81 | + mir::Server::override_the_input_targeter*; |
82 | mir::Server::override_the_logger*; |
83 | mir::Server::override_the_persistent_surface_store*; |
84 | mir::Server::override_the_prompt_session_listener*; |
85 | @@ -427,7 +425,6 @@ |
86 | non-virtual?thunk?to?mir::Executor::?Executor*; |
87 | non-virtual?thunk?to?mir::frontend::BufferSink::?BufferSink*; |
88 | non-virtual?thunk?to?mir::frontend::BufferStream::?BufferStream*; |
89 | - non-virtual?thunk?to?mir::frontend::ClientBuffers::?ClientBuffers*; |
90 | non-virtual?thunk?to?mir::frontend::PromptSession::?PromptSession*; |
91 | non-virtual?thunk?to?mir::frontend::SessionAuthorizer::?SessionAuthorizer*; |
92 | non-virtual?thunk?to?mir::frontend::SessionMediatorObserver::?SessionMediatorObserver*; |
93 | @@ -616,7 +613,6 @@ |
94 | typeinfo?for?mir::Executor; |
95 | typeinfo?for?mir::frontend::BufferSink; |
96 | typeinfo?for?mir::frontend::BufferStream; |
97 | - typeinfo?for?mir::frontend::ClientBuffers; |
98 | typeinfo?for?mir::frontend::PromptSession; |
99 | typeinfo?for?mir::frontend::Session; |
100 | typeinfo?for?mir::frontend::SessionAuthorizer; |
101 | @@ -704,7 +700,6 @@ |
102 | vtable?for?mir::Executor; |
103 | vtable?for?mir::frontend::BufferSink; |
104 | vtable?for?mir::frontend::BufferStream; |
105 | - vtable?for?mir::frontend::ClientBuffers; |
106 | vtable?for?mir::frontend::PromptSession; |
107 | vtable?for?mir::frontend::Session; |
108 | vtable?for?mir::frontend::SessionAuthorizer; |
109 | @@ -825,7 +820,7 @@ |
110 | }; |
111 | |
112 | # these symbols are needed by the "throwback" tests and mir_proving_server but are not intended to be public |
113 | -MIR_SERVER_DETAIL_FOR_TESTING_0.27 { |
114 | +MIR_SERVER_DETAIL_FOR_TESTING_1.0 { |
115 | global: |
116 | extern "C++" { |
117 | mir::DefaultServerConfiguration::clock*; |
118 | @@ -933,10 +928,10 @@ |
119 | |
120 | mir::run_mir*; |
121 | }; |
122 | -} MIR_SERVER_0.27; |
123 | +} MIR_SERVER_1.0; |
124 | |
125 | # these symbols are needed by mir_proving_server but are not intended to be public |
126 | -MIR_SERVER_DETAIL_FOR_PROVING_0.27 { |
127 | +MIR_SERVER_DETAIL_FOR_PROVING_1.0 { |
128 | global: |
129 | extern "C++" { |
130 | mir::renderer::gl::ProgramFamily::add_program*; |
131 | @@ -954,4 +949,4 @@ |
132 | typeinfo?for?mir::renderer::gl::Renderer; |
133 | vtable?for?mir::renderer::gl::Renderer; |
134 | }; |
135 | -} MIR_SERVER_DETAIL_FOR_TESTING_0.27; |
136 | +} MIR_SERVER_DETAIL_FOR_TESTING_1.0; |
FAILED: Continuous integration, rev:4218 /mir-jenkins. ubuntu. com/job/ mir-ci/ 3522/ /mir-jenkins. ubuntu. com/job/ build-mir/ 4820/console /mir-jenkins. ubuntu. com/job/ build-0- fetch/5021 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= artful/ 5010 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial/ 5010 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= zesty/5010 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= artful/ 4857/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= zesty/4857/ console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= artful/ 4857/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial/ 4857/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= zesty/4857/ console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= mesa,release= artful/ 4857/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= mesa,release= zesty/4857/ console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial/ 4857/console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 3522/rebuild
https:/