auto merge of #3700 : Ms2ger/servo/update-wptrunner, r=jdm

This commit is contained in:
bors-servo 2014-10-17 06:33:19 -06:00
commit a1efb79cf4
18 changed files with 18 additions and 33 deletions

View file

@ -1,3 +1,3 @@
[open-url-encoding.htm]
type: testharness
expected: TIMEOUT
expected: CRASH

View file

@ -1,6 +1,3 @@
[open-url-javascript-window-2.htm]
type: testharness
expected: TIMEOUT
[XMLHttpRequest: open() - resolving URLs (javascript: ]
expected: TIMEOUT
expected: CRASH

View file

@ -1,6 +1,3 @@
[open-url-javascript-window.htm]
type: testharness
expected: TIMEOUT
[XMLHttpRequest: open() - resolving URLs (javascript: ]
expected: TIMEOUT
expected: CRASH

View file

@ -1,3 +1,3 @@
[send-content-type-string.htm]
type: testharness
expected: TIMEOUT
expected: CRASH

View file

@ -1,3 +1,3 @@
[send-entity-body-document.htm]
type: testharness
expected: TIMEOUT
expected: CRASH

View file

@ -1,3 +1,3 @@
[xmlhttprequest-timeout-abortedonmain.html]
type: testharness
expected: TIMEOUT
expected: CRASH

View file

@ -1,3 +1,3 @@
[xmlhttprequest-timeout-overrides.html]
type: testharness
expected: TIMEOUT
expected: CRASH

View file

@ -1,3 +1,3 @@
[xmlhttprequest-timeout-overridesexpires.html]
type: testharness
expected: TIMEOUT
expected: CRASH

View file

@ -1,3 +1,3 @@
[Document-createElement-namespace.html]
type: testharness
expected: TIMEOUT
expected: CRASH

View file

@ -1,3 +1,3 @@
[Element-children.html]
type: testharness
expected: TIMEOUT
expected: CRASH

View file

@ -1,3 +1,3 @@
[TreeWalker-acceptNode-filter.html]
type: testharness
expected: TIMEOUT
expected: CRASH

View file

@ -1,12 +1,3 @@
[load-text-plain.html]
type: testharness
expected: TIMEOUT
[Checking document metadata for text file]
expected: NOTRUN
[Checking DOM for text file]
expected: NOTRUN
[Checking contents for text file]
expected: NOTRUN
expected: CRASH

View file

@ -1,3 +1,3 @@
[security_location_0.sub.htm]
type: testharness
expected: TIMEOUT
expected: CRASH

View file

@ -1,3 +1,3 @@
[indexed-browsing-contexts-01.html]
type: testharness
expected: TIMEOUT
expected: CRASH

View file

@ -1,3 +1,3 @@
[window-security.sub.html]
type: testharness
expected: TIMEOUT
expected: CRASH

View file

@ -1,3 +1,3 @@
[document.forms.html]
type: testharness
expected: TIMEOUT
expected: CRASH

View file

@ -1,3 +1,3 @@
[document-base-url.html]
type: testharness
expected: TIMEOUT
expected: CRASH

View file

@ -16,7 +16,7 @@ source _virtualenv/bin/activate
if [[ $* == *--update-manifest* ]]; then
(python -c "import html5lib" &>/dev/null) || pip install html5lib
fi
(python -c "import wptrunner" &>/dev/null) || pip install 'wptrunner==1.3'
(python -c "import wptrunner" &>/dev/null) || pip install 'wptrunner==1.5'
python $servo_root/tests/wpt/run.py \
--config $servo_root/tests/wpt/config.ini \