summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/layout_package/path_utils.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/webkit/tools/layout_tests/layout_package/path_utils.py b/webkit/tools/layout_tests/layout_package/path_utils.py
index a15048c..dcff738 100644
--- a/webkit/tools/layout_tests/layout_package/path_utils.py
+++ b/webkit/tools/layout_tests/layout_package/path_utils.py
@@ -65,13 +65,11 @@ def LayoutTestsDir(path = None):
if _layout_tests_dir:
return _layout_tests_dir
- webkit_dir = google.path_utils.FindUpward(
- google.path_utils.ScriptDir(), 'third_party', 'WebKit')
-
- if os.path.exists(os.path.join(webkit_dir, 'LayoutTests')):
- _layout_tests_dir = webkit_dir
- else:
+ if os.path.exists(os.path.join(LayoutDataDir(), 'LayoutTests')):
_layout_tests_dir = LayoutDataDir()
+ else:
+ _layout_tests_dir = google.path_utils.FindUpward(
+ google.path_utils.ScriptDir(), 'third_party', 'WebKit')
return _layout_tests_dir