diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 00:15:46 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 00:15:46 +0000 |
| commit | f5aaac9ce64cc36c17fbb06757e59465e0af1f02 (patch) | |
| tree | 9b3d9b1b8f7b0f86800463dbee1b9c039a7faa66 /webkit | |
| parent | fae26a7c5a5412418246c68792a2d9f644703427 (diff) | |
| download | chromium_src-f5aaac9ce64cc36c17fbb06757e59465e0af1f02.zip chromium_src-f5aaac9ce64cc36c17fbb06757e59465e0af1f02.tar.gz chromium_src-f5aaac9ce64cc36c17fbb06757e59465e0af1f02.tar.bz2 | |
Revert 39662 - Update various test scripts to use the upstream version of
runchromiumwebkittests and rebaselinechromiumwebkittests
BUG=23099
TBR=victorw
TEST=bots don't explode
Review URL: http://codereview.chromium.org/639001
TBR=dpranke@chromium.org
Review URL: http://codereview.chromium.org/650189
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39678 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/rebaseline.bat | 2 | ||||
| -rwxr-xr-x | webkit/tools/layout_tests/rebaseline.sh | 9 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/run_webkit_tests.bat | 2 | ||||
| -rwxr-xr-x | webkit/tools/layout_tests/run_webkit_tests.sh | 6 |
4 files changed, 13 insertions, 6 deletions
diff --git a/webkit/tools/layout_tests/rebaseline.bat b/webkit/tools/layout_tests/rebaseline.bat index ea8d68f..25ca06f 100644 --- a/webkit/tools/layout_tests/rebaseline.bat +++ b/webkit/tools/layout_tests/rebaseline.bat @@ -1 +1 @@ -%~dp0..\..\..\third_party\python_24\python.exe %~dp0\..\..\..\third_party\WebKit\WebKitTools\Scripts\rebaseline-chromium-webkit-tests %* +%~dp0..\..\..\third_party\python_24\python.exe %~dp0\webkitpy\layout_tests\rebaseline_chromium_webkit_tests.py %* diff --git a/webkit/tools/layout_tests/rebaseline.sh b/webkit/tools/layout_tests/rebaseline.sh index bac48c4..771169d 100755 --- a/webkit/tools/layout_tests/rebaseline.sh +++ b/webkit/tools/layout_tests/rebaseline.sh @@ -1,11 +1,16 @@ #!/bin/sh -# Copyright (c) 2009, 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. exec_dir=$(dirname $0) PYTHON_PROG=python +# When not using the included python, we don't get automatic site.py paths. +# Specifically, rebaseline.py needs the paths in: +# third_party/python_24/Lib/site-packages/google.pth +PYTHONPATH="${exec_dir}/../../../tools/python:$PYTHONPATH" +export PYTHONPATH -"$PYTHON_PROG" "$exec_dir/../../../third_party/WebKit/WebKitTools/Scripts/rebaseline-chromium-webkit-tests" "$@" +"$PYTHON_PROG" "$exec_dir/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py" "$@" diff --git a/webkit/tools/layout_tests/run_webkit_tests.bat b/webkit/tools/layout_tests/run_webkit_tests.bat index 4bce6b8..91fee71 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\..\..\..\third_party\WebKit\WebKitTools\Scripts\run-chromium-webkit-tests %* +@%~dp0\..\..\..\third_party\python_24\python.exe %~dp0\run_webkit_tests.py %* diff --git a/webkit/tools/layout_tests/run_webkit_tests.sh b/webkit/tools/layout_tests/run_webkit_tests.sh index 653110f..4dcb3fc 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.sh +++ b/webkit/tools/layout_tests/run_webkit_tests.sh @@ -5,7 +5,6 @@ # found in the LICENSE file. exec_dir=$(dirname $0) -script_dir=${exec_dir}/../../../third_party/WebKit/WebKitTools/Scripts if [ "$OSTYPE" = "cygwin" ]; then system_root=`cygpath "$SYSTEMROOT"` @@ -14,7 +13,10 @@ if [ "$OSTYPE" = "cygwin" ]; then PYTHON_PROG="$exec_dir/../../../third_party/python_24/python.exe" else PYTHON_PROG=python + # Specifically, run_webkit_tests needs the paths in: + # third_party/python_24/Lib/site-packages/google.pth + PYTHONPATH="${exec_dir}/../../../tools/python:$PYTHONPATH" export PYTHONPATH fi -"$PYTHON_PROG" "$script_dir/run-chromium-webkit-tests" "$@" +"$PYTHON_PROG" "$exec_dir/run_webkit_tests.py" "$@" |