<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[184408] branches/safari-600.7-branch/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184408">184408</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-15 13:21:10 -0700 (Fri, 15 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/182018">r182018</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/181280">r181280</a>.
2015-03-26 Jer Noble <jer.noble@apple.com>
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 <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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6007branchToolsChangeLog">branches/safari-600.7-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6007branchToolsScriptswebkitpylayout_testsrun_webkit_testspy">branches/safari-600.7-branch/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py</a></li>
<li><a href="#branchessafari6007branchToolsScriptswebkitpyportbasepy">branches/safari-600.7-branch/Tools/Scripts/webkitpy/port/base.py</a></li>
<li><a href="#branchessafari6007branchToolsScriptswebkitpyportdriverpy">branches/safari-600.7-branch/Tools/Scripts/webkitpy/port/driver.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6007branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.7-branch/Tools/ChangeLog (184407 => 184408)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2015-05-15 Ryosuke Niwa <rniwa@webkit.org>
+
+ Merge r182018 and r181280.
+
+ 2015-03-26 Jer Noble <jer.noble@apple.com>
+
+ 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 <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):
+
</ins><span class="cx"> 2015-04-29 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r183471 and r183474.
</span></span></pre></div>
<a id="branchessafari6007branchToolsScriptswebkitpylayout_testsrun_webkit_testspy"></a>
<div class="modfile"><h4>Modified: branches/safari-600.7-branch/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (184407 => 184408)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -208,6 +208,8 @@
</span><span class="cx"> optparse.make_option("--nojava", action="store_true",
</span><span class="cx"> default=False,
</span><span class="cx"> help="Don't build java support files"),
</span><ins>+ optparse.make_option("--layout-tests-directory", action="store", default=None,
+ help="Override the default layout test directory.", dest="layout_tests_dir")
</ins><span class="cx"> ]))
</span><span class="cx">
</span><span class="cx"> option_group_definitions.append(("Testing Options", [
</span><span class="lines">@@ -309,6 +311,8 @@
</span><span class="cx"> help=("The name of an additional subversion or git checkout")),
</span><span class="cx"> optparse.make_option("--additional-repository-path",
</span><span class="cx"> help=("The path to an additional subversion or git checkout (requires --additional-repository-name)")),
</span><ins>+ optparse.make_option("--allowed-host", type="string", action="append", default=[],
+ help=("If specified, tests are allowed to make requests to the specified hostname."))
</ins><span class="cx"> ]))
</span><span class="cx">
</span><span class="cx"> option_parser = optparse.OptionParser()
</span></span></pre></div>
<a id="branchessafari6007branchToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: branches/safari-600.7-branch/Tools/Scripts/webkitpy/port/base.py (184407 => 184408)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -132,6 +132,7 @@
</span><span class="cx"> self._reftest_list = {}
</span><span class="cx"> self._results_directory = None
</span><span class="cx"> self._root_was_set = hasattr(options, 'root') and options.root
</span><ins>+ self._layout_tests_dir = hasattr(options, 'layout_tests_dir') and options.layout_tests_dir and self._filesystem.abspath(options.layout_tests_dir)
</ins><span class="cx">
</span><span class="cx"> def additional_drt_flag(self):
</span><span class="cx"> return []
</span><span class="lines">@@ -667,6 +668,8 @@
</span><span class="cx"> return self._webkit_finder.path_to_script(script_name)
</span><span class="cx">
</span><span class="cx"> def layout_tests_dir(self):
</span><ins>+ if self._layout_tests_dir:
+ return self._layout_tests_dir
</ins><span class="cx"> return self._webkit_finder.layout_tests_dir()
</span><span class="cx">
</span><span class="cx"> def perf_tests_dir(self):
</span><span class="lines">@@ -1038,6 +1041,8 @@
</span><span class="cx"> repository_paths += [(self._options.additional_repository_name, self._options.additional_repository_path)]
</span><span class="cx"> return repository_paths
</span><span class="cx">
</span><ins>+ def allowed_hosts(self):
+ return self.get_option("allowed_host", [])
</ins><span class="cx">
</span><span class="cx"> def default_configuration(self):
</span><span class="cx"> return self._config.default_configuration()
</span></span></pre></div>
<a id="branchessafari6007branchToolsScriptswebkitpyportdriverpy"></a>
<div class="modfile"><h4>Modified: branches/safari-600.7-branch/Tools/Scripts/webkitpy/port/driver.py (184407 => 184408)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -346,6 +346,10 @@
</span><span class="cx"> cmd.append('--no-timeout')
</span><span class="cx"> # FIXME: We need to pass --timeout=SECONDS to WebKitTestRunner for WebKit2.
</span><span class="cx">
</span><ins>+ for allowed_host in self._port.allowed_hosts():
+ cmd.append('--allowed-host')
+ cmd.append(allowed_host)
+
</ins><span class="cx"> cmd.extend(self._port.get_option('additional_drt_flag', []))
</span><span class="cx"> cmd.extend(self._port.additional_drt_flag())
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>