Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(672)

Side by Side Diff: mojo/application/application_test_main_chromium.cc

Issue 1070463003: Initialize command line arguments for Mojo apptests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restoring url-mappings and specifying test apps on the commandline. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/test/test_timeouts.h" 7 #include "base/test/test_timeouts.h"
8 #include "mojo/application/application_runner_chromium.h"
8 #include "mojo/public/c/system/main.h" 9 #include "mojo/public/c/system/main.h"
9 #include "mojo/public/cpp/application/application_test_base.h" 10 #include "mojo/public/cpp/application/application_test_base.h"
10 11
11 MojoResult MojoMain(MojoHandle handle) { 12 MojoResult MojoMain(MojoHandle handle) {
12 // An AtExitManager instance is needed to construct message loops. 13 // An AtExitManager instance is needed to construct message loops.
13 base::AtExitManager at_exit; 14 base::AtExitManager at_exit;
14 15
15 // Initialize test timeouts, which requires CommandLine::ForCurrentProcess(). 16 // Initialize test timeouts, which requires an initialized CommandLine.
16 // TODO(msw): Plumb relevant command line args before initializing timeouts. 17 mojo::ApplicationRunnerChromium::InitBaseCommandLine();
17 base::CommandLine::Init(0, nullptr);
18 TestTimeouts::Initialize(); 18 TestTimeouts::Initialize();
19 19
20 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
21 int argc = 0;
22 const char** argv = new const char* [command_line->argv().size()];
23 for (auto& arg : command_line->argv())
24 argv[argc++] = arg.c_str();
25 // TODO(msw): Avoid calling InitGoogleTest again in mojo::test::RunAllTests.
26 testing::InitGoogleTest(&argc, const_cast<char**>(&(argv[0])));
27
20 return mojo::test::RunAllTests(handle); 28 return mojo::test::RunAllTests(handle);
21 } 29 }
OLDNEW
« no previous file with comments | « mojo/application/application_runner_chromium.cc ('k') | mojo/services/html_viewer/ax_provider_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698