Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 W3C Web Platform Tests in Blink Layout Tests | 1 W3C Web Platform Tests in Blink Layout Tests |
| 2 | 2 |
| 3 Design Doc: https://goo.gl/iXUaZd | 3 Design Doc: https://goo.gl/iXUaZd |
| 4 | 4 |
| 5 This directory contains checked out and reduced code from web-platform-tests | 5 This directory contains checked out and reduced code from web-platform-tests |
| 6 (https://github.com/w3c/web-platform-tests/) required to run WPT tests as part | 6 (https://github.com/w3c/web-platform-tests/) required to run WPT tests as part |
| 7 of Blink's test infrastructure and some maintenance/configuration code. | 7 of Blink's test infrastructure and some maintenance/configuration code. |
| 8 | 8 |
| 9 The third party code lives entirely in the wpt subdirectory: | 9 The third party code lives entirely in the wpt subdirectory: |
| 10 Tools/Scripts/webkitpy/thirdparty/wpt/wpt | 10 Tools/Scripts/webkitpy/thirdparty/wpt/wpt |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 41 First line: HEAD position for web-platform-tests. | 41 First line: HEAD position for web-platform-tests. |
| 42 Rest of lines: parent directory, submodule name, HEAD position for submodule. | 42 Rest of lines: parent directory, submodule name, HEAD position for submodule. |
| 43 The submodule checkout is performed in order when running ./checkout.sh. | 43 The submodule checkout is performed in order when running ./checkout.sh. |
| 44 | 44 |
| 45 WPTWhiteList | 45 WPTWhiteList |
| 46 ============ | 46 ============ |
| 47 The explicit list of files being kept, everything else not on this list is | 47 The explicit list of files being kept, everything else not on this list is |
| 48 deleted when running "./checkout.sh reduce". Use this file to control what gets | 48 deleted when running "./checkout.sh reduce". Use this file to control what gets |
| 49 checked in and try to keep the list as small as possible (use what you need). | 49 checked in and try to keep the list as small as possible (use what you need). |
| 50 | 50 |
| 51 certs/ | |
| 52 ====== | |
| 53 This directory contains a private key and a certificate of WPTServe, and files | |
| 54 for self-signed CA. WPTServe generates them on the fly with "openssl" command in | |
| 55 the default setting, but we check in pre-generated files to avoid "openssl" | |
|
qyearsley
2016/10/20 16:34:39
Possible minor rephrasing:
"WPTServe generates the
tkent
2016/10/24 04:14:40
I'll make a CL for this.
| |
| 56 dependency. | |
| 57 | |
| 58 These certificates will expire in January 2025. Here is an instruction to | |
| 59 re-generate them: | |
| 60 | |
| 61 1. Add "openssl" command to PATH. | |
| 62 2. Apply the following change locally: | |
| 63 | |
| 64 diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt.config .json b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt.config.json | |
| 65 index 6243954..84fd3f4 100644 | |
| 66 --- a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt.config.json | |
| 67 +++ b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt.config.json | |
| 68 @@ -9,13 +9,5 @@ | |
| 69 "https": [8444], | |
| 70 "ws": [9001], | |
| 71 "wss": [9444] | |
| 72 - }, | |
| 73 - "ssl": { | |
| 74 - "type": "pregenerated", | |
| 75 - "encrypt_after_connect": false, | |
| 76 - "pregenerated": { | |
| 77 - "host_key_path": "../certs/127.0.0.1.key", | |
| 78 - "host_cert_path": "../certs/127.0.0.1.pem" | |
| 79 - } | |
| 80 } | |
| 81 } | |
| 82 diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/ sslutils/openssl.py b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/w pt/tools/sslutils/openssl.py | |
| 83 index 5b571c0..223a18b 100644 | |
| 84 --- a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/sslutil s/openssl.py | |
| 85 +++ b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/sslutil s/openssl.py | |
| 86 @@ -207,7 +207,7 @@ class OpenSSLEnvironment(object): | |
| 87 | |
| 88 def __init__(self, logger, openssl_binary="openssl", base_path=None, | |
| 89 password="web-platform-tests", force_regenerate=False, | |
| 90 - duration=30, base_conf_path=None): | |
| 91 + duration=3000, base_conf_path=None): | |
| 92 """SSL environment that creates a local CA and host certificate using O penSSL. | |
| 93 | |
| 94 By default this will look in base_path for existing certificates that a re still | |
| 95 | |
| 96 3. Run third_party/WebKit/Tools/Scripts/run-blink-wptserve | |
| 97 4. Type Enter key to terminate it. | |
| 98 5. Revert the local change. e.g. git reset --hard HEAD | |
| 99 6. Replace certs/ with wpt/_certs/ | |
| 100 % rm -fr certs | |
| 101 % mv wpt/_certs certs | |
| 102 7. Look at *.pem, and update "January 2025" in this document to new expiration | |
| 103 date. | |
| 104 8. git commit -a | |
| 105 9. git cl upload, etc. | |
| 106 | |
| 51 ** | 107 ** |
| 52 | 108 |
| 53 Rolling in WPT | 109 Rolling in WPT |
| 54 | 110 |
| 55 When rolling in new versions of WPT support, use WPTHeads to adjust the HEAD | 111 When rolling in new versions of WPT support, use WPTHeads to adjust the HEAD |
| 56 positions. You can then call "./checkout.sh clone" which will pull in all the | 112 positions. You can then call "./checkout.sh clone" which will pull in all the |
| 57 code and required submodules. | 113 code and required submodules. |
| 58 | 114 |
| 59 You can check in the latest code by setting the HEAD commit-ish to "master" on | 115 You can check in the latest code by setting the HEAD commit-ish to "master" on |
| 60 each line, afterwards make sure to use the actual SHA1s to lock down the HEAD | 116 each line, afterwards make sure to use the actual SHA1s to lock down the HEAD |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 99 (instead of a filename). The document root http://web-platform.test/ maps to | 155 (instead of a filename). The document root http://web-platform.test/ maps to |
| 100 LayoutTests/imported/wpt. HTTPS tests are enabled by default. | 156 LayoutTests/imported/wpt. HTTPS tests are enabled by default. |
| 101 | 157 |
| 102 Example run: | 158 Example run: |
| 103 | 159 |
| 104 ./Tools/Scripts/run-webkit-tests \ | 160 ./Tools/Scripts/run-webkit-tests \ |
| 105 --debug \ | 161 --debug \ |
| 106 --enable-wptserve \ | 162 --enable-wptserve \ |
| 107 --no-new-test-results \ | 163 --no-new-test-results \ |
| 108 imported/wpt | 164 imported/wpt |
| OLD | NEW |