summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-07 02:24:04 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-07 02:24:04 +0000
commitfa34b5afdcfb5b287efe788da7b612d37c0c40cb (patch)
tree51fc60a7ae1d31bcf1a1b7ec9bde803ddd58fab0 /webkit/tools
parent426c90ed5f2a6ea79639dc337be50b68393d4546 (diff)
downloadchromium_src-fa34b5afdcfb5b287efe788da7b612d37c0c40cb.zip
chromium_src-fa34b5afdcfb5b287efe788da7b612d37c0c40cb.tar.gz
chromium_src-fa34b5afdcfb5b287efe788da7b612d37c0c40cb.tar.bz2
Allow cygwin users to run run_webkit_tests.py.
BUG=none TEST=none Review URL: http://codereview.chromium.org/3593006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rwxr-xr-xwebkit/tools/layout_tests/run_webkit_tests.py15
1 files changed, 5 insertions, 10 deletions
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index b7da383..05c47ed 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -10,18 +10,13 @@ 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 = sys.argv[0];
+ if sys.platform != 'cygwin':
+ src_dir = os.path.abspath(sys.argv[0])
+ print src_dir
src_dir=os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(
- os.path.dirname(os.path.abspath(sys.argv[0]))))))
+ os.path.dirname(src_dir)))))
script_dir=os.path.join(src_dir, "third_party", "WebKit", "WebKitTools",
"Scripts")
script = os.path.join(script_dir, 'new-run-webkit-tests')