Title: [184408] branches/safari-600.7-branch/Tools
- Revision
- 184408
- Author
- [email protected]
- Date
- 2015-05-15 13:21:10 -0700 (Fri, 15 May 2015)
Log Message
Merge r182018 and r181280.
2015-03-26 Jer Noble <[email protected]>
Add --allowed-host support to run-webkit-tests
https://bugs.webkit.org/show_bug.cgi?id=142938
Reviewed by Brent Fulgham.
Accept --allowed-host arguments from run-webkit-tests and pass them through to
DumpRenderTree and WebKitTestRunner.
Drive-by fix: Depending on the value of the --layout-test-dir parameter, layout test results
are placed in the wrong location. The argument is compared with each tests's path, and if a
relative path or a path with '..' was used, results are placed alongside the test. Take the
absolute path of the --layout-test-dir argument, collapsing path components like '..'.
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
(parse_args):
* Scripts/webkitpy/port/base.py:
(Port.__init__):
(Port.allowed_hosts):
* Scripts/webkitpy/port/driver.py:
(Driver.cmd_line):
2015-03-06 Jer Noble <[email protected]>
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):
Modified Paths
Diff
Modified: branches/safari-600.7-branch/Tools/ChangeLog (184407 => 184408)
--- branches/safari-600.7-branch/Tools/ChangeLog 2015-05-15 20:02:26 UTC (rev 184407)
+++ branches/safari-600.7-branch/Tools/ChangeLog 2015-05-15 20:21:10 UTC (rev 184408)
@@ -1,3 +1,47 @@
+2015-05-15 Ryosuke Niwa <[email protected]>
+
+ Merge r182018 and r181280.
+
+ 2015-03-26 Jer Noble <[email protected]>
+
+ Add --allowed-host support to run-webkit-tests
+ https://bugs.webkit.org/show_bug.cgi?id=142938
+
+ Reviewed by Brent Fulgham.
+
+ Accept --allowed-host arguments from run-webkit-tests and pass them through to
+ DumpRenderTree and WebKitTestRunner.
+
+ Drive-by fix: Depending on the value of the --layout-test-dir parameter, layout test results
+ are placed in the wrong location. The argument is compared with each tests's path, and if a
+ relative path or a path with '..' was used, results are placed alongside the test. Take the
+ absolute path of the --layout-test-dir argument, collapsing path components like '..'.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+ (parse_args):
+ * Scripts/webkitpy/port/base.py:
+ (Port.__init__):
+ (Port.allowed_hosts):
+ * Scripts/webkitpy/port/driver.py:
+ (Driver.cmd_line):
+
+ 2015-03-06 Jer Noble <[email protected]>
+
+ 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-04-29 Andy Estes <[email protected]>
Merge r183471 and r183474.
Modified: branches/safari-600.7-branch/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (184407 => 184408)
--- branches/safari-600.7-branch/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2015-05-15 20:02:26 UTC (rev 184407)
+++ branches/safari-600.7-branch/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2015-05-15 20:21:10 UTC (rev 184408)
@@ -208,6 +208,8 @@
optparse.make_option("--nojava", action=""
default=False,
help="Don't build java support files"),
+ optparse.make_option("--layout-tests-directory", action="" default=None,
+ help="Override the default layout test directory.", dest="layout_tests_dir")
]))
option_group_definitions.append(("Testing Options", [
@@ -309,6 +311,8 @@
help=("The name of an additional subversion or git checkout")),
optparse.make_option("--additional-repository-path",
help=("The path to an additional subversion or git checkout (requires --additional-repository-name)")),
+ optparse.make_option("--allowed-host", type="string", action="" default=[],
+ help=("If specified, tests are allowed to make requests to the specified hostname."))
]))
option_parser = optparse.OptionParser()
Modified: branches/safari-600.7-branch/Tools/Scripts/webkitpy/port/base.py (184407 => 184408)
--- branches/safari-600.7-branch/Tools/Scripts/webkitpy/port/base.py 2015-05-15 20:02:26 UTC (rev 184407)
+++ branches/safari-600.7-branch/Tools/Scripts/webkitpy/port/base.py 2015-05-15 20:21:10 UTC (rev 184408)
@@ -132,6 +132,7 @@
self._reftest_list = {}
self._results_directory = None
self._root_was_set = hasattr(options, 'root') and options.root
+ self._layout_tests_dir = hasattr(options, 'layout_tests_dir') and options.layout_tests_dir and self._filesystem.abspath(options.layout_tests_dir)
def additional_drt_flag(self):
return []
@@ -667,6 +668,8 @@
return self._webkit_finder.path_to_script(script_name)
def layout_tests_dir(self):
+ if self._layout_tests_dir:
+ return self._layout_tests_dir
return self._webkit_finder.layout_tests_dir()
def perf_tests_dir(self):
@@ -1038,6 +1041,8 @@
repository_paths += [(self._options.additional_repository_name, self._options.additional_repository_path)]
return repository_paths
+ def allowed_hosts(self):
+ return self.get_option("allowed_host", [])
def default_configuration(self):
return self._config.default_configuration()
Modified: branches/safari-600.7-branch/Tools/Scripts/webkitpy/port/driver.py (184407 => 184408)
--- branches/safari-600.7-branch/Tools/Scripts/webkitpy/port/driver.py 2015-05-15 20:02:26 UTC (rev 184407)
+++ branches/safari-600.7-branch/Tools/Scripts/webkitpy/port/driver.py 2015-05-15 20:21:10 UTC (rev 184408)
@@ -346,6 +346,10 @@
cmd.append('--no-timeout')
# FIXME: We need to pass --timeout=SECONDS to WebKitTestRunner for WebKit2.
+ for allowed_host in self._port.allowed_hosts():
+ cmd.append('--allowed-host')
+ cmd.append(allowed_host)
+
cmd.extend(self._port.get_option('additional_drt_flag', []))
cmd.extend(self._port.additional_drt_flag())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
