Auto merge of #11447 - servo:jdm-patch-3, r=metajack

Disable redirect-origin.html on OS X

Disable a test that started permanently timing out in #11429.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because disabling a test

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11447)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-05-26 16:30:19 -05:00
commit db7f8b38fc

View file

@ -1,5 +1,7 @@
[redirect-origin.htm]
type: testharness
disabled:
if os == "mac": https://github.com/servo/servo/issues/11446
[local (*) to remote (*), expect origin=undefined//undefined]
expected: FAIL