diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-07-24 16:29:05 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-07-24 16:29:05 -0600 |
commit | 135ef35f6dee05d7f06caef335bfe726a0a1b55a (patch) | |
tree | 2e21257299b4551569b39721e7ffe7e6b6a04922 | |
parent | cdcecaef04e8450b139d2e4b7d06c8fe7a035903 (diff) | |
parent | 65785e2c44fac482e2d5b325ec2d4cb1602088bc (diff) | |
download | servo-135ef35f6dee05d7f06caef335bfe726a0a1b55a.tar.gz servo-135ef35f6dee05d7f06caef335bfe726a0a1b55a.zip |
Auto merge of #6736 - jdm:wptexpectrelease, r=jdm
Disable a test that intermittently crashes in release builds. Update …
…expectations for relevant-mutations.html to account for differences in release builds.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6736)
<!-- Reviewable:end -->
-rw-r--r-- | tests/wpt/metadata/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini | 1 | ||||
-rw-r--r-- | tests/wpt/metadata/webstorage/storage_local_setitem_quotaexceedederr.html.ini | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini index 7e20c7aa0eb..3af7d2696d2 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini @@ -1,6 +1,7 @@ [relevant-mutations.html] type: testharness expected: TIMEOUT + disabled: unstable failures and timeouts in release builds [src removed] expected: TIMEOUT diff --git a/tests/wpt/metadata/webstorage/storage_local_setitem_quotaexceedederr.html.ini b/tests/wpt/metadata/webstorage/storage_local_setitem_quotaexceedederr.html.ini index 86f91db0b4b..dcfe5d1a8ce 100644 --- a/tests/wpt/metadata/webstorage/storage_local_setitem_quotaexceedederr.html.ini +++ b/tests/wpt/metadata/webstorage/storage_local_setitem_quotaexceedederr.html.ini @@ -1,3 +1,4 @@ [storage_local_setitem_quotaexceedederr.html] type: testharness + disabled: intermittently crashes instead of times out in release expected: TIMEOUT |