Changeset 71160 in webkit

Timestamp:

Nov 2, 2010 1:42:48 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-11-02 Benjamin Kalman <​kalman@google.com>

Reviewed by Ojan Vafai.

new-run-webkit-tests doesn't strip "LayoutTests/" from prefix, unlike old-run-webkit-tests
​https://bugs.webkit.org/show_bug.cgi?id=48794

• Scripts/webkitpy/layout_tests/run_webkit_tests.py: Strip the "LayoutTests/" prefix from test argument paths.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-11-02  Benjamin Kalman  <kalman@google.com>
+
+        Reviewed by Ojan Vafai.
+
+        new-run-webkit-tests doesn't strip "LayoutTests/" from prefix, unlike old-run-webkit-tests
+        https://bugs.webkit.org/show_bug.cgi?id=48794
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py: Strip the "LayoutTests/" prefix from test argument paths.
+
 2010-11-02  Adam Roben  <aroben@apple.com>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -86 +86 @@
 BUILDER_BASE_URL = "http://build.chromium.org/buildbot/layout_test_results/"
 
+LAYOUT_TESTS_DIRECTORY = "LayoutTests" + os.sep
+
 TestExpectationsFile = test_expectations.TestExpectationsFile
 
@@ -284 +286 @@
 
         """
-        paths = [arg for arg in args if arg and arg != '']
+        paths = [self._strip_test_dir_prefix(arg) for arg in args if arg and arg != '']
         paths += last_unexpected_results
         if self._options.test_list:
             paths += read_test_files(self._options.test_list)
         self._test_files = self._port.tests(paths)
+
+    def _strip_test_dir_prefix(self, path):
+        if path.startswith(LAYOUT_TESTS_DIRECTORY):
+            return path[len(LAYOUT_TESTS_DIRECTORY):]
+        return path
 
     def lint(self):
@@ -471 +478 @@
         """Returns the highest-level directory by which to shard the given
         test file."""
-        index = test_file.rfind(os.sep + 'LayoutTests' + os.sep)
-
-        test_file = test_file[index + len('LayoutTests/'):]
+        index = test_file.rfind(os.sep + LAYOUT_TESTS_DIRECTORY)
+
+        test_file = test_file[index + len(LAYOUT_TESTS_DIRECTORY):]
         test_file_parts = test_file.split(os.sep, 1)
         directory = test_file_parts[0]