summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 01:18:15 +0000
committerdpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 01:18:15 +0000
commite5af84bd2673bc79494c3c83e556d08c324bcf71 (patch)
treed563a29ca50dad0a4f3528a03b01d778f1b042b0 /webkit
parentd3af520955a2a35f8eab164523b8c498a524e948 (diff)
downloadchromium_src-e5af84bd2673bc79494c3c83e556d08c324bcf71.zip
chromium_src-e5af84bd2673bc79494c3c83e556d08c324bcf71.tar.gz
chromium_src-e5af84bd2673bc79494c3c83e556d08c324bcf71.tar.bz2
Fix python run_webkit_tests wrapper script to work correctly regardless of
whether you're running cygwin python or win32 python and regardless of where you're invoking the script from. BUG=59958 TEST=run from the directory above src R=jam@chromium.org Review URL: http://codereview.chromium.org/3995005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rwxr-xr-xwebkit/tools/layout_tests/run_webkit_tests.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index 05c47ed..b986870 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -11,12 +11,7 @@ import sys
def main():
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(src_dir)))))
+ src_dir = os.path.abspath(os.path.join(sys.path[0], '..', '..', '..'))
script_dir=os.path.join(src_dir, "third_party", "WebKit", "WebKitTools",
"Scripts")
script = os.path.join(script_dir, 'new-run-webkit-tests')