Mir

Merge lp:~andreas-pokorny/mir/fix-1439078 into lp:mir

  1. fix-1439078
  2. Merge into development-branch
Proposed by Andreas Pokorny
Status: Merged
Approved by: Chris Halse Rogers
Approved revision: no longer in the source branch.
Merged at revision: 2810
Proposed branch: lp:~andreas-pokorny/mir/fix-1439078
Merge into: lp:mir
Diff against target: 13 lines (+0/-3)
1 file modified
src/wrapper.c (+0/-3)
To merge this branch: bzr merge lp:~andreas-pokorny/mir/fix-1439078
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Daniel van Vugt Approve
Chris Halse Rogers Approve
Kevin DuBois (community) Approve
Alan Griffiths Approve
Review via email: mp+266852@code.launchpad.net

Commit message

remove input-stub.so from the environment configured by wrapper

There is no longer a need to set the input-stub.so library here. The tests that need it have been switched to use mirs temporary environment variable utility class.
(LP: #1439078)

Description of the change

This removes input-stub.so from wrapper.c. The tests that require the stub input platform already ensure that it gets loaded.

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

FAILED: Continuous integration, rev:2803
http://jenkins.qa.ubuntu.com/job/mir-ci/4469/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3396
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/251
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/923
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3344
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/618/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3344
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3344/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6133
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22309

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

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

LGTM (CI failure addressed elsewhere)

review: Approve
Revision history for this message
Kevin DuBois (kdub) :
review: Approve
Revision history for this message
Chris Halse Rogers (raof) wrote :

LGTM

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

Works for me

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/wrapper.c'
2--- src/wrapper.c 2015-06-17 05:20:42 +0000
3+++ src/wrapper.c 2015-08-04 10:39:52 +0000
4@@ -63,9 +63,6 @@
5 strncpy(pivot+7, "server-modules/", pivot_max-7);
6 setenv("MIR_SERVER_PLATFORM_PATH", path, 1);
7 printf("MIR_SERVER_PLATFORM_PATH=%s\n", path);
8- strncpy(pivot+7, "server-modules/input-stub.so", pivot_max-7);
9- setenv("MIR_SERVER_PLATFORM_INPUT_LIB", path, 1);
10- printf("MIR_SERVER_PLATFORM_INPUT_LIB=%s\n", path);
11
12 pivot[6] = '\0'; /* truncate lib/client-modules to just lib */
13 appendenv("LD_LIBRARY_PATH", path);

Subscribers

People subscribed via source and target branches