OLD | NEW |
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 "net/test/local_test_server.h" | 5 #include "net/test/local_test_server.h" |
6 | 6 |
7 #include <poll.h> | 7 #include <poll.h> |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 | 94 |
95 namespace net { | 95 namespace net { |
96 | 96 |
97 bool LocalTestServer::LaunchPython(const FilePath& testserver_path) { | 97 bool LocalTestServer::LaunchPython(const FilePath& testserver_path) { |
98 // Log is useful in the event you want to run a nearby script (e.g. a test) in | 98 // Log is useful in the event you want to run a nearby script (e.g. a test) in |
99 // the same environment as the TestServer. | 99 // the same environment as the TestServer. |
100 VLOG(1) << "LaunchPython called with PYTHONPATH = " << | 100 VLOG(1) << "LaunchPython called with PYTHONPATH = " << |
101 getenv(kPythonPathEnv); | 101 getenv(kPythonPathEnv); |
102 CommandLine python_command(FilePath(FILE_PATH_LITERAL("python"))); | 102 CommandLine python_command(FilePath(FILE_PATH_LITERAL("python"))); |
103 | 103 |
104 python_command.AppendArgPath(testserver_path); | 104 AddPythonArguments(testserver_path, &python_command); |
| 105 |
105 if (!AddCommandLineArguments(&python_command)) | 106 if (!AddCommandLineArguments(&python_command)) |
106 return false; | 107 return false; |
107 | 108 |
108 int pipefd[2]; | 109 int pipefd[2]; |
109 if (pipe(pipefd) != 0) { | 110 if (pipe(pipefd) != 0) { |
110 PLOG(ERROR) << "Could not create pipe."; | 111 PLOG(ERROR) << "Could not create pipe."; |
111 return false; | 112 return false; |
112 } | 113 } |
113 | 114 |
114 // Save the read half. The write half is sent to the child. | 115 // Save the read half. The write half is sent to the child. |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 | 162 |
162 if (!ParseServerData(server_data)) { | 163 if (!ParseServerData(server_data)) { |
163 LOG(ERROR) << "Could not parse server_data: " << server_data; | 164 LOG(ERROR) << "Could not parse server_data: " << server_data; |
164 return false; | 165 return false; |
165 } | 166 } |
166 | 167 |
167 return true; | 168 return true; |
168 } | 169 } |
169 | 170 |
170 } // namespace net | 171 } // namespace net |
OLD | NEW |