Mir

Merge lp:~alan-griffiths/mir/fix-1290345-part1 into lp:mir

  1. fix-1290345-part1
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Approved by: Cemil Azizoglu
Approved revision: no longer in the source branch.
Merged at revision: 3318
Proposed branch: lp:~alan-griffiths/mir/fix-1290345-part1
Merge into: lp:mir
Diff against target: 16 lines (+0/-7)
1 file modified
src/platform/options/default_configuration.cpp (+0/-7)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1290345-part1
Reviewer Review Type Date Requested Status
Cemil Azizoglu (community) Approve
Kevin DuBois (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Mir CI Bot continuous-integration Needs Fixing
Review via email: mp+286179@code.launchpad.net

Commit message

platform: Don't set MIR_SERVER_HOST_SOCKET from MIR_SOCKET - it is confusing at best

Description of the change

platform: Don't set MIR_SERVER_HOST_SOCKET from MIR_SOCKET - it is confusing at best

Most recent confusion here: lp:~mir-team/mir/more-performance-tests/+merge/285837

I don't think anyone now tries to launch a nested server from a host, so this is probably uncontentious. There's a follow up "part2" that may be more debatable.

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3317
https://mir-jenkins.ubuntu.com/job/mir-ci/309/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build/98/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/104
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/99
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/99
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-advanced/arch=amd64,compiler=gcc,platform=mesa,release=xenial/102
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-advanced/arch=amd64,compiler=gcc,platform=mesa,release=xenial/102/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-advanced/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/102/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-advanced/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/102/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-advanced/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/102
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-advanced/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/102/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-advanced/arch=i386,compiler=gcc,platform=mesa,release=xenial/102
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-advanced/arch=i386,compiler=gcc,platform=mesa,release=xenial/102/artifact/output/*zip*/output.zip

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

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

PASSED: Continuous integration, rev:3317
http://jenkins.qa.ubuntu.com/job/mir-ci/6299/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5933
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4840
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5889
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/445
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/623
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/623/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/623
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/623/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5886
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5886/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8274
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27637
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/441
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/441/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/294
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27651

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

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

lgtm

review: Approve
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

ok

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platform/options/default_configuration.cpp'
2--- src/platform/options/default_configuration.cpp 2016-02-03 17:18:54 +0000
3+++ src/platform/options/default_configuration.cpp 2016-02-16 14:28:21 +0000
4@@ -305,13 +305,6 @@
5 boost::program_options::options_description& desc,
6 mo::ProgramOption& options) const
7 {
8- // If MIR_SERVER_HOST_SOCKET is unset, we want to substitute the value of
9- // MIR_SOCKET. Do this now, because MIR_SOCKET will get overwritten later.
10- auto host_socket = getenv("MIR_SERVER_HOST_SOCKET");
11- auto mir_socket = getenv("MIR_SOCKET");
12- if (!host_socket && mir_socket)
13- setenv("MIR_SERVER_HOST_SOCKET", mir_socket, 1);
14-
15 options.parse_environment(desc, "MIR_SERVER_");
16 }
17

Subscribers

People subscribed via source and target branches