auto merge of #5210 : GreenRecycleBin/servo/#4968, r=jdm

`./mach test tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/security_location_0.sub.htm` is still failing with the same message as reported in #3219.
This commit is contained in:
bors-servo 2015-03-16 11:42:59 -06:00
commit cf39c672b6
3 changed files with 14 additions and 4 deletions

6
tests/wpt/hosts Normal file
View file

@ -0,0 +1,6 @@
127.0.0.1 web-platform.test
127.0.0.1 www.web-platform.test
127.0.0.1 www1.web-platform.test
127.0.0.1 www2.web-platform.test
127.0.0.1 xn--n8j6ds53lwwkrqhv28a.web-platform.test
127.0.0.1 xn--lve-6lad.web-platform.test