From 887e56701ab9e534ac070814ecd23b07c5cbf222 Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Mon, 19 Jun 2017 14:13:33 -0400 Subject: [PATCH] Bug 1374317 - Mark some layers-specific tests as random-if when WebRender is enabled. r=mstange MozReview-Commit-ID: R1RNok4Def --HG-- extra : rebase_source : 553fa5d15684b6fd33c1b03c3e81aa90abdc3eb1 --- layout/reftests/invalidation/reftest.list | 32 ++++++++++--------- layout/reftests/layers/reftest.list | 16 ++++++---- layout/reftests/reftest-sanity/reftest.list | 34 ++++++++++++--------- 3 files changed, 47 insertions(+), 35 deletions(-) diff --git a/layout/reftests/invalidation/reftest.list b/layout/reftests/invalidation/reftest.list index 4e868c9cce7f..eebe71c12f61 100644 --- a/layout/reftests/invalidation/reftest.list +++ b/layout/reftests/invalidation/reftest.list @@ -42,6 +42,10 @@ pref(layout.animated-image-layers.enabled,true) skip-if(Android||gtkWidget) == t == filter-userspace-offset.svg?offsetContainer=foreignObject&mask=userSpace-at100 filter-userspace-offset.svg == filter-userspace-offset.svg?offsetContainer=rect&filter=matrix-fillPaint-boundingBox filter-userspace-offset.svg == filter-userspace-offset.svg?offsetContainer=rect&filter=matrix-fillPaint-userSpace-at100 filter-userspace-offset.svg + +# All the tests marked with random-if(webrender) are specific to "layers" and therefore not really valid with WebRender enabled. +# We are marking them random-if so that we ensure they don't crash, but allow any non-crash result. + fails-if(webrender) != scroll-inactive-layers.html about:blank fails-if(webrender) != scroll-inactive-layers-2.html about:blank fails-if(webrender) != inactive-layertree-visible-region-1.html about:blank @@ -51,22 +55,22 @@ fails-if(webrender) != transform-floating-point-invalidation.html?reverse about: fails-if(webrender) != nudge-to-integer-invalidation.html about:blank fails-if(webrender) != nudge-to-integer-invalidation.html?reverse about:blank fails-if(webrender) skip-if(styloVsGecko) != clipped-animated-transform-1.html about:blank # Bug 1352628 (styloVsGecko) -fails-if(webrender) != paintedlayer-recycling-1.html about:blank -fails-if(webrender) != paintedlayer-recycling-2.html about:blank -pref(layers.single-tile.enabled,false) fails-if(webrender) != paintedlayer-recycling-3.html about:blank -fails-if(webrender) != paintedlayer-recycling-4.html about:blank -fails-if(webrender) != paintedlayer-recycling-5.html about:blank -fails-if(webrender) != paintedlayer-recycling-6.html about:blank -fails-if(webrender) != paintedlayer-recycling-7.html about:blank +random-if(webrender) != paintedlayer-recycling-1.html about:blank +random-if(webrender) != paintedlayer-recycling-2.html about:blank +pref(layers.single-tile.enabled,false) random-if(webrender) != paintedlayer-recycling-3.html about:blank +random-if(webrender) != paintedlayer-recycling-4.html about:blank +random-if(webrender) != paintedlayer-recycling-5.html about:blank +random-if(webrender) != paintedlayer-recycling-6.html about:blank +random-if(webrender) != paintedlayer-recycling-7.html about:blank != masklayer-1.html about:blank != masklayer-2.html about:blank -fails-if(webrender) != layer-splitting-1.html about:blank -fails-if(webrender) != layer-splitting-2.html about:blank -fails-if(webrender) != layer-splitting-3.html about:blank -fails-if(webrender) != layer-splitting-4.html about:blank -fails-if(webrender) != layer-splitting-5.html about:blank -fails-if(webrender) != layer-splitting-6.html about:blank -fails-if(webrender) != layer-splitting-7.html about:blank +random-if(webrender) != layer-splitting-1.html about:blank +random-if(webrender) != layer-splitting-2.html about:blank +random-if(webrender) != layer-splitting-3.html about:blank +random-if(webrender) != layer-splitting-4.html about:blank +random-if(webrender) != layer-splitting-5.html about:blank +random-if(webrender) != layer-splitting-6.html about:blank +random-if(webrender) != layer-splitting-7.html about:blank fuzzy-if(gtkWidget,2,4) fuzzy-if(asyncPan,2,3955) fuzzy-if(OSX,179,30) fuzzy-if(skiaContent,16,3230) == image-scrolling-zoom-1.html image-scrolling-zoom-1-ref.html != image-scrolling-zoom-1-ref.html image-scrolling-zoom-1-notref.html pref(layers.single-tile.enabled,false) fails-if(webrender) != fast-scrolling.html about:blank diff --git a/layout/reftests/layers/reftest.list b/layout/reftests/layers/reftest.list index d3421f19a3ef..0fa279802428 100644 --- a/layout/reftests/layers/reftest.list +++ b/layout/reftests/layers/reftest.list @@ -1,11 +1,15 @@ == move-to-background-1.html move-to-background-1-ref.html fuzzy-if(cocoaWidget,2,6) random-if(Android) == component-alpha-exit-1.html component-alpha-exit-1-ref.html # bug 760275 -fails-if(webrender) != pull-background-1.html about:blank -fails-if(webrender) random-if(styloVsGecko) != pull-background-2.html about:blank -fails-if(webrender) != pull-background-3.html about:blank -fails-if(webrender) != pull-background-4.html about:blank -fails-if(webrender) fuzzy-if(styloVsGecko,1,1) != pull-background-5.html about:blank -fails-if(webrender) != pull-background-6.html about:blank + +# The pull-background-* tests are specific to "layers" and are not valid with WebRender. +# We mark them random-if to make sure they don't crash, but allow any result. +random-if(webrender) != pull-background-1.html about:blank +random-if(webrender) random-if(styloVsGecko) != pull-background-2.html about:blank +random-if(webrender) != pull-background-3.html about:blank +random-if(webrender) != pull-background-4.html about:blank +random-if(webrender) fuzzy-if(styloVsGecko,1,1) != pull-background-5.html about:blank +random-if(webrender) != pull-background-6.html about:blank + # The animated-position tests are disabled for intermittent failures / passes, bug 1150941 skip != pull-background-animated-position-1.html about:blank # Fails with event regions skip != pull-background-animated-position-2.html about:blank diff --git a/layout/reftests/reftest-sanity/reftest.list b/layout/reftests/reftest-sanity/reftest.list index d5bc5cae7e38..c01b0714352c 100644 --- a/layout/reftests/reftest-sanity/reftest.list +++ b/layout/reftests/reftest-sanity/reftest.list @@ -165,8 +165,9 @@ fuzzy(1,0-2) skip-if(styloVsGecko) != fuzzy.html fuzzy-ref.html # When using 565 fuzzy.html and fuzzy-ref.html will compare as equal fails-if(!styloVsGecko) fuzzy-if(false,2,1) random-if(Android) == fuzzy.html fuzzy-ref.html -# Test that reftest-no-paint fails correctly. With WR enabled, it will generate color layers instead of updating color on the painted layer. -fails skip-if(webrender) == reftest-no-paint.html reftest-no-paint-ref.html +# Test that reftest-no-paint fails correctly. +# Since this is a "layers"-specific test, we allow any non-crash result with WebRender. +fails random-if(webrender) == reftest-no-paint.html reftest-no-paint-ref.html skip-if(!asyncPan||!browserIsRemote) == async-scroll-1a.html async-scroll-1-ref.html @@ -180,24 +181,27 @@ skip-if(!Android) pref(apz.allow_zooming,true) != async-zoom-1.html async-zoom-1 fuzzy(112,800) skip-if(!Android) pref(apz.allow_zooming,true) == async-zoom-2.html async-zoom-2-ref.html # reftest-opaque-layer -fails-if(webrender) == reftest-opaque-layer-pass.html reftest-opaque-layer-pass.html -fails-if(webrender) != reftest-opaque-layer-pass.html about:blank -fails-if(webrender) != about:blank reftest-opaque-layer-pass.html -fails == reftest-opaque-layer-fail.html reftest-opaque-layer-fail.html +# Since this is a "layers"-specific test, we allow any non-crash result with WebRender. +random-if(webrender) == reftest-opaque-layer-pass.html reftest-opaque-layer-pass.html +random-if(webrender) != reftest-opaque-layer-pass.html about:blank +random-if(webrender) != about:blank reftest-opaque-layer-pass.html +fails random-if(webrender) == reftest-opaque-layer-fail.html reftest-opaque-layer-fail.html # If reftest-opaque-layer fails (no matter whether it fails in the test or in the reference), # it shouldn't matter whether the test matches the reference. -fails != reftest-opaque-layer-fail.html reftest-opaque-layer-fail.html -fails == reftest-opaque-layer-fail.html about:blank -fails-if(!styloVsGecko) == about:blank reftest-opaque-layer-fail.html -fails != reftest-opaque-layer-fail.html about:blank -fails-if(!styloVsGecko) != about:blank reftest-opaque-layer-fail.html +# Since this is a "layers"-specific test, we allow any non-crash result with WebRender. +fails random-if(webrender) != reftest-opaque-layer-fail.html reftest-opaque-layer-fail.html +fails random-if(webrender) == reftest-opaque-layer-fail.html about:blank +fails-if(!styloVsGecko) random-if(webrender) == about:blank reftest-opaque-layer-fail.html +fails random-if(webrender) != reftest-opaque-layer-fail.html about:blank +fails-if(!styloVsGecko) random-if(webrender) != about:blank reftest-opaque-layer-fail.html # reftest-opaque-layer and reftest-wait -fails-if(webrender) == reftest-opaque-layer-wait-pass.html reftest-opaque-layer-pass.html -fails-if(webrender) != reftest-opaque-layer-wait-pass.html about:blank -fails fails-if(styloVsGecko) == reftest-opaque-layer-wait-fail.html reftest-opaque-layer-fail.html -fails-if(!styloVsGecko) fails-if(styloVsGecko) != reftest-opaque-layer-wait-fail.html about:blank +# Since this is a "layers"-specific test, we allow any non-crash result with WebRender. +random-if(webrender) == reftest-opaque-layer-wait-pass.html reftest-opaque-layer-pass.html +random-if(webrender) != reftest-opaque-layer-wait-pass.html about:blank +fails fails-if(styloVsGecko) random-if(webrender) == reftest-opaque-layer-wait-fail.html reftest-opaque-layer-fail.html +fails-if(!styloVsGecko) fails-if(styloVsGecko) random-if(webrender) != reftest-opaque-layer-wait-fail.html about:blank # reftest-assigned-layer != reftest-assigned-layer-pass.html about:blank