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

webkit/tools/layout_tests/layout_package/test_expectations.py

 # 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 helper class for reading in and dealing with tests expectations
 for layout tests.
 """
 
 import logging
 import os
@@ skipping 437 matching lines @@
 
       test_list_path = tests_and_expecation_parts[0].strip()
       expectations = self._ParseExpectations(tests_and_expecation_parts[1],
           lineno, test_list_path)
 
       if 'slow' in options and TIMEOUT in expectations:
         self._AddError(lineno, 'A test cannot be both slow and timeout. If the '
             'test times out indefinitely, the it should be listed as timeout.',
             test_and_expectations)
 
-      full_path = os.path.join(path_utils.LayoutDataDir(), test_list_path)
+      full_path = os.path.join(path_utils.LayoutTestsDir(test_list_path),
+                               test_list_path)
       full_path = os.path.normpath(full_path)
       # WebKit's way of skipping tests is to add a -disabled suffix.
       # So we should consider the path existing if the path or the -disabled
       # version exists.
       if not os.path.exists(full_path) and not \
         os.path.exists(full_path + '-disabled'):
         # Log a non fatal error here since you hit this case any time you
         # update test_expectations.txt without syncing the LayoutTests
         # directory
         self._LogNonFatalError(lineno, 'Path does not exist.', test_list_path)
@@ skipping 28 matching lines @@
         self._AddError(lineno, 'Unsupported expectation: %s' % part,
             test_list_path)
         continue
       expectation = self.EXPECTATIONS[part]
       result.add(expectation)
     return result
 
   def _ExpandTests(self, test_list_path):
     # Convert the test specification to an absolute, normalized
     # path and make sure directories end with the OS path separator.
-    path = os.path.join(path_utils.LayoutDataDir(), test_list_path)
+    path = os.path.join(path_utils.LayoutTestsDir(test_list_path),
+                        test_list_path)
     path = os.path.normpath(path)
     if os.path.isdir(path): path = os.path.join(path, '')
     # This is kind of slow - O(n*m) - since this is called for all
     # entries in the test lists. It has not been a performance
     # issue so far. Maybe we should re-measure the time spent reading
     # in the test lists?
     result = []
     for test in self._full_test_list:
       if test.startswith(path): result.append(test)
     return result
@@ skipping 51 matching lines @@
   def _AddError(self, lineno, msg, path):
     """Reports an error that will prevent running the tests. Does not
     immediately raise an exception because we'd like to aggregate all the
     errors so they can all be printed out."""
     self._errors.append('\nLine:%s %s %s' % (lineno, msg, path))
 
   def _LogNonFatalError(self, lineno, msg, path):
     """Reports an error that will not prevent running the tests. These are
     still errors, but not bad enough to warrant breaking test running."""
     self._non_fatal_errors.append('Line:%s %s %s' % (lineno, msg, path))