Changeset 181280 in webkit

Timestamp:

Mar 9, 2015 1:51:38 PM (9 years ago)

Author:

jer.noble@apple.com

Message:

Add an option to run-webkit-tests to override the LayoutTests/ directory
​https://bugs.webkit.org/show_bug.cgi?id=142418

Reviewed by David Kilzer.

Add an arugment to run-webkit-tests which, when set, overrides the port's default LayoutTests
directory. The base port will parse the options during initialization and store the override
location if present. layout_tests_dir() will return this overridden location if set.

• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

(parse_args):

• Scripts/webkitpy/port/base.py:

(Port.init):
(Port.layout_tests_dir):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-03-06  Jer Noble  <jer.noble@apple.com>
+
+        Add an option to run-webkit-tests to override the LayoutTests/ directory
+        https://bugs.webkit.org/show_bug.cgi?id=142418
+
+        Reviewed by David Kilzer.
+
+        Add an arugment to run-webkit-tests which, when set, overrides the port's default LayoutTests
+        directory. The base port will parse the options during initialization and store the override
+        location if present. layout_tests_dir() will return this overridden location if set.
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        (parse_args):
+        * Scripts/webkitpy/port/base.py:
+        (Port.__init__):
+        (Port.layout_tests_dir):
+
 2015-03-09  Martin Robinson  <mrobinson@igalia.com>
 

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

@@ -209 +209 @@
             default=False,
             help="Build java support files"),
+        optparse.make_option("--layout-tests-directory", action="store", default=None,
+            help="Override the default layout test directory.", dest="layout_tests_dir")
     ]))
 

trunk/Tools/Scripts/webkitpy/port/base.py

@@ -138 +138 @@
         self._root_was_set = hasattr(options, 'root') and options.root
         self._jhbuild_wrapper = []
+        self._layout_tests_dir = hasattr(options, 'layout_tests_dir') and options.layout_tests_dir
 
     def architecture(self):
@@ -667 +668 @@
 
     def layout_tests_dir(self):
+        if self._layout_tests_dir:
+            return self._layout_tests_dir
         return self._webkit_finder.layout_tests_dir()