diff options
| author | michaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-03 18:33:00 +0000 |
|---|---|---|
| committer | michaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-03 18:33:00 +0000 |
| commit | 66c652a9f38913528f6867cebc46141a15396b2f (patch) | |
| tree | a8b301a155057ee94c36082006e8649e3ec06bfb /webkit/tools | |
| parent | 2f83ce51de35bdc9f3e4b69b44f17d701ea9d2cd (diff) | |
| download | chromium_src-66c652a9f38913528f6867cebc46141a15396b2f.zip chromium_src-66c652a9f38913528f6867cebc46141a15396b2f.tar.gz chromium_src-66c652a9f38913528f6867cebc46141a15396b2f.tar.bz2 | |
Switch run_http_server.bat to using python from depot_tools instead of what's checked in to third_party.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1774020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/layout_tests/run_http_server.bat | 2 | ||||
| -rwxr-xr-x | webkit/tools/layout_tests/run_http_server.sh | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/webkit/tools/layout_tests/run_http_server.bat b/webkit/tools/layout_tests/run_http_server.bat index c0dd160..8a9ac18 100644 --- a/webkit/tools/layout_tests/run_http_server.bat +++ b/webkit/tools/layout_tests/run_http_server.bat @@ -1 +1 @@ -@%~dp0\..\..\..\third_party\python_24\python.exe %~dp0\run_http_server.py %* +@python %~dp0\run_http_server.py %* diff --git a/webkit/tools/layout_tests/run_http_server.sh b/webkit/tools/layout_tests/run_http_server.sh index 36e2812..4d0baad 100755 --- a/webkit/tools/layout_tests/run_http_server.sh +++ b/webkit/tools/layout_tests/run_http_server.sh @@ -7,16 +7,12 @@ exec_dir=$(dirname $0) if [ "$OSTYPE" = "cygwin" ]; then - system_root=`cygpath "$SYSTEMROOT"` - PATH="/usr/bin:$system_root/system32:$system_root:$system_root/system32/WBEM" - export PATH - unset PYTHONPATH - PYTHON_PROG="$exec_dir/../../../third_party/python_24/python.exe" SCRIPT=$(cygpath -wa "$exec_dir/run_http_server.py") else - PYTHON_PROG=python - unset PYTHONPATH SCRIPT="$exec_dir/run_http_server.py" fi +PYTHON_PROG=python +unset PYTHONPATH + "$PYTHON_PROG" "$SCRIPT" "$@" |