diff options
| author | victorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-30 16:15:26 +0000 |
|---|---|---|
| committer | victorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-30 16:15:26 +0000 |
| commit | 57701a5b374ad2efe1bc919063d8236ee810bb71 (patch) | |
| tree | 5eb164a00301dfc12cd4c1fbb2f9bc340f1fe611 /webkit/tools/layout_tests/layout_package/http_server.py | |
| parent | b6e9a55f5c6542ed032c41dc06b85fec5ed63931 (diff) | |
| download | chromium_src-57701a5b374ad2efe1bc919063d8236ee810bb71.zip chromium_src-57701a5b374ad2efe1bc919063d8236ee810bb71.tar.gz chromium_src-57701a5b374ad2efe1bc919063d8236ee810bb71.tar.bz2 | |
Allow layout tests to be located both in src/webkit/data/layout_tests and third_party/WebKit.
For tests in LayoutTests directory, the script checks whether the LayoutTests directory exists in webkit/data/layout_tests, if not, assume it is in
third_party/WebKit.
Basically, this patch = http_server change + Dimitri Glazkov's patch (http://codereview.chromium.org/115302).
BUG=8765
TEST=none
Review URL: http://codereview.chromium.org/146112
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests/layout_package/http_server.py')
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/http_server.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/layout_package/http_server.py b/webkit/tools/layout_tests/layout_package/http_server.py index a65c51a..b839385 100644 --- a/webkit/tools/layout_tests/layout_package/http_server.py +++ b/webkit/tools/layout_tests/layout_package/http_server.py @@ -34,7 +34,13 @@ class Lighttpd: _webkit_tests = PathFromBase('webkit', 'data', 'layout_tests', 'LayoutTests', 'http', 'tests') except google.path_utils.PathNotFound: - _webkit_tests = None + # If webkit/data/layout_tests/LayoutTests/http/tests does not exist, assume + # wekit tests are located in third_party/WebKit/LayoutTests/http/tests. + try: + _webkit_tests = PathFromBase('third_party', 'WebKit', + 'LayoutTests', 'http', 'tests') + except google.path_utils.PathNotFound: + _webkit_tests = None # New tests for Chrome try: |