Allow layout tests to be located both in src/webkit/data/layout_tests and...

webkit/tools/layout_tests/layout_package/http_server.py

 #!/bin/env python
 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A class to help start/stop the lighttpd server used by layout tests."""
 
 
 import logging
 import optparse
@@ skipping 16 matching lines @@
 
 class HttpdNotStarted(Exception):
   pass
 
 class Lighttpd:
   # Webkit tests
   try:
     _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:
     _pending_tests = PathFromBase('webkit', 'data', 'layout_tests',
                                   'pending', 'http', 'tests')
   except google.path_utils.PathNotFound:
     _pending_tests = None
 
   # Path where we can access all of the tests
   _all_tests = PathFromBase('webkit', 'data', 'layout_tests')
@@ skipping 209 matching lines @@
       # Specifying port but no root does not seem meaningful.
       raise 'Specifying port requires also a root.'
     httpd = Lighttpd(tempfile.gettempdir(),
                      port=options.port,
                      root=options.root,
                      register_cygwin=options.register_cygwin)
     if 'start' == options.server:
       httpd.Start()
     else:
       httpd.Stop(force=True)