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

Side by Side Diff: base/test/multiprocess_test.cc

Issue 2549363004: Multiprocess test client: Android child process launcher rework. (Closed)
Patch Set: Fixed tests Created 4 years 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/test/multiprocess_test.h" 5 #include "base/test/multiprocess_test.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 12
13 namespace base { 13 namespace base {
14 14
15 #if !defined(OS_ANDROID) 15 #if !defined(OS_ANDROID)
16 Process SpawnMultiProcessTestChild( 16 Process SpawnMultiProcessTestChild(
17 const std::string& procname, 17 const std::string& procname,
18 const CommandLine& base_command_line, 18 const CommandLine& base_command_line,
19 const LaunchOptions& options) { 19 const LaunchOptions& options) {
20 CommandLine command_line(base_command_line); 20 CommandLine command_line(base_command_line);
21 // TODO(viettrungluu): See comment above |MakeCmdLine()| in the header file. 21 // TODO(viettrungluu): See comment above |MakeCmdLine()| in the header file.
22 // This is a temporary hack, since |MakeCmdLine()| has to provide a full 22 // This is a temporary hack, since |MakeCmdLine()| has to provide a full
23 // command line. 23 // command line.
24 if (!command_line.HasSwitch(switches::kTestChildProcess)) 24 if (!command_line.HasSwitch(switches::kTestChildProcess))
25 command_line.AppendSwitchASCII(switches::kTestChildProcess, procname); 25 command_line.AppendSwitchASCII(switches::kTestChildProcess, procname);
26 26
27 return LaunchProcess(command_line, options); 27 return LaunchProcess(command_line, options);
28 } 28 }
29
30 bool WaitForMultiprocessTestChildExit(const Process& process,
31 TimeDelta timeout,
32 int* exit_code) {
33 return process.WaitForExitWithTimeout(timeout, exit_code);
34 }
35
36 bool TerminateMultiProcessTestChild(const Process& process,
37 int exit_code,
38 bool wait) {
39 return process.Terminate(exit_code, wait);
40 }
41
29 #endif // !defined(OS_ANDROID) 42 #endif // !defined(OS_ANDROID)
30 43
31 CommandLine GetMultiProcessTestChildBaseCommandLine() { 44 CommandLine GetMultiProcessTestChildBaseCommandLine() {
32 CommandLine cmd_line = *CommandLine::ForCurrentProcess(); 45 CommandLine cmd_line = *CommandLine::ForCurrentProcess();
33 cmd_line.SetProgram(MakeAbsoluteFilePath(cmd_line.GetProgram())); 46 cmd_line.SetProgram(MakeAbsoluteFilePath(cmd_line.GetProgram()));
34 return cmd_line; 47 return cmd_line;
35 } 48 }
36 49
37 // MultiProcessTest ------------------------------------------------------------ 50 // MultiProcessTest ------------------------------------------------------------
38 51
(...skipping 14 matching lines...) Expand all
53 return SpawnMultiProcessTestChild(procname, MakeCmdLine(procname), options); 66 return SpawnMultiProcessTestChild(procname, MakeCmdLine(procname), options);
54 } 67 }
55 68
56 CommandLine MultiProcessTest::MakeCmdLine(const std::string& procname) { 69 CommandLine MultiProcessTest::MakeCmdLine(const std::string& procname) {
57 CommandLine command_line = GetMultiProcessTestChildBaseCommandLine(); 70 CommandLine command_line = GetMultiProcessTestChildBaseCommandLine();
58 command_line.AppendSwitchASCII(switches::kTestChildProcess, procname); 71 command_line.AppendSwitchASCII(switches::kTestChildProcess, procname);
59 return command_line; 72 return command_line;
60 } 73 }
61 74
62 } // namespace base 75 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698