net/test/python_utils.cc - Issue 74253002: Stop using third_party\python_26 for many tests.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/test/python_utils.cc

Issue 74253002: Stop using third_party\python_26 for many tests. (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master

Patch Set: Do not use system version at all Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: net/test/python_utils.cc

diff --git a/net/test/python_utils.cc b/net/test/python_utils.cc

index bf66bea93bd2e79ce2bb5ea2a4244e5bd83b3909..3e878b20a52cb986379e5b5059fab0161b62655c 100644

--- a/net/test/python_utils.cc

+++ b/net/test/python_utils.cc

@@ -109,8 +109,14 @@ bool GetPyProtoPath(base::FilePath* dir) {

bool GetPythonCommand(CommandLine* python_cmd) {

DCHECK(python_cmd);

- python_cmd->SetProgram(base::FilePath(FILE_PATH_LITERAL("python")));

+#if defined(OS_WIN)

+ python_cmd->SetProgram(base::FilePath(FILE_PATH_LITERAL("cmd.exe")));

Paweł Hajdan Jr. 2013/11/16 00:13:50 Why do we need to go through cmd.exe /c ?

+ python_cmd->AppendArg("/c");

+ python_cmd->AppendArg("python");

Paweł Hajdan Jr. 2013/11/16 00:13:50 nit: Remove empty line.

+#elif defined(OS_POSIX)

+ python_cmd->SetProgram(base::FilePath(FILE_PATH_LITERAL("python")));

+#endif

// 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");

« no previous file with comments | « net/net_unittests.isolate ('k') | net/test/spawned_test_server/local_test_server_win.cc » ('j') | no next file with comments »