Merge into development-branch : remove-server-platform-egl-native-display : Code : Mir

Status:	Merged
Merged at revision:	3587
Proposed branch:	lp://qastaging/~afrantzis/mir/remove-server-platform-egl-native-display
Merge into:	lp://qastaging/mir
Diff against target:	415 lines (+15/-101) 26 files modified debian/control (+6/-6) debian/mir-platform-graphics-android10.install (+1/-1) debian/mir-platform-graphics-mesa-kms10.install (+1/-1) debian/mir-platform-graphics-mesa-x10.install (+1/-1) include/platform/mir/graphics/platform.h (+0/-3) include/test/mir/test/doubles/null_platform.h (+0/-5) src/platforms/CMakeLists.txt (+2/-2) src/platforms/android/server/platform.cpp (+0/-5) src/platforms/android/server/platform.h (+0/-1) src/platforms/eglstream-kms/server/platform.cpp (+0/-5) src/platforms/eglstream-kms/server/platform.h (+0/-2) src/platforms/mesa/server/kms/guest_platform.cpp (+0/-5) src/platforms/mesa/server/kms/guest_platform.h (+0/-1) src/platforms/mesa/server/kms/platform.cpp (+0/-5) src/platforms/mesa/server/kms/platform.h (+0/-2) src/platforms/mesa/server/kms/symbols.map.in (+0/-6) src/platforms/mesa/server/x11/graphics/guest_platform.cpp (+0/-5) src/platforms/mesa/server/x11/graphics/guest_platform.h (+0/-1) src/platforms/mesa/server/x11/graphics/platform.cpp (+0/-5) src/platforms/mesa/server/x11/graphics/platform.h (+0/-1) tests/acceptance-tests/test_server_shutdown.cpp (+1/-2) tests/integration-tests/graphics/mesa/test_buffer_integration.cpp (+2/-0) tests/mir_test_framework/platform_graphics_throw.cpp (+1/-12) tests/mir_test_framework/stubbed_graphics_platform.cpp (+0/-5) tests/unit-tests/graphics/android/test_platform.cpp (+0/-13) tests/unit-tests/graphics/mesa/kms/test_platform.cpp (+0/-6)
To merge this branch:	bzr merge lp://qastaging/~afrantzis/mir/remove-server-platform-egl-native-display
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Needs Fixing on 2016-07-12
Chris Halse Rogers			Approve on 2016-07-12
Cemil Azizoglu (community)			Approve on 2016-07-11
Alan Griffiths		2016-07-08	Approve on 2016-07-08
Review via email: mp+299510@code.qastaging.launchpad.net

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-07-08:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2016-07-08:

#

CI failure is https://bugs.launchpad.net/mir/+bug/1570698 . Retrying build.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-07-08:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-07-08:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-07-08:

#

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

PASSED: Continuous integration, rev:3583
https://mir-jenkins.ubuntu.com/job/mir-ci/1257/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1466
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1518
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1509
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1509
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1480
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1480/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1480
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1480/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1480
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1480/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1480
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1480/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1480
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1480/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-07-08:

#

OK

review: Approve

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2016-07-11:

#

good

review: Approve

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-07-11:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Chris Halse Rogers (raof) wrote on 2016-07-12:

#

Nice.

review: Approve

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-07-12:

#

https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1485/consoleFull

