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 -->
This commit is contained in:
bors-servo 2015-06-24 07:02:52 -06:00
commit 3e90a60170

View file

@ -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_bottom_a.html vertical_align_top_bottom_ref.html
== vertical_align_top_span_a.html vertical_align_top_span_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=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=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 experimental == viewport_rule.html viewport_rule_ref.html
== visibility_hidden.html visibility_hidden_ref.html == visibility_hidden.html visibility_hidden_ref.html