diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-26 03:12:10 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-26 03:12:10 +0000 |
| commit | cce134d160667396abcc802a2b64eab5db7982b3 (patch) | |
| tree | c43914dcea8d9a9ce288de2d4ab52b32df222416 /chrome/test | |
| parent | 164363ea9e45860ae7a3181ce68e4d3727623c0f (diff) | |
| download | chromium_src-cce134d160667396abcc802a2b64eab5db7982b3.zip chromium_src-cce134d160667396abcc802a2b64eab5db7982b3.tar.gz chromium_src-cce134d160667396abcc802a2b64eab5db7982b3.tar.bz2 | |
Don't use the checked in python for UI tests on Windows.
TBR=maruel
Review URL: http://codereview.chromium.org/1788001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index a00736e..d956478 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -15,6 +15,7 @@ #include "app/sql/connection.h" #include "base/base_switches.h" #include "base/command_line.h" +#include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/platform_thread.h" @@ -282,19 +283,7 @@ void UITestBase::CloseBrowserAndServer() { } static CommandLine* CreatePythonCommandLine() { -#if defined(OS_WIN) - // Get path to python interpreter - FilePath python_runtime; - if (!PathService::Get(base::DIR_SOURCE_ROOT, &python_runtime)) - return NULL; - python_runtime = python_runtime - .Append(FILE_PATH_LITERAL("third_party")) - .Append(FILE_PATH_LITERAL("python_24")) - .Append(FILE_PATH_LITERAL("python.exe")); - return new CommandLine(python_runtime); -#elif defined(OS_POSIX) - return new CommandLine(FilePath("python")); -#endif + return new CommandLine(FilePath(FILE_PATH_LITERAL("python"))); } static CommandLine* CreateHttpServerCommandLine() { |