diff options
| author | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-13 22:51:22 +0000 |
|---|---|---|
| committer | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-13 22:51:22 +0000 |
| commit | 611db6570104aab1de691be4a419e7288aac0c96 (patch) | |
| tree | ca686e31b96b0082a8609d529166dba1d49a1bf3 /webkit | |
| parent | 3f5e186469cfb05b27e5958e693a3a9bd36096bb (diff) | |
| download | chromium_src-611db6570104aab1de691be4a419e7288aac0c96.zip chromium_src-611db6570104aab1de691be4a419e7288aac0c96.tar.gz chromium_src-611db6570104aab1de691be4a419e7288aac0c96.tar.bz2 | |
Reverting 20531.
Review URL: http://codereview.chromium.org/155458
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20557 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/path_utils.py | 10 |
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 |