Mir

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

  1. fix-1642504
  2. Merge into development-branch
Proposed by Daniel van Vugt on 2016-11-21
Status: Merged
Approved by: Chris Halse Rogers on 2016-11-23
Approved revision: 3836
Merged at revision: 3841
Proposed branch: lp:~vanvugt/mir/fix-1642504
Merge into: lp:mir
Diff against target: 33 lines (+15/-6)
1 file modified
playground/server_configuration.cpp (+15/-6)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1642504
Reviewer Review Type Date Requested Status
Chris Halse Rogers 2016-11-21 Approve on 2016-11-23
Mir CI Bot continuous-integration Approve on 2016-11-21
Review via email: mp+311363@code.launchpad.net

Commit Message

mir_proving_server: Add custom command line options before the base
configuration is constructed. Starting recently in r3823, Mir no longer
allows options to be added afterwards. (LP: #1642504)

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

FAILED: Continuous integration, rev:3834
https://mir-jenkins.ubuntu.com/job/mir-ci/2224/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/2881/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2946
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2938
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2938
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2938
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2910/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2910
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2910/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2910/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2910/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2910
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2910/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2910
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2910/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Daniel van Vugt (vanvugt) wrote :

^^^
Jenkins Java failures, plus our old friend; bug 1523621

lp:~vanvugt/mir/fix-1642504 updated on 2016-11-21
3835. By Daniel van Vugt on 2016-11-21

Try again

Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3835
https://mir-jenkins.ubuntu.com/job/mir-ci/2226/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/2883/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2948
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2940
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2940
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2940
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2912
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2912/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2912/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2912
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2912/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/2912
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2912/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/2912
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2912/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2912
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2912/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Daniel van Vugt (vanvugt) wrote :
lp:~vanvugt/mir/fix-1642504 updated on 2016-11-21
3836. By Daniel van Vugt on 2016-11-21

And again

Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:3836
https://mir-jenkins.ubuntu.com/job/mir-ci/2227/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2884
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2949
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2941
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2941
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2941
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2913
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2913/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2913
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2913/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2913
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2913/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/2913
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2913/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/2913
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2913/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2913
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2913/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Chris Halse Rogers (raof) wrote :

Yup, looks sensible.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'playground/server_configuration.cpp'
2--- playground/server_configuration.cpp 2016-07-18 07:38:38 +0000
3+++ playground/server_configuration.cpp 2016-11-21 06:19:36 +0000
4@@ -28,14 +28,23 @@
5 namespace me = mir::examples;
6 namespace mg = mir::graphics;
7
8+namespace
9+{
10+std::shared_ptr<mir::options::DefaultConfiguration> const& customize(
11+ std::shared_ptr<mir::options::DefaultConfiguration> const& opt)
12+{
13+ opt->add_options()(me::display_config_opt,
14+ boost::program_options::value<std::string>()->
15+ default_value(me::clone_opt_val),
16+ me::display_config_descr);
17+
18+ return opt;
19+}
20+}
21+
22 me::ServerConfiguration::ServerConfiguration(std::shared_ptr<options::DefaultConfiguration> const& configuration_options) :
23- DefaultServerConfiguration(configuration_options)
24+ DefaultServerConfiguration(customize(configuration_options))
25 {
26- namespace po = boost::program_options;
27-
28- configuration_options->add_options()
29- (me::display_config_opt, po::value<std::string>()->default_value(me::clone_opt_val),
30- me::display_config_descr);
31 }
32
33 me::ServerConfiguration::ServerConfiguration(int argc, char const** argv) :

Subscribers

People subscribed via source and target branches