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

Unified Diff: net/test/python_utils.cc

Issue 16117004: Enable the use of system python in testing. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 7 months 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 | « build/common.gypi ('k') | no next file » | no next file with comments »
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 483aed7080a18eac8eb9dceea1c4696f6c8ee649..b9963c59a36cd9dae2548f2956d334edb627aebf 100644
--- a/net/test/python_utils.cc
+++ b/net/test/python_utils.cc
@@ -108,11 +108,15 @@ bool GetPythonCommand(CommandLine* python_cmd) {
DCHECK(python_cmd);
base::FilePath dir;
#if defined(OS_WIN)
+#if defined(USE_SYSTEM_PYTHON_IN_TESTS)
+ dir = base::FilePath(FILE_PATH_LITERAL("python.exe"));
Paweł Hajdan Jr. 2013/06/03 18:28:20 Could you explain more how and why you're using th
+#else
if (!PathService::Get(base::DIR_SOURCE_ROOT, &dir))
return false;
dir = dir.Append(FILE_PATH_LITERAL("third_party"))
.Append(FILE_PATH_LITERAL("python_26"))
.Append(FILE_PATH_LITERAL("python.exe"));
+#endif // USE_SYSTEM_PYTHON_IN_TESTS
#elif defined(OS_POSIX)
dir = base::FilePath("python");
#endif
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698