From da50824655529f55f786f0f55906ac8bf30955e6 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 16 Oct 2014 18:14:42 +0200 Subject: [PATCH] Update wptrunner to pick up crash-detection fixes. --- .../metadata/XMLHttpRequest/open-url-encoding.htm.ini | 2 +- .../open-url-javascript-window-2.htm.ini | 5 +---- .../XMLHttpRequest/open-url-javascript-window.htm.ini | 5 +---- .../XMLHttpRequest/send-content-type-string.htm.ini | 2 +- .../XMLHttpRequest/send-entity-body-document.htm.ini | 2 +- .../xmlhttprequest-timeout-abortedonmain.html.ini | 2 +- .../xmlhttprequest-timeout-overrides.html.ini | 2 +- .../xmlhttprequest-timeout-overridesexpires.html.ini | 2 +- .../nodes/Document-createElement-namespace.html.ini | 2 +- .../wpt/metadata/dom/nodes/Element-children.html.ini | 2 +- .../traversal/TreeWalker-acceptNode-filter.html.ini | 2 +- .../read-text/load-text-plain.html.ini | 11 +---------- .../security_location_0.sub.htm.ini | 2 +- .../indexed-browsing-contexts-01.html.ini | 2 +- .../security-window/window-security.sub.html.ini | 2 +- .../dom-tree-accessors/document.forms.html.ini | 2 +- .../urls/terminology-0/document-base-url.html.ini | 2 +- tests/wpt/run.sh | 2 +- 18 files changed, 18 insertions(+), 33 deletions(-) diff --git a/tests/wpt/metadata/XMLHttpRequest/open-url-encoding.htm.ini b/tests/wpt/metadata/XMLHttpRequest/open-url-encoding.htm.ini index 80b921e50af..fbfed5cf272 100644 --- a/tests/wpt/metadata/XMLHttpRequest/open-url-encoding.htm.ini +++ b/tests/wpt/metadata/XMLHttpRequest/open-url-encoding.htm.ini @@ -1,3 +1,3 @@ [open-url-encoding.htm] type: testharness - expected: TIMEOUT + expected: CRASH diff --git a/tests/wpt/metadata/XMLHttpRequest/open-url-javascript-window-2.htm.ini b/tests/wpt/metadata/XMLHttpRequest/open-url-javascript-window-2.htm.ini index f48486261eb..6d1f9891ef4 100644 --- a/tests/wpt/metadata/XMLHttpRequest/open-url-javascript-window-2.htm.ini +++ b/tests/wpt/metadata/XMLHttpRequest/open-url-javascript-window-2.htm.ini @@ -1,6 +1,3 @@ [open-url-javascript-window-2.htm] type: testharness - expected: TIMEOUT - [XMLHttpRequest: open() - resolving URLs (javascript: ] - expected: TIMEOUT - + expected: CRASH diff --git a/tests/wpt/metadata/XMLHttpRequest/open-url-javascript-window.htm.ini b/tests/wpt/metadata/XMLHttpRequest/open-url-javascript-window.htm.ini index b52449895eb..3500ec34096 100644 --- a/tests/wpt/metadata/XMLHttpRequest/open-url-javascript-window.htm.ini +++ b/tests/wpt/metadata/XMLHttpRequest/open-url-javascript-window.htm.ini @@ -1,6 +1,3 @@ [open-url-javascript-window.htm] type: testharness - expected: TIMEOUT - [XMLHttpRequest: open() - resolving URLs (javascript: ] - expected: TIMEOUT - + expected: CRASH diff --git a/tests/wpt/metadata/XMLHttpRequest/send-content-type-string.htm.ini b/tests/wpt/metadata/XMLHttpRequest/send-content-type-string.htm.ini index 3fb54f00638..5cd8ba36901 100644 --- a/tests/wpt/metadata/XMLHttpRequest/send-content-type-string.htm.ini +++ b/tests/wpt/metadata/XMLHttpRequest/send-content-type-string.htm.ini @@ -1,3 +1,3 @@ [send-content-type-string.htm] type: testharness - expected: TIMEOUT + expected: CRASH diff --git a/tests/wpt/metadata/XMLHttpRequest/send-entity-body-document.htm.ini b/tests/wpt/metadata/XMLHttpRequest/send-entity-body-document.htm.ini index d35f507ee10..d3c5b4afeaf 100644 --- a/tests/wpt/metadata/XMLHttpRequest/send-entity-body-document.htm.ini +++ b/tests/wpt/metadata/XMLHttpRequest/send-entity-body-document.htm.ini @@ -1,3 +1,3 @@ [send-entity-body-document.htm] type: testharness - expected: TIMEOUT + expected: CRASH diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html.ini index a8bb968e3c2..6665862bc4a 100644 --- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html.ini +++ b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html.ini @@ -1,3 +1,3 @@ [xmlhttprequest-timeout-abortedonmain.html] type: testharness - expected: TIMEOUT + expected: CRASH diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overrides.html.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overrides.html.ini index e767ee33d53..1b57172bf86 100644 --- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overrides.html.ini +++ b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overrides.html.ini @@ -1,3 +1,3 @@ [xmlhttprequest-timeout-overrides.html] type: testharness - expected: TIMEOUT + expected: CRASH diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html.ini index d957c5c0fc9..e2d7d3d215e 100644 --- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html.ini +++ b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html.ini @@ -1,3 +1,3 @@ [xmlhttprequest-timeout-overridesexpires.html] type: testharness - expected: TIMEOUT + expected: CRASH diff --git a/tests/wpt/metadata/dom/nodes/Document-createElement-namespace.html.ini b/tests/wpt/metadata/dom/nodes/Document-createElement-namespace.html.ini index 43f2e92d311..1b6854862e9 100644 --- a/tests/wpt/metadata/dom/nodes/Document-createElement-namespace.html.ini +++ b/tests/wpt/metadata/dom/nodes/Document-createElement-namespace.html.ini @@ -1,3 +1,3 @@ [Document-createElement-namespace.html] type: testharness - expected: TIMEOUT + expected: CRASH diff --git a/tests/wpt/metadata/dom/nodes/Element-children.html.ini b/tests/wpt/metadata/dom/nodes/Element-children.html.ini index 04fc3d710e7..3a571e8e438 100644 --- a/tests/wpt/metadata/dom/nodes/Element-children.html.ini +++ b/tests/wpt/metadata/dom/nodes/Element-children.html.ini @@ -1,3 +1,3 @@ [Element-children.html] type: testharness - expected: TIMEOUT + expected: CRASH diff --git a/tests/wpt/metadata/dom/traversal/TreeWalker-acceptNode-filter.html.ini b/tests/wpt/metadata/dom/traversal/TreeWalker-acceptNode-filter.html.ini index 9b0db70b79f..a0c22ee211b 100644 --- a/tests/wpt/metadata/dom/traversal/TreeWalker-acceptNode-filter.html.ini +++ b/tests/wpt/metadata/dom/traversal/TreeWalker-acceptNode-filter.html.ini @@ -1,3 +1,3 @@ [TreeWalker-acceptNode-filter.html] type: testharness - expected: TIMEOUT + expected: CRASH diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/read-text/load-text-plain.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/read-text/load-text-plain.html.ini index 495e93a7e77..ef67f52ba2a 100644 --- a/tests/wpt/metadata/html/browsers/browsing-the-web/read-text/load-text-plain.html.ini +++ b/tests/wpt/metadata/html/browsers/browsing-the-web/read-text/load-text-plain.html.ini @@ -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 diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/security_location_0.sub.htm.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/security_location_0.sub.htm.ini index 4fce674a828..71a53f995de 100644 --- a/tests/wpt/metadata/html/browsers/history/the-location-interface/security_location_0.sub.htm.ini +++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/security_location_0.sub.htm.ini @@ -1,3 +1,3 @@ [security_location_0.sub.htm] type: testharness - expected: TIMEOUT + expected: CRASH diff --git a/tests/wpt/metadata/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-01.html.ini index 19b4a545246..78d71273bda 100644 --- a/tests/wpt/metadata/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-01.html.ini +++ b/tests/wpt/metadata/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-01.html.ini @@ -1,3 +1,3 @@ [indexed-browsing-contexts-01.html] type: testharness - expected: TIMEOUT + expected: CRASH diff --git a/tests/wpt/metadata/html/browsers/the-window-object/security-window/window-security.sub.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/security-window/window-security.sub.html.ini index 094b761fee0..047d3a00e60 100644 --- a/tests/wpt/metadata/html/browsers/the-window-object/security-window/window-security.sub.html.ini +++ b/tests/wpt/metadata/html/browsers/the-window-object/security-window/window-security.sub.html.ini @@ -1,3 +1,3 @@ [window-security.sub.html] type: testharness - expected: TIMEOUT + expected: CRASH diff --git a/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/document.forms.html.ini b/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/document.forms.html.ini index c821b408220..1d1cad91e2e 100644 --- a/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/document.forms.html.ini +++ b/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/document.forms.html.ini @@ -1,3 +1,3 @@ [document.forms.html] type: testharness - expected: TIMEOUT + expected: CRASH diff --git a/tests/wpt/metadata/html/infrastructure/urls/terminology-0/document-base-url.html.ini b/tests/wpt/metadata/html/infrastructure/urls/terminology-0/document-base-url.html.ini index 5f3d336c63e..e001caff59b 100644 --- a/tests/wpt/metadata/html/infrastructure/urls/terminology-0/document-base-url.html.ini +++ b/tests/wpt/metadata/html/infrastructure/urls/terminology-0/document-base-url.html.ini @@ -1,3 +1,3 @@ [document-base-url.html] type: testharness - expected: TIMEOUT + expected: CRASH diff --git a/tests/wpt/run.sh b/tests/wpt/run.sh index 005fc70eecd..12bddae9eda 100755 --- a/tests/wpt/run.sh +++ b/tests/wpt/run.sh @@ -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 \