<!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>[203987] trunk</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/203987">203987</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-08-01 14:06:36 -0700 (Mon, 01 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make wpt server generate its certificates in layout test results folder
https://bugs.webkit.org/show_bug.cgi?id=160422
Patch by Youenn Fablet <youenn@apple.com> on 2016-08-01
Reviewed by Chris Dumez.
LayoutTests/imported/w3c:
* resources/_wpt_certs/.gitignore: Removed.
* resources/_wpt_certs/localhost.key: Removed.
* resources/_wpt_certs/localhost.pem: Removed.
* resources/config.json:
Tools:
* Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
(WebPlatformTestServer._copy_webkit_test_files): Setting certificate folder to layout tests results directory.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cresourcesconfigjson">trunk/LayoutTests/imported/w3c/resources/config.json</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsserversweb_platform_test_serverpy">trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/LayoutTests/imported/w3c/resources/_wpt_certs/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (203986 => 203987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-01 21:03:44 UTC (rev 203986)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-01 21:06:36 UTC (rev 203987)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-01 Youenn Fablet <youenn@apple.com>
+
+ Make wpt server generate its certificates in layout test results folder
+ https://bugs.webkit.org/show_bug.cgi?id=160422
+
+ Reviewed by Chris Dumez.
+
+ * resources/_wpt_certs/.gitignore: Removed.
+ * resources/_wpt_certs/localhost.key: Removed.
+ * resources/_wpt_certs/localhost.pem: Removed.
+ * resources/config.json:
+
</ins><span class="cx"> 2016-07-30 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable strict type checking for Window dictionary members
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cresourcesconfigjson"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/resources/config.json (203986 => 203987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/resources/config.json 2016-08-01 21:03:44 UTC (rev 203986)
+++ trunk/LayoutTests/imported/w3c/resources/config.json 2016-08-01 21:06:36 UTC (rev 203987)
</span><span class="lines">@@ -10,12 +10,11 @@
</span><span class="cx"> "openssl": {
</span><span class="cx"> "openssl_binary": "openssl",
</span><span class="cx"> "base_path": "%CERTS_DIR%",
</span><del>- "base_conf_path": null,
</del><span class="cx"> "force_regenerate": false
</span><span class="cx"> },
</span><span class="cx"> "pregenerated": {
</span><del>- "host_key_path": "%CERTS_DIR%/localhost.key",
- "host_cert_path": "%CERTS_DIR%/localhost.pem"
</del><ins>+ "host_key_path": null,
+ "host_cert_path": null
</ins><span class="cx"> },
</span><span class="cx"> "none": {}
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (203986 => 203987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-01 21:03:44 UTC (rev 203986)
+++ trunk/Tools/ChangeLog 2016-08-01 21:06:36 UTC (rev 203987)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-08-01 Youenn Fablet <youenn@apple.com>
+
+ Make wpt server generate its certificates in layout test results folder
+ https://bugs.webkit.org/show_bug.cgi?id=160422
+
+ Reviewed by Chris Dumez.
+
+ * Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
+ (WebPlatformTestServer._copy_webkit_test_files): Setting certificate folder to layout tests results directory.
+
</ins><span class="cx"> 2016-08-01 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><span class="cx"> Function Call on NULL Object
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsserversweb_platform_test_serverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py (203986 => 203987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py 2016-08-01 21:03:44 UTC (rev 203986)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py 2016-08-01 21:06:36 UTC (rev 203987)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> _log.debug('Copying WebKit web platform server config.json')
</span><span class="cx"> config_wk_filename = self._filesystem.join(self._layout_root, "imported", "w3c", "resources", "config.json")
</span><span class="cx"> if self._filesystem.isfile(config_wk_filename):
</span><del>- config_json = self._filesystem.read_text_file(config_wk_filename).replace("%CERTS_DIR%", self._filesystem.join(self._layout_root, "imported", "w3c", "resources", "_wpt_certs"))
</del><ins>+ config_json = self._filesystem.read_text_file(config_wk_filename).replace("%CERTS_DIR%", self._filesystem.join(self._output_dir, "_wpt_certs"))
</ins><span class="cx"> self._filesystem.write_text_file(self._filesystem.join(self._doc_root, "config.json"), config_json)
</span><span class="cx">
</span><span class="cx"> wpt_testharnessjs_file = self._filesystem.join(self._doc_root, "resources", "testharness.js")
</span></span></pre>
</div>
</div>
</body>
</html>