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

Issues Search
    My Issues | Starred     Open | Closed | All

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: the fix is so simple, it's not even funny 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/net_unittests.isolate ('k') | net/test/spawned_test_server/local_test_server.cc » ('j') | net/test/spawned_test_server/local_test_server.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/python_utils.cc
diff --git a/net/test/python_utils.cc b/net/test/python_utils.cc
index bf66bea93bd2e79ce2bb5ea2a4244e5bd83b3909..712d9c90cd2a385d353da2a022f6c2a2aa61ceb2 100644
--- a/net/test/python_utils.cc
+++ b/net/test/python_utils.cc
@@ -109,8 +109,15 @@ 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)
+ // 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");
Paweł Hajdan Jr. 2013/12/02 19:37:56 nit: Remove empty line.
M-A Ruel 2013/12/02 20:13:16 Done.
+#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.cc » ('j') | net/test/spawned_test_server/local_test_server.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698