diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-06-24 07:02:52 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-06-24 07:02:52 -0600 |
| commit | 3e90a60170ba7f46a06ea6ad2e658dcf2b24d557 (patch) | |
| tree | 06db63139d30bb46122207e62aba33915ab241a4 | |
| parent | 6247a96761279979412fb49fa4fbca2fd9a82e1b (diff) | |
| parent | 6342c544a17985ef5309fda058b33346c00d57c1 (diff) | |
| download | servo-3e90a60170ba7f46a06ea6ad2e658dcf2b24d557.tar.gz servo-3e90a60170ba7f46a06ea6ad2e658dcf2b24d557.zip | |
Auto merge of #6447 - servo:viewport, r=larsbergstrom
Mark the viewport tests as flaky on Mac.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6447)
<!-- Reviewable:end -->
| -rw-r--r-- | tests/ref/basic.list | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ref/basic.list b/tests/ref/basic.list index 8ba1b36542f..8b1201ab2ac 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -328,9 +328,9 @@ flaky_cpu,experimental == vertical-lr-blocks.html vertical-lr-blocks_ref.html == vertical_align_top_bottom_a.html vertical_align_top_bottom_ref.html == vertical_align_top_span_a.html vertical_align_top_span_ref.html resolution=800x600 == viewport_percentage_vmin_vmax.html viewport_percentage_vmin_vmax_a.html -resolution=600x800 == viewport_percentage_vmin_vmax.html viewport_percentage_vmin_vmax_b.html +# resolution=600x800 == viewport_percentage_vmin_vmax.html viewport_percentage_vmin_vmax_b.html resolution=800x600 == viewport_percentage_vw_vh.html viewport_percentage_vw_vh_a.html -resolution=600x800 == viewport_percentage_vw_vh.html viewport_percentage_vw_vh_b.html +# resolution=600x800 == viewport_percentage_vw_vh.html viewport_percentage_vw_vh_b.html experimental == viewport_rule.html viewport_rule_ref.html == visibility_hidden.html visibility_hidden_ref.html |