| 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 - "host_key_path": "../certs/127.0.0.1.key", | 77 - "host_key_path": "../certs/127.0.0.1.key", |
| 78 - "host_cert_path": "../certs/127.0.0.1.pem" | 78 - "host_cert_path": "../certs/127.0.0.1.pem" |
| 79 - } | 79 - } |
| 80 } | 80 } |
| 81 } | 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 | 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 | 83 index 5b571c0..223a18b 100644 |
| 84 --- a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/sslutil
s/openssl.py | 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 | 85 +++ b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/sslutil
s/openssl.py |
| 86 @@ -207,7 +207,7 @@ class OpenSSLEnvironment(object): | 86 @@ -207,7 +207,7 @@ class OpenSSLEnvironment(object): |
| 87 | 87 |
| 88 def __init__(self, logger, openssl_binary="openssl", base_path=None, | 88 def __init__(self, logger, openssl_binary="openssl", base_path=None, |
| 89 password="web-platform-tests", force_regenerate=False, | 89 password="web-platform-tests", force_regenerate=False, |
| 90 - duration=30, base_conf_path=None): | 90 - duration=30, base_conf_path=None): |
| 91 + duration=3000, 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. | 92 """SSL environment that creates a local CA and host certificate using O
penSSL. |
| 93 | 93 |
| 94 By default this will look in base_path for existing certificates that a
re still | 94 By default this will look in base_path for existing certificates that a
re still |
| 95 | 95 |
| 96 3. Run third_party/WebKit/Tools/Scripts/run-blink-wptserve | 96 3. Run third_party/WebKit/Tools/Scripts/run-blink-wptserve |
| 97 4. Type Enter key to terminate it. | 97 4. Type Enter key to terminate it. |
| 98 5. Revert the local change. e.g. git reset --hard HEAD | 98 5. Revert the local change. e.g. git reset --hard HEAD |
| 99 6. Replace certs/ with wpt/_certs/ | 99 6. Replace certs/ with wpt/_certs/ |
| 100 % rm -fr certs | 100 % rm -fr certs |
| 101 % mv wpt/_certs certs | 101 % mv wpt/_certs certs |
| 102 7. Look at *.pem, and update "January 2025" in this document and expiration_date | 102 7. Look at *.pem, and update "January 2025" in this document and expiration_date |
| 103 in wptserve.py to new expiration date. | 103 in wptserve.py to new expiration date. |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 (https://wptserve.readthedocs.org/en/latest/). | 139 (https://wptserve.readthedocs.org/en/latest/). |
| 140 | 140 |
| 141 Note that editing /etc/hosts is not required for run-webkit-tests since | 141 Note that editing /etc/hosts is not required for run-webkit-tests since |
| 142 content_shell is invoked with flags to map all *.test domains to 127.0.0.1. | 142 content_shell is invoked with flags to map all *.test domains to 127.0.0.1. |
| 143 | 143 |
| 144 ** | 144 ** |
| 145 | 145 |
| 146 Running web-platform-tests with enabled WPTServe on a local machine | 146 Running web-platform-tests with enabled WPTServe on a local machine |
| 147 | 147 |
| 148 Starting run-webkit-tests with the --enable-wptserve flag will start WPTServe | 148 Starting run-webkit-tests with the --enable-wptserve flag will start WPTServe |
| 149 for tests which live in LayoutTests/imported/wpt. | 149 for tests which live in LayoutTests/external/wpt. |
| 150 | 150 |
| 151 WPTServe starts HTTP/S and WS/S servers as separate processes. | 151 WPTServe starts HTTP/S and WS/S servers as separate processes. |
| 152 | 152 |
| 153 The content_shell used to run the tests will receive the URL of each test | 153 The content_shell used to run the tests will receive the URL of each test |
| 154 (instead of a filename). The document root http://web-platform.test/ maps to | 154 (instead of a filename). The document root http://web-platform.test/ maps to |
| 155 LayoutTests/imported/wpt. HTTPS tests are enabled by default. | 155 LayoutTests/external/wpt. HTTPS tests are enabled by default. |
| 156 | 156 |
| 157 Example run: | 157 Example run: |
| 158 | 158 |
| 159 ./Tools/Scripts/run-webkit-tests --enable-wptserve imported/wpt | 159 ./Tools/Scripts/run-webkit-tests --enable-wptserve external/wpt |
| OLD | NEW |