Mir

Merge lp:~cemil-azizoglu/mir/fix-1517532 into lp:mir

  1. fix-1517532
  2. Merge into development-branch
Proposed by Cemil Azizoglu
Status: Merged
Merged at revision: 3116
Proposed branch: lp:~cemil-azizoglu/mir/fix-1517532
Merge into: lp:mir
Diff against target: 14 lines (+2/-0)
1 file modified
tests/unit-tests/graphics/test_platform_prober.cpp (+2/-0)
To merge this branch: bzr merge lp:~cemil-azizoglu/mir/fix-1517532
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Kevin DuBois (community) Approve
Alan Griffiths Approve
Review via email: mp+277932@code.launchpad.net

Commit message

Fix FTBS with -DMIR_PLATFORM=android

Description of the change

Fix FTBS with -DMIR_PLATFORM=android

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3105
http://jenkins.qa.ubuntu.com/job/mir-ci/5585/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4915
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3821/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4861/console
    None: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/817/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1738/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/815/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4861/console
    None: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/818/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5585/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3106
http://jenkins.qa.ubuntu.com/job/mir-ci/5587/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4920
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3826/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4866
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/822/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1740
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1740/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/820
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/820/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4866
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4866/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7438
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25258
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/823/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5587/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Failure looks like lp:1517781

6: [ RUN ] NestedServer.display_configuration_changes_are_forwarded_to_host
6: [1447911664.690674] mirserver: Starting
6: [1447911664.690755] mirserver: Selected driver: dummy (version 0.18.0)
6: [1447911664.693294] mirserver: Using software cursor
6: [1447911664.693586] mirserver: Mir version 0.18.0
6: [1447911664.706673] mirserver: Starting
6: [1447911664.706753] mirserver: Selected driver: dummy (version 0.18.0)
6: [1447911664.707535] mirserver: Using nested cursor
6: [1447911664.713905] mirserver: Initial display configuration:
6: [1447911664.713919] mirserver: 1.1: VGA 0.0" 0x0mm
6: [1447911664.713923] mirserver: Current mode 640x480 60.00Hz
6: [1447911664.713925] mirserver: Preferred mode 640x480 60.00Hz
6: [1447911664.713927] mirserver: Logical position +0+0
6: [1447911664.713930] mirserver: 1.2: VGA 0.0" 0x0mm
6: [1447911664.713932] mirserver: Current mode 1920x1080 60.00Hz
6: [1447911664.713933] mirserver: Preferred mode 1920x1080 60.00Hz
6: [1447911664.713935] mirserver: Logical position +480+0
6: [1447911664.714569] mirserver: Mir version 0.18.0
6: [1447911664.730551] mirserver: New display configuration:
6: [1447911664.730561] mirserver: 1.1: VGA 0.0" 0x0mm
6: [1447911664.730563] mirserver: Disabled
6: [1447911664.730565] mirserver: 1.2: VGA 0.0" 0x0mm
6: [1447911664.730568] mirserver: Current mode 1920x1080 60.00Hz
6: [1447911664.730570] mirserver: Preferred mode 1920x1080 60.00Hz
6: [1447911664.730571] mirserver: Logical position +480+0
6: [1447911664.739219] mirserver: New display configuration:
6: [1447911664.739230] mirserver: 1.1: VGA 0.0" 0x0mm
6: [1447911664.739233] mirserver: Current mode 640x480 60.00Hz
6: [1447911664.739235] mirserver: Preferred mode 640x480 60.00Hz
6: [1447911664.739236] mirserver: Logical position +0+0
6: [1447911664.739239] mirserver: 1.2: VGA 0.0" 0x0mm
6: [1447911664.739241] mirserver: Current mode 1920x1080 60.00Hz
6: [1447911664.739243] mirserver: Preferred mode 1920x1080 60.00Hz
6: [1447911664.739244] mirserver: Logical position +480+0
6: [1447911664.742782] mirserver: Stopping
6: terminate called after throwing an instance of 'boost::exception_detail::clone_impl<boost::exception_detail::error_info_injector<std::system_error> >'

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2143/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4945
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3851/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4891
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/847/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/696
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/696/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/845
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/845/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4891
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4891/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7457
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25316
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/848/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote :

lgtm

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2155/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4975
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3881
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4921/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/877/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/708
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/708/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/875
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/875/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4921
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4921/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7481/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25370
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/878/console

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/unit-tests/graphics/test_platform_prober.cpp'
2--- tests/unit-tests/graphics/test_platform_prober.cpp 2015-11-10 15:25:52 +0000
3+++ tests/unit-tests/graphics/test_platform_prober.cpp 2015-11-19 05:02:20 +0000
4@@ -103,8 +103,10 @@
5
6 class ServerPlatformProbeMockDRM : public ::testing::Test
7 {
8+#if defined(MIR_BUILD_PLATFORM_MESA_KMS) || defined(MIR_BUILD_PLATFORM_MESA_X11)
9 public:
10 ::testing::NiceMock<mtd::MockDRM> mock_drm;
11+#endif
12 };
13
14 }

Subscribers

People subscribed via source and target branches