Merge lp:~albaguirre/mir/allow-null-cmd-line into lp:mir

[Alberto Aguirre]

Allow empty cmd line in mir::options::DefaultConfiguration

Allow empty cmd line in mir::options::DefaultConfiguration

Qtmir's test suite allocates a DefaultConfiguration object with an empty command line.

This change comes from mir 0.14

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2799
http://jenkins.qa.ubuntu.com/job/mir-ci/4448/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3363
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/888
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3311
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/597
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/597/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3311
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3311/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6103
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22238

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

This change was already rejected recently...
https://code.launchpad.net/~andreas-pokorny/mir/fix-null-cmdline-crash/+merge/265936

[Alan Griffiths (alan-griffiths)]

> This change was already rejected recently...
> https://code.launchpad.net/~andreas-pokorny/mir/fix-null-cmdline-
> crash/+merge/265936

review: Disapprove

[Andreas Pokorny (andreas-pokorny)]

the alternative is fix here: https://code.launchpad.net/~andreas-pokorny/qtmir/devel-mir-next-avoid-empty-cmdline-params/+merge/266234

[Alberto Aguirre (albaguirre)]

Ah missed that this was rejected already.

Thanks Andreas.

Unmerged revisions

2799. By Andreas Pokorny on 2015-07-31

Allow empty cmd line in mir::options::DefaultConfiguration

=== modified file 'src/platform/options/default_configuration.cpp'
--- src/platform/options/default_configuration.cpp	2015-07-23 02:39:20 +0000
+++ src/platform/options/default_configuration.cpp	2015-07-31 03:42:35 +0000
@@ -131,7 +131,9 @@
     argv(argv),
     unparsed_arguments_handler{handler},
     program_options(std::make_shared<boost::program_options::options_description>(
-        description_text(argv[0], config_file)))
+        description_text(
+            (argc && argv)?argv[0]:"mir-server",
+            config_file)))
 {
     using namespace options;
     namespace po = boost::program_options;

=== modified file 'tests/acceptance-tests/server_configuration_options.cpp'
--- tests/acceptance-tests/server_configuration_options.cpp	2014-11-06 13:26:52 +0000
+++ tests/acceptance-tests/server_configuration_options.cpp	2015-07-31 03:42:35 +0000
@@ -123,6 +123,18 @@
     server.apply_settings();
 }
 
+TEST_F(ServerConfigurationOptions, empty_command_line_is_allowed)
+{
+    int const argc{0};
+    char const** argv{nullptr};
+
+    server.set_command_line(argc, argv);
+
+    EXPECT_CALL(*this, command_line_handler(_)).Times(0);
+
+    server.apply_settings();
+}
+
 TEST_F(ServerConfigurationOptions, are_read_from_xdg_config_home)
 {
     create_config_file_in(fake_xdg_config_home);