diff options
| author | Zeno Albisser <zeno.albisser@theqtcompany.com> | 2014-12-05 15:04:29 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-09 10:49:28 +0100 |
| commit | af6588f8d723931a298c995fa97259bb7f7deb55 (patch) | |
| tree | 060ca707847ba1735f01af2372e0d5e494dc0366 /chromium/net/test/python_utils.cc | |
| parent | 2fff84d821cc7b1c785f6404e0f8091333283e74 (diff) | |
| download | qtwebengine-chromium-af6588f8d723931a298c995fa97259bb7f7deb55.tar.gz | |
BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.
Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/net/test/python_utils.cc')
| -rw-r--r-- | chromium/net/test/python_utils.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/chromium/net/test/python_utils.cc b/chromium/net/test/python_utils.cc index 2555c55c264..7e40faefe83 100644 --- a/chromium/net/test/python_utils.cc +++ b/chromium/net/test/python_utils.cc @@ -7,8 +7,8 @@ #include "base/base_paths.h" #include "base/command_line.h" #include "base/environment.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" @@ -109,14 +109,8 @@ bool GetPyProtoPath(base::FilePath* dir) { bool GetPythonCommand(base::CommandLine* python_cmd) { DCHECK(python_cmd); -#if defined(OS_WIN) - // This permits finding the proper python in path even if it is a .bat file. - python_cmd->SetProgram(base::FilePath(FILE_PATH_LITERAL("cmd.exe"))); - python_cmd->AppendArg("/c"); - python_cmd->AppendArg("python"); -#else python_cmd->SetProgram(base::FilePath(FILE_PATH_LITERAL("python"))); -#endif // defined(OS_WIN) + // Launch python in unbuffered mode, so that python output doesn't mix with // gtest output in buildbot log files. See http://crbug.com/147368. python_cmd->AppendArg("-u"); |