diff options
| author | victorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 16:36:48 +0000 |
|---|---|---|
| committer | victorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 16:36:48 +0000 |
| commit | ad95192a493bcf8dda68a8735afce887db7228e4 (patch) | |
| tree | 80c404201be21770e64d5a981220c9cc00e09665 /webkit/tools | |
| parent | d2ca9eeea8615e9f81984571f02338835916f1fd (diff) | |
| download | chromium_src-ad95192a493bcf8dda68a8735afce887db7228e4.zip chromium_src-ad95192a493bcf8dda68a8735afce887db7228e4.tar.gz chromium_src-ad95192a493bcf8dda68a8735afce887db7228e4.tar.bz2 | |
Remove run_webkit_tests dependency on third_party\python_24.
R=dpranke,jeffbailey@google.com
BUG=none
TEST=build bot green
Review URL: http://codereview.chromium.org/1568004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/layout_tests/run_webkit_tests.bat | 2 | ||||
| -rwxr-xr-x | webkit/tools/layout_tests/run_webkit_tests.py | 9 | ||||
| -rwxr-xr-x | webkit/tools/layout_tests/run_webkit_tests.sh | 10 |
3 files changed, 13 insertions, 8 deletions
diff --git a/webkit/tools/layout_tests/run_webkit_tests.bat b/webkit/tools/layout_tests/run_webkit_tests.bat index 91fee71..7d97f0f 100644 --- a/webkit/tools/layout_tests/run_webkit_tests.bat +++ b/webkit/tools/layout_tests/run_webkit_tests.bat @@ -1 +1 @@ -@%~dp0\..\..\..\third_party\python_24\python.exe %~dp0\run_webkit_tests.py %* +@python %~dp0\run_webkit_tests.py %* diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py index 475caa4..b7da383 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.py +++ b/webkit/tools/layout_tests/run_webkit_tests.py @@ -10,6 +10,15 @@ import subprocess import sys def main(): + if sys.platform == 'cygwin': + return( + 'ERROR: you are running from cygwin python, which is not\n' + ' supported by "run_webkit_test.py". You should use python\n' + ' for Windows (2.5+) to launch this script. A python for\n' + ' Windows can be found at your depot_tools folder:\n' + ' [DEPOT_TOOLS_PATH]/python ' + '"' + sys.argv[0] + '" ' + + ' '.join(sys.argv[1:])) + cmd = [sys.executable] src_dir=os.path.join(os.path.dirname(os.path.dirname(os.path.dirname( os.path.dirname(os.path.abspath(sys.argv[0])))))) diff --git a/webkit/tools/layout_tests/run_webkit_tests.sh b/webkit/tools/layout_tests/run_webkit_tests.sh index c45afc7..59aad37e 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.sh +++ b/webkit/tools/layout_tests/run_webkit_tests.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_webkit_tests.py") else - PYTHON_PROG=python - unset PYTHONPATH SCRIPT="$exec_dir/run_webkit_tests.py" fi +PYTHON_PROG=python +unset PYTHONPATH + "$PYTHON_PROG" "$SCRIPT" "$@" |