Title: [203987] trunk
- Revision
- 203987
- Author
- [email protected]
- Date
- 2016-08-01 14:06:36 -0700 (Mon, 01 Aug 2016)
Log Message
Make wpt server generate its certificates in layout test results folder
https://bugs.webkit.org/show_bug.cgi?id=160422
Patch by Youenn Fablet <[email protected]> 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.
Modified Paths
Removed Paths
- trunk/LayoutTests/imported/w3c/resources/_wpt_certs/
Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (203986 => 203987)
--- 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)
@@ -1,3 +1,15 @@
+2016-08-01 Youenn Fablet <[email protected]>
+
+ 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:
+
2016-07-30 Chris Dumez <[email protected]>
Enable strict type checking for Window dictionary members
Modified: trunk/LayoutTests/imported/w3c/resources/config.json (203986 => 203987)
--- 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)
@@ -10,12 +10,11 @@
"openssl": {
"openssl_binary": "openssl",
"base_path": "%CERTS_DIR%",
- "base_conf_path": null,
"force_regenerate": false
},
"pregenerated": {
- "host_key_path": "%CERTS_DIR%/localhost.key",
- "host_cert_path": "%CERTS_DIR%/localhost.pem"
+ "host_key_path": null,
+ "host_cert_path": null
},
"none": {}
}
Modified: trunk/Tools/ChangeLog (203986 => 203987)
--- trunk/Tools/ChangeLog 2016-08-01 21:03:44 UTC (rev 203986)
+++ trunk/Tools/ChangeLog 2016-08-01 21:06:36 UTC (rev 203987)
@@ -1,3 +1,13 @@
+2016-08-01 Youenn Fablet <[email protected]>
+
+ 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.
+
2016-08-01 Jonathan Bedard <[email protected]>
Function Call on NULL Object
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py (203986 => 203987)
--- 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)
@@ -115,7 +115,7 @@
_log.debug('Copying WebKit web platform server config.json')
config_wk_filename = self._filesystem.join(self._layout_root, "imported", "w3c", "resources", "config.json")
if self._filesystem.isfile(config_wk_filename):
- config_json = self._filesystem.read_text_file(config_wk_filename).replace("%CERTS_DIR%", self._filesystem.join(self._layout_root, "imported", "w3c", "resources", "_wpt_certs"))
+ config_json = self._filesystem.read_text_file(config_wk_filename).replace("%CERTS_DIR%", self._filesystem.join(self._output_dir, "_wpt_certs"))
self._filesystem.write_text_file(self._filesystem.join(self._doc_root, "config.json"), config_json)
wpt_testharnessjs_file = self._filesystem.join(self._doc_root, "resources", "testharness.js")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
