From 5e96b65b0470d18a169f4d9eacc8784d1fcfeb6d Mon Sep 17 00:00:00 2001 From: "victorw@chromium.org" Date: Mon, 13 Jul 2009 21:16:56 +0000 Subject: Change the path search order of LayoutTests. First check whether third_party/WebKit/LayoutTests exists, if so, use this one. Otherwise, fallback to webkit/data/layout_tests/LayoutTests TEST=run_webkit_tests BUG=none Review URL: http://codereview.chromium.org/149566 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20531 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/layout_tests/layout_package/path_utils.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'webkit/tools') diff --git a/webkit/tools/layout_tests/layout_package/path_utils.py b/webkit/tools/layout_tests/layout_package/path_utils.py index dcff738..a15048c 100644 --- a/webkit/tools/layout_tests/layout_package/path_utils.py +++ b/webkit/tools/layout_tests/layout_package/path_utils.py @@ -65,11 +65,13 @@ def LayoutTestsDir(path = None): if _layout_tests_dir: return _layout_tests_dir - if os.path.exists(os.path.join(LayoutDataDir(), 'LayoutTests')): - _layout_tests_dir = LayoutDataDir() + 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: - _layout_tests_dir = google.path_utils.FindUpward( - google.path_utils.ScriptDir(), 'third_party', 'WebKit') + _layout_tests_dir = LayoutDataDir() return _layout_tests_dir -- cgit v1.1