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

webkit/tools/layout_tests/run_webkit_tests.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.
 
 """Run layout tests using the test_shell.
 
 This is a port of the existing webkit test script run-webkit-tests.
 
 The TestRunner class runs a series of tests (TestType interface) against a set
@@ skipping 128 matching lines @@
     self._http_server.Stop()
 
   def _GatherTestFiles(self, paths):
     """Generate a set of test files and place them in self._test_files
 
     Args:
       paths: a list of command line paths relative to the webkit/tests
              directory.  glob patterns are ok.
     """
     paths_to_walk = set()
+    # if paths is empty, provide a pre-defined list.
+    if not paths:
+        paths = TestRunner._shardable_directories
     for path in paths:
       # If there's an * in the name, assume it's a glob pattern.
-      path = os.path.join(path_utils.LayoutDataDir(), path)
+      path = os.path.join(path_utils.LayoutTestsDir(path), path)
       if path.find('*') > -1:
         filenames = glob.glob(path)
         paths_to_walk.update(filenames)
       else:
         paths_to_walk.add(path)
 
     # Now walk all the paths passed in on the command line and get filenames
     for path in paths_to_walk:
       if os.path.isfile(path) and self._HasSupportedExtension(path):
         self._test_files.add(os.path.normpath(path))
@@ skipping 507 matching lines @@
     print
     self._PrintTestListTiming("Tests marked as SLOW:", slow_tests)
     print
     self._PrintTestListTiming("Tests that timed out or crashed:",
         timeout_or_crash_tests)
     print
 
   def _PrintTestListTiming(self, title, test_list):
     logging.debug(title)
     for test_tuple in test_list:
-      filename = test_tuple.filename[len(path_utils.LayoutDataDir()) + 1:]
+      filename = test_tuple.filename[len(path_utils.LayoutTestsDir()) + 1:]
       filename = filename.replace('\\', '/')
       test_run_time = round(test_tuple.test_run_time, 1)
       logging.debug("%s took %s seconds" % (filename, test_run_time))
 
   def _PrintDirectoryTimings(self, directory_test_timings):
     timings = []
     for directory in directory_test_timings:
       num_tests, time_for_directory = directory_test_timings[directory]
       timings.append((round(time_for_directory, 1), directory, num_tests))
     timings.sort()
@@ skipping 305 matching lines @@
       options.time_out_ms = str(2 * TestRunner.DEFAULT_TEST_TIMEOUT_MS)
     else:
       options.time_out_ms = str(TestRunner.DEFAULT_TEST_TIMEOUT_MS)
 
   # Include all tests if none are specified.
   paths = args
   if not paths:
     paths = []
   if options.test_list:
     paths += ReadTestFiles(options.test_list)
-  if not paths:
-    paths = ['.']
 
   test_runner = TestRunner(options, paths, platform_new_results_dir)
 
   if options.lint_test_files:
     # Just creating the TestRunner checks the syntax of the test lists.
     print ("If there are no fail messages, errors or exceptions, then the "
         "lint succeeded.")
     return
 
   try:
@@ skipping 127 matching lines @@
   option_parser.add_option("", "--run-part",
                            default=None,
                            help=("Run a specified part (n:m), the nth of m"
                                  " parts, of the layout tests"))
   option_parser.add_option("", "--batch-size",
                            default=None,
                            help=("Run a the tests in batches (n), after every "
                                  "n tests, the test shell is relaunched."))
   options, args = option_parser.parse_args()
   main(options, args)