02:59:32 [ 87%] Linking CXX executable ../../../../../bin/mir_unit_tests_mesa-x11.bin
02:59:32 cd /��BUILDDIR��/mir-0.24.0+xenial1513bzr3583/obj-x86_64-linux-gnu/tests/unit-tests/graphics/mesa/x11 && /usr/bin/cmake -E cmake_link_script CMakeFiles/mir_unit_tests_mesa-x11.dir/link.txt --verbose=1
02:59:32 ../../../../../../include/test/mir/test/doubles/mock_egl.h:89:7: error: type 'struct MockEGL' violates one definition rule [-Werror=odr]
02:59:32 class MockEGL
02:59:32 ^
02:59:32 ../../../../../../include/test/mir/test/doubles/mock_egl.h:89:7: note: a different type is defined in another translation unit
02:59:32 class MockEGL
02:59:32 ^
02:59:32 ../../../../../../include/test/mir/test/doubles/mock_egl.h:106:6: note: the first difference of corresponding definitions is field 'gmock1_eglGetDisplay_106'
02:59:32 MOCK_METHOD1(eglGetDisplay, EGLDisplay(NativeDisplayType));
02:59:32 ^
02:59:32 ../../../../../../include/test/mir/test/doubles/mock_egl.h:106:6: note: a field of same name but different type is defined in another translation unit
02:59:32 MOCK_METHOD1(eglGetDisplay, EGLDisplay(NativeDisplayType));
02:59:32 ^
02:59:32 /usr/include/gmock/gmock-generated-function-mockers.h:81:7: note: type name 'testing::internal::FunctionMocker<void* (void*)>' should match type name 'testing::internal::FunctionMocker<void* (gbm_device*)>'
02:59:32 class FunctionMocker<R(A1)> : public
02:59:32 ^
02:59:32 /usr/include/gmock/gmock-generated-function-mockers.h:81:7: note: the incompatible type is defined here
02:59:32 class FunctionMocker<R(A1)> : public
02:59:32 ^
02:59:32 /usr/include/gmock/gmock-generated-nice-strict.h:80:7: error: type 'struct NiceMock' violates one definition rule [-Werror=odr]
02:59:32 class NiceMock : public MockClass {
02:59:32 ^
02:59:32 /usr/include/gmock/gmock-generated-nice-strict.h:80:7: note: a type with different bases is defined in another translation unit
02:59:32 class NiceMock : public MockClass {
02:59:32 ^
02:59:32 lto1: all warnings being treated as errors
02:59:32 lto-wrapper: fatal error: /usr/bin/x86_64-linux-gnu-g++ returned 1 exit status
02:59:32 compilation terminated.
02:59:32 /usr/bin/ld.gold: fatal error: lto-wrapper failed

It looks like different translation units have different definitions of NativeDisplayType when compiling MockEGL. I'm not sure which translation units are involved, so it isn't clear whether this failure is introduced by:

-#include <EGL/egl.h>

Although I doubt it. I suspect the failure is unrelated and only now detected because of a toolchain update.

https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1485/consoleFull

02:59:32 [ 87%] Linking CXX executable ../../../../../bin/mir_unit_tests_mesa-x11.bin
02:59:32 cd /��BUILDDIR��/mir-0.24.0+xenial1513bzr3583/obj-x86_64-linux-gnu/tests/unit-tests/graphics/mesa/x11 && /usr/bin/cmake -E cmake_link_script CMakeFiles/mir_unit_tests_mesa-x11.dir/link.txt --verbose=1
02:59:32 ../../../../../../include/test/mir/test/doubles/mock_egl.h:89:7: error: type 'struct MockEGL' violates one definition rule [-Werror=odr]
02:59:32  class MockEGL
02:59:32        ^
02:59:32 ../../../../../../include/test/mir/test/doubles/mock_egl.h:89:7: note: a different type is defined in another translation unit
02:59:32  class MockEGL
02:59:32        ^
02:59:32 ../../../../../../include/test/mir/test/doubles/mock_egl.h:106:6: note: the first difference of corresponding definitions is field 'gmock1_eglGetDisplay_106'
02:59:32      MOCK_METHOD1(eglGetDisplay, EGLDisplay(NativeDisplayType));
02:59:32       ^
02:59:32 ../../../../../../include/test/mir/test/doubles/mock_egl.h:106:6: note: a field of same name but different type is defined in another translation unit
02:59:32      MOCK_METHOD1(eglGetDisplay, EGLDisplay(NativeDisplayType));
02:59:32       ^
02:59:32 /usr/include/gmock/gmock-generated-function-mockers.h:81:7: note: type name 'testing::internal::FunctionMocker<void* (void*)>' should match type name 'testing::internal::FunctionMocker<void* (gbm_device*)>'
02:59:32  class FunctionMocker<R(A1)> : public
02:59:32        ^
02:59:32 /usr/include/gmock/gmock-generated-function-mockers.h:81:7: note: the incompatible type is defined here
02:59:32  class FunctionMocker<R(A1)> : public
02:59:32        ^
02:59:32 /usr/include/gmock/gmock-generated-nice-strict.h:80:7: error: type 'struct NiceMock' violates one definition rule [-Werror=odr]
02:59:32  class NiceMock : public MockClass {
02:59:32        ^
02:59:32 /usr/include/gmock/gmock-generated-nice-strict.h:80:7: note: a type with different bases is defined in another translation unit
02:59:32  class NiceMock : public MockClass {
02:59:32        ^
02:59:32 lto1: all warnings being treated as errors
02:59:32 lto-wrapper: fatal error: /usr/bin/x86_64-linux-gnu-g++ returned 1 exit status
02:59:32 compilation terminated.
02:59:32 /usr/bin/ld.gold: fatal error: lto-wrapper failed

It looks like different translation units have different definitions of NativeDisplayType when compiling MockEGL. I'm not sure which translation units are involved, so it isn't clear whether this failure is introduced by:

-#include <EGL/egl.h>

Although I doubt it. I suspect the failure is unrelated and only now detected because of a toolchain update.

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-07-12:

#

Hmm. Didn't see this error on another MP. Re-approving to get another data point.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-07-12:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-07-12:

#

Good. The ODR issue is gone and we "only" have lp:1602199.

Mir

Merge lp://qastaging/~afrantzis/mir/remove-server-platform-egl-native-display into lp://qastaging/mir

Commit message

Description of the change

Preview Diff

Subscribers