From 13ce31841885e6727624d6dc1fa81ae315c3a27b Mon Sep 17 00:00:00 2001 From: "L. David Baron" Date: Thu, 15 Jan 2015 18:00:49 -0800 Subject: [PATCH] Bug 1122297 - Adjust existing Mac OS X reftest failure annotations that also show up on 10.10. r=philor This adjusts existing reftest annotations for tests that fail on 10.8 that are showing up as failing on 10.10 as well to be marked using >= version tests rather than == version tests. --- image/test/reftest/downscaling/reftest.list | 2 +- layout/reftests/bugs/reftest.list | 4 ++-- layout/reftests/canvas/reftest.list | 2 +- layout/reftests/list-item/reftest.list | 2 +- layout/reftests/position-sticky/reftest.list | 4 ++-- layout/reftests/transform-3d/reftest.list | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/image/test/reftest/downscaling/reftest.list b/image/test/reftest/downscaling/reftest.list index 2e52e4322ef2..9ae235e4443a 100644 --- a/image/test/reftest/downscaling/reftest.list +++ b/image/test/reftest/downscaling/reftest.list @@ -85,7 +85,7 @@ fuzzy(20,999) != downscale-2a.html?205,53,bottom about:blank fuzzy(20,999) != downscale-2b.html?205,53,bottom about:blank fuzzy(20,999) != downscale-2c.html?205,53,bottom about:blank fuzzy(20,999) != downscale-2d.html?205,53,bottom about:blank -fuzzy(20,999) fails-if(OSX==1008) != downscale-2e.html?205,53,bottom about:blank +fuzzy(20,999) fails-if(OSX>=1008) != downscale-2e.html?205,53,bottom about:blank # RUN TESTS WITH HIGH QUALITY DOWNSCALING ENABLED: # ================================================ diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index 155c94bd8fd3..0063aa16d5ff 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -557,9 +557,9 @@ skip-if(B2G) == 363858-1.html 363858-1-ref.html skip-if(B2G) == 363858-2.html 363858-2-ref.html skip-if(B2G) == 363858-3.html 363858-3-ref.html skip-if(B2G) == 363858-4.html 363858-4-ref.html -fuzzy-if(OSX==1008,45,2) == 363858-5a.html 363858-5-ref.html +fuzzy-if(OSX>=1008,45,2) == 363858-5a.html 363858-5-ref.html == 363858-5b.html 363858-5-ref.html -fuzzy-if(OSX==1008,45,2) == 363858-6a.html 363858-6-ref.html +fuzzy-if(OSX>=1008,45,2) == 363858-6a.html 363858-6-ref.html == 363858-6b.html 363858-6-ref.html == 363874.html 363874-ref.html == 363874-max-width.html 363874-max-width-ref.html diff --git a/layout/reftests/canvas/reftest.list b/layout/reftests/canvas/reftest.list index 79e7e08544ac..9f9253e3b3b0 100644 --- a/layout/reftests/canvas/reftest.list +++ b/layout/reftests/canvas/reftest.list @@ -68,7 +68,7 @@ random-if(!cocoaWidget||OSX==1006||OSX==1007) != text-emoji.html text-emoji-notr fails-if(azureSkia||azureSkiaGL||azureQuartz) == linear-gradient-1a.html linear-gradient-1-ref.html # this passes with cairo on 10.7 and 10.8 but not with azure for reasons unknown -fails-if(!(Android&&AndroidVersion>=15)&&(OSX==1006||(azureQuartz&&(OSX==1007||OSX==1008)))||azureSkiaGL||azureSkia) == linear-gradient-1b.html linear-gradient-1-ref.html +fails-if(!(Android&&AndroidVersion>=15)&&(OSX==1006||(azureQuartz&&OSX>=1007))||azureSkiaGL||azureSkia) == linear-gradient-1b.html linear-gradient-1-ref.html == zero-dimensions.html zero-dimensions-ref.html diff --git a/layout/reftests/list-item/reftest.list b/layout/reftests/list-item/reftest.list index af51a87049a7..9b6da0f296a6 100644 --- a/layout/reftests/list-item/reftest.list +++ b/layout/reftests/list-item/reftest.list @@ -1,4 +1,4 @@ -fuzzy-if(OSX==1008,55,4) == numbering-1.html numbering-1-ref.html +fuzzy-if(OSX>=1008,55,4) == numbering-1.html numbering-1-ref.html == numbering-2.html numbering-2-ref.html == ol-reversed-1a.html ol-reversed-1-ref.html asserts(1) == ol-reversed-1b.html ol-reversed-1-ref.html # bug 478135 diff --git a/layout/reftests/position-sticky/reftest.list b/layout/reftests/position-sticky/reftest.list index ed4f40a5cc52..facbe91bbd8d 100644 --- a/layout/reftests/position-sticky/reftest.list +++ b/layout/reftests/position-sticky/reftest.list @@ -43,12 +43,12 @@ fuzzy-if(Android,4,810) == containing-block-1.html containing-block-1-ref.html == overconstrained-3.html overconstrained-3-ref.html == inline-1.html inline-1-ref.html == inline-2.html inline-2-ref.html -fuzzy-if(OSX==1006||OSX==1007,64,100) fuzzy-if(OSX==1008,99,210) == inline-3.html inline-3-ref.html +fuzzy-if(OSX==1006||OSX==1007,64,100) fuzzy-if(OSX>=1008,99,210) == inline-3.html inline-3-ref.html fails == column-contain-1a.html column-contain-1-ref.html == column-contain-1b.html column-contain-1-ref.html == column-contain-2.html column-contain-2-ref.html == block-in-inline-1.html block-in-inline-1-ref.html fuzzy-if(winWidget&&!layersGPUAccelerated,102,440) fuzzy-if(Android,8,1533) skip-if(B2G&&browserIsRemote) fuzzy-if(azureQuartz,1,1) == block-in-inline-2.html block-in-inline-2-ref.html -fuzzy-if(winWidget&&!layersGPUAccelerated,102,320) fuzzy-if(Android,8,630) fuzzy-if(OSX==1008,1,11) skip-if(B2G&&browserIsRemote) == block-in-inline-3.html block-in-inline-3-ref.html +fuzzy-if(winWidget&&!layersGPUAccelerated,102,320) fuzzy-if(Android,8,630) fuzzy-if(OSX>=1008,1,11) skip-if(B2G&&browserIsRemote) == block-in-inline-3.html block-in-inline-3-ref.html == block-in-inline-continuations.html block-in-inline-continuations-ref.html fuzzy-if(winWidget&&!layersGPUAccelerated,102,111) == inner-table-1.html inner-table-1-ref.html diff --git a/layout/reftests/transform-3d/reftest.list b/layout/reftests/transform-3d/reftest.list index 196e14468baa..cf074a583f10 100644 --- a/layout/reftests/transform-3d/reftest.list +++ b/layout/reftests/transform-3d/reftest.list @@ -22,8 +22,8 @@ skip-if(B2G) == preserve3d-4a.html green-rect.html fuzzy-if(Android&&AndroidVersion>=15,4,300) == preserve3d-5a.html preserve3d-5-ref.html == scale3d-z.html scalez-1-ref.html -fuzzy-if(winWidget,102,580) fuzzy-if(d2d,143,681) fuzzy-if(OSX==1008,224,924) fuzzy-if(OSX==1009,224,924) == scale3d-all.html scale3d-1-ref.html # subpixel AA -fuzzy-if(winWidget,102,580) fuzzy-if(d2d,143,681) fuzzy-if(OSX==1008,224,924) fuzzy-if(OSX==1009,224,924) == scale3d-all-separate.html scale3d-1-ref.html # subpixel AA +fuzzy-if(winWidget,102,580) fuzzy-if(d2d,143,681) fuzzy-if(OSX>=1008,224,924) == scale3d-all.html scale3d-1-ref.html # subpixel AA +fuzzy-if(winWidget,102,580) fuzzy-if(d2d,143,681) fuzzy-if(OSX>=1008,224,924) == scale3d-all-separate.html scale3d-1-ref.html # subpixel AA == scale3d-xz.html scale3d-1-ref.html == translatez-1a.html translatez-1-ref.html != translatez-1b.html translatez-1-ref.html