Merge lp:~alan-griffiths/mir/fix-command-line-handling into lp:mir

[Alan Griffiths]

tests: fix commandline handling in tests

tests: fix command line handling in tests

The replacement main() screwed up Mir options when there are also gtest options. That's fixed.

Also, the new test framework failed to set the command line for the Mir server

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2087
http://jenkins.qa.ubuntu.com/job/mir-ci/2204/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/193
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/193/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/244
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/244/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3502
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16098

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

review: Approve (continuous-integration)

[Alberto Aguirre (albaguirre)]

LGTM

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

LGTM.

review: Approve

=== modified file 'tests/include/mir_test_framework/command_line_server_configuration.h'
--- tests/include/mir_test_framework/command_line_server_configuration.h	2014-05-16 15:46:58 +0000
+++ tests/include/mir_test_framework/command_line_server_configuration.h	2014-11-21 11:03:26 +0000
@@ -27,12 +27,15 @@
 {
 class DefaultConfiguration;
 }
+class Server;
 }
 
 namespace mir_test_framework
 {
     auto configuration_from_commandline() 
     -> std::shared_ptr<mir::options::DefaultConfiguration>;
+
+    void configure_from_commandline(mir::Server& server);
 }
 
 #endif /* MIR_TEST_FRAMEWORK_COMMAND_LINE_SERVER_CONFIGURATION */
 
=== modified file 'tests/mir_test_framework/command_line_server_configuration.cpp'
--- tests/mir_test_framework/command_line_server_configuration.cpp	2014-05-16 15:46:58 +0000
+++ tests/mir_test_framework/command_line_server_configuration.cpp	2014-11-21 11:03:26 +0000
@@ -17,6 +17,7 @@
 
 #include "mir_test_framework/command_line_server_configuration.h"
 #include "mir/options/default_configuration.h"
+#include "mir/server.h"
 
 #include <gtest/gtest.h>
 
@@ -31,26 +32,25 @@
 char const** argv;
 }
 
-namespace mir_test_framework
-{
-    auto configuration_from_commandline()
-    -> std::shared_ptr<mo::DefaultConfiguration>
-    {
-        return std::make_shared<mo::DefaultConfiguration>(::argc, ::argv);
-    }
+auto mir_test_framework::configuration_from_commandline()
+-> std::shared_ptr<mo::DefaultConfiguration>
+{
+    return std::make_shared<mo::DefaultConfiguration>(::argc, ::argv);
+}
+
+void mir_test_framework::configure_from_commandline(mir::Server& server)
+{
+    server.set_command_line(::argc, ::argv);
 }
 
 int main(int argc, char** argv)
 {
     // Override this standard gtest message
     std::cout << "Running main() from " << basename(__FILE__) << std::endl;
-    ::argc = std::remove_if(
-        argv,
-        argv+argc,
-        [](char const* arg) { return !strncmp(arg, "--gtest_", 8); }) - argv;
+    ::testing::InitGoogleTest(&argc, argv);
+
     ::argv = const_cast<char const**>(argv);
-
-    ::testing::InitGoogleTest(&argc, argv);
+    ::argc = argc;
 
     return RUN_ALL_TESTS();
 }
 
=== modified file 'tests/mir_test_framework/headless_test.cpp'
--- tests/mir_test_framework/headless_test.cpp	2014-11-06 03:56:24 +0000
+++ tests/mir_test_framework/headless_test.cpp	2014-11-21 11:03:26 +0000
@@ -17,9 +17,11 @@
  */
 
 #include "mir_test_framework/headless_test.h"
+#include "mir_test_framework/command_line_server_configuration.h"
 
 #include "mir/fd.h"
 #include "mir/main_loop.h"
+#include "mir/options/option.h"
 
 #include <boost/throw_exception.hpp>
 
@@ -32,6 +34,7 @@
 
 mtf::HeadlessTest::HeadlessTest()
 {
+    configure_from_commandline(server);
     add_to_environment("MIR_SERVER_PLATFORM_GRAPHICS_LIB", "libmirplatformstub.so");
 }