Update web-platform-tests to revision 1d3af70cfecdc12d737f50cda0f402b092797201.

This commit is contained in:
Ms2ger 2015-05-17 13:59:21 +02:00
parent 5b47db447d
commit b9a01881f8
10 changed files with 135 additions and 4825 deletions

View file

@ -17,8 +17,8 @@ Running the Tests
The tests are designed to be run from your local computer. The test
environment requires Python 2.7+ (but not Python 3.x). You will also
need a copy of OpenSSL. For users on Windows this is available from
[the openssl website](https://www.openssl.org/related/binaries.html).
need a copy of OpenSSL. Users on Windows should read the
[Windows Notes](#windows-notes) section below.
To get the tests running, you need to set up the test domains in your
[`hosts` file](http://en.wikipedia.org/wiki/Hosts_%28file%29%23Location_in_the_file_system). The
@ -71,6 +71,26 @@ like:
"ssl": {"openssl": {"binary": "/path/to/openssl"}}
```
<span id="windows-notes">Windows Notes</span>
=============================================
Running wptserve with SSL enabled on Windows typically requires
installing an OpenSSL distribution.
[Shining Light](http://slproweb.com/products/Win32OpenSSL.html)
provide a convenient installer that is known to work, but requires a
little extra setup.
After installation ensure that the path to OpenSSL is on your `%Path%`
environment variable.
Then set the path to the default OpenSSL configuration file (usually
something like `C:\OpenSSL-Win32\bin\openssl.cfg` in the server
configuration. To do this copy `config.default.json` in the
web-platform-tests root to `config.json`. Then edit the JSON so that
the key `ssl/openssl/base_conf_path` has a value that is the path to
the OpenSSL config file.
Test Runner
===========