Changeset 203987 in webkit

Timestamp:

Aug 1, 2016 2:06:36 PM (8 years ago)

Author:

Chris Dumez

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 <​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.

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/resources/_wpt_certs (deleted)
• LayoutTests/imported/w3c/resources/config.json (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+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:
+
 2016-07-30  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/imported/w3c/resources/config.json

@@ -11 +11 @@
              "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": {}

trunk/Tools/ChangeLog

@@ +1 @@
+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.
+
 2016-08-01  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py

@@ -116 +116 @@
         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)