diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/net/test/python_utils.cc | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/net/test/python_utils.cc')
| -rw-r--r-- | chromium/net/test/python_utils.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chromium/net/test/python_utils.cc b/chromium/net/test/python_utils.cc index a9ac98b5317..e249a27f27a 100644 --- a/chromium/net/test/python_utils.cc +++ b/chromium/net/test/python_utils.cc @@ -41,6 +41,7 @@ void AppendToPythonPath(const base::FilePath& dir) { namespace { +#if defined(OS_MACOSX) || defined(OS_CHROMEOS) // Search for |to_try|, rolling up the directory tree from // |start_dir|. If found, return true and put the path to |to_try| in // |out_dir|. If not, return false and leave |out_dir| untouched. @@ -59,6 +60,7 @@ bool TryRelativeToDir(const base::FilePath& start_dir, *out_dir = dir; return true; } +#endif // defined(OS_MACOSX) || defined(OS_CHROMEOS) } // namespace @@ -107,8 +109,14 @@ bool GetPyProtoPath(base::FilePath* dir) { bool GetPythonCommand(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"); |