Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/tools/layout_tests/layout_package/http_server.py

Issue 146112: Allow layout tests to be located both in src/webkit/data/layout_tests and... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/layout_tests/layout_package/compare_failures_unittest.py ('k') | webkit/tools/layout_tests/layout_package/path_utils.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/layout_tests/layout_package/http_server.py
===================================================================
--- webkit/tools/layout_tests/layout_package/http_server.py (revision 19531)
+++ webkit/tools/layout_tests/layout_package/http_server.py (working copy)
@@ -34,7 +34,13 @@
_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:
« no previous file with comments | « webkit/tools/layout_tests/layout_package/compare_failures_unittest.py ('k') | webkit/tools/layout_tests/layout_package/path_utils.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698