From be8b24232eec93db9fda7d4111ec5fb0012f2168 Mon Sep 17 00:00:00 2001 From: Chris Lord Date: Thu, 4 Jul 2013 14:53:33 +0100 Subject: [PATCH] Bug 803299 - Some tests require extra fuzzing on Android in 24-bit colour. r=blassey --- layout/reftests/border-radius/reftest.list | 2 +- layout/reftests/bugs/reftest.list | 8 ++++---- layout/reftests/scrolling/reftest.list | 8 ++++---- layout/reftests/text/reftest.list | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/layout/reftests/border-radius/reftest.list b/layout/reftests/border-radius/reftest.list index ba3409e4efc5..4e956350597d 100644 --- a/layout/reftests/border-radius/reftest.list +++ b/layout/reftests/border-radius/reftest.list @@ -83,6 +83,6 @@ skip-if(B2G) fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,20) fuzzy-if(A == iframe-1.html iframe-1-ref.html # Test for antialiasing gaps between background and border -skip-if(B2G) fails-if(winWidget) == curved-border-background-nogap.html curved-border-background-nogap-ref.html +skip-if(B2G) fails-if(winWidget) fuzzy-if(Android,1,5) == curved-border-background-nogap.html curved-border-background-nogap-ref.html == color-layer-1a.html color-layer-1-ref.html diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index c00047b48fd0..925c73165a10 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -1474,7 +1474,7 @@ needs-focus != 542116-1.html 542116-1-ref.html needs-focus != 542116-2.html 542116-2-ref.html needs-focus != 542116-3.html 542116-3-ref.html == 542317-1.html 542317-1-ref.html -== 542605-hidden-unscrollable.xul 542605-hidden-unscrollable-ref.xul +fuzzy-if(Android,17,2) == 542605-hidden-unscrollable.xul 542605-hidden-unscrollable-ref.xul == 542620-1.html 542620-1-ref.html == 545049-1.html 545049-1-ref.html == 546033-1.html 546033-1-ref.html @@ -1588,7 +1588,7 @@ random-if(Android) == 594333-1.html 594333-1-ref.html == 594624-1.html 594624-1-ref.html == 594737-1.html 594737-1-ref.html == 597721-1.html 597721-1-ref.html -random-if(winWidget) needs-focus == 598726-1.html 598726-1-ref.html # Fails on Windows, bug 782196 +random-if(winWidget) fuzzy-if(Android,38,539) needs-focus == 598726-1.html 598726-1-ref.html # Fails on Windows, bug 782196 == 599113-1.html 599113-1-ref.html fails-if(!haveTestPlugin) == 599476.html 599476-ref.html == 599882-1a.html 599882-1-ref.html @@ -1735,11 +1735,11 @@ fuzzy(40,850) == 797797-2.html 797797-2-ref.html # 'opacity:N' and rgba(,,,N) te == 801681-2.html 801681-2-ref.html == 801994-1.html 801994-1-ref.html == 804323-1.html 804323-1-ref.html -fuzzy-if(Android&&AndroidVersion>=15,8,1200) == 811301-1.html 811301-1-ref.html +fuzzy-if(Android,4,100) == 811301-1.html 811301-1-ref.html == 812824-1.html 812824-1-ref.html == 814677.html 814677-ref.html skip-if(B2G) == 814952-1.html 814952-1-ref.html -skip-if(B2G) fuzzy-if(Android&&AndroidVersion>=15,8,200) == 815593-1.html 815593-1-ref.html +skip-if(B2G) fuzzy-if(Android,4,61) == 815593-1.html 815593-1-ref.html == 816359-1.html 816359-1-ref.html == 816458-1.html 816458-1-ref.html == 816948-1.html 816948-1-ref.html diff --git a/layout/reftests/scrolling/reftest.list b/layout/reftests/scrolling/reftest.list index 3bcddd3c17fb..357cac389a35 100644 --- a/layout/reftests/scrolling/reftest.list +++ b/layout/reftests/scrolling/reftest.list @@ -1,7 +1,7 @@ HTTP == fixed-1.html fixed-1.html?ref HTTP == fixed-opacity-1.html fixed-opacity-1.html?ref skip-if(B2G) HTTP == fixed-opacity-2.html fixed-opacity-2.html?ref -skip-if(B2G) random-if(gtk2Widget) HTTP == fixed-text-1.html fixed-text-1.html?ref +skip-if(B2G) random-if(gtk2Widget) fuzzy-if(Android,3,60) HTTP == fixed-text-1.html fixed-text-1.html?ref HTTP == fixed-text-2.html fixed-text-2.html?ref random-if(Android&&!browserIsRemote) == iframe-border-radius.html iframe-border-radius-ref.html # bug 760269 random-if(Android) HTTP == image-1.html image-1.html?ref @@ -9,9 +9,9 @@ random-if(Android&&!browserIsRemote) HTTP == opacity-mixed-scrolling-1.html opac skip-if(B2G) random-if(cocoaWidget) HTTP == opacity-mixed-scrolling-2.html opacity-mixed-scrolling-2.html?ref # see bug 625357 HTTP == simple-1.html simple-1.html?ref skip-if(B2G) HTTP == subpixel-1.html#d subpixel-1-ref.html#d -fuzzy-if(Android,8,80) HTTP == text-1.html text-1.html?ref -fuzzy-if(Android,12,100) HTTP == text-2.html?up text-2.html?ref -fuzzy-if(Android,255,1200) HTTP == transformed-1.html transformed-1.html?ref +fuzzy-if(Android,4,67) HTTP == text-1.html text-1.html?ref +fuzzy-if(Android,4,11) HTTP == text-2.html?up text-2.html?ref +fuzzy-if(Android,251,722) HTTP == transformed-1.html transformed-1.html?ref HTTP == transformed-1.html?up transformed-1.html?ref fuzzy-if(Android,5,20000) == uncovering-1.html uncovering-1-ref.html fuzzy-if(Android,5,20000) == uncovering-2.html uncovering-2-ref.html diff --git a/layout/reftests/text/reftest.list b/layout/reftests/text/reftest.list index cdc52ed8da87..18c403badbeb 100644 --- a/layout/reftests/text/reftest.list +++ b/layout/reftests/text/reftest.list @@ -50,7 +50,7 @@ skip-if(!(d2d||cocoaWidget)) random-if(d2d) != subpixel-glyphs-x-2a.html subpixe skip-if(B2G) HTTP(..) == subpixel-glyphs-x-3a.html subpixel-glyphs-x-3b.html # No platforms do subpixel positioning vertically == subpixel-glyphs-y-1a.html subpixel-glyphs-y-1b.html -fuzzy-if((Android||B2G),231,603) == subpixel-lineheight-1a.html subpixel-lineheight-1b.html +fuzzy-if((Android||B2G),231,653) == subpixel-lineheight-1a.html subpixel-lineheight-1b.html == swash-1.html swash-1-ref.html HTTP(..) != synthetic-bold-metrics-01.html synthetic-bold-metrics-01-notref.html HTTP(..) == synthetic-bold-papyrus-01.html synthetic-bold-papyrus-01-ref.html