Index: third_party/WebKit/Tools/Scripts/test-webkitpy |
diff --git a/third_party/WebKit/Tools/Scripts/test-webkitpy b/third_party/WebKit/Tools/Scripts/test-webkitpy |
index 4e2c7bd7633166853b7468b7677a11afb087c1ac..27e477e055cf7509b59dd4b2977d0c79b1d12214 100755 |
--- a/third_party/WebKit/Tools/Scripts/test-webkitpy |
+++ b/third_party/WebKit/Tools/Scripts/test-webkitpy |
@@ -31,13 +31,8 @@ |
import os |
import sys |
-dirname = os.path.dirname |
-scripts_dir = dirname(os.path.realpath(__file__)) |
-chromium_src_dir = dirname(dirname(dirname(dirname(scripts_dir)))) |
- |
-path_to_typ = os.path.join(chromium_src_dir, 'third_party', 'typ') |
-if path_to_typ not in sys.path: |
- sys.path.append(path_to_typ) |
+from webkitpy import path_finder |
+path_finder.find_typ_dir() |
import typ |
@@ -54,7 +49,7 @@ if sys.platform == 'win32': |
'webkitpy.layout_tests.layout_package.bot_test_expectations_unittest.*', |
] |
-sys.exit(typ.main(top_level_dir=scripts_dir, |
+sys.exit(typ.main(top_level_dir=path_finder.get_scripts_dir(), |
skip=skip, |
- path=[os.path.join(scripts_dir, 'webkitpy', 'thirdparty')], |
+ path=[path_finder.get_webkitpy_thirdparty_dir()], |
win_multiprocessing='spawn')) |