Mir

Merge lp:~vanvugt/mir/fix-1292384 into lp:mir

  1. fix-1292384
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Approved by: Alexandros Frantzis
Approved revision: no longer in the source branch.
Merged at revision: 1478
Proposed branch: lp:~vanvugt/mir/fix-1292384
Merge into: lp:mir
Diff against target: 21 lines (+2/-2)
1 file modified
src/platform/graphics/mesa/display_helpers.cpp (+2/-2)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1292384
Reviewer Review Type Date Requested Status
Alexandros Frantzis (community) Approve
Alan Griffiths Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+210975@code.launchpad.net

Commit message

Pass a useful (positive) errno to boost so it can produce useful error
messages (LP: #1292384)

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

PASSED: Continuous integration, rev:1474
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1068/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1233
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/815
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/800
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/800/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/805
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/805/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/816
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/816/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/759
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4764

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/1068/rebuild

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

Unfortunately error can also be set from drmSetInterfaceVersion() - and that does need the "-"

review: Needs Fixing
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Well I've only ever seen it throw with a negative error, but can support both.

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

PASSED: Continuous integration, rev:1476
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1076/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/825
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/808
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/808/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/813
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/813/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/826
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/826/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/769
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4821

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/1076/rebuild

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

LGTM

review: Approve
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platform/graphics/mesa/display_helpers.cpp'
2--- src/platform/graphics/mesa/display_helpers.cpp 2014-03-12 02:46:58 +0000
3+++ src/platform/graphics/mesa/display_helpers.cpp 2014-03-17 02:10:47 +0000
4@@ -219,7 +219,7 @@
5 sv.drm_dd_major = -1; /* Don't care */
6 sv.drm_dd_minor = -1; /* Don't care */
7
8- if ((error = drmSetInterfaceVersion(tmp_fd, &sv)))
9+ if ((error = -drmSetInterfaceVersion(tmp_fd, &sv)))
10 {
11 close(tmp_fd);
12 tmp_fd = -1;
13@@ -238,7 +238,7 @@
14 {
15 BOOST_THROW_EXCEPTION(
16 boost::enable_error_info(
17- std::runtime_error("Error opening DRM device")) << boost::errinfo_errno(-error));
18+ std::runtime_error("Error opening DRM device")) << boost::errinfo_errno(error));
19 }
20
21 return tmp_fd;

Subscribers

People subscribed via source and target branches