From 327ffce452055b1c0d704653536c266c3a239cca Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Sat, 8 Sep 2012 23:40:29 -0700 Subject: [PATCH] Switch reftest conditions for OSX to use the OSX variable from bug 789771 instead of a regex --HG-- extra : rebase_source : f4123ff10d1df1ec4f6f2ad75b764416056cf271 --- gfx/tests/reftest/reftest.list | 2 +- layout/reftests/bugs/reftest.list | 2 +- layout/reftests/canvas/reftest.list | 4 ++-- layout/reftests/css-gradients/reftest.list | 4 ++-- layout/reftests/indic-shaping/reftest.list | 10 +++++----- layout/reftests/svg/smil/transform/reftest.list | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gfx/tests/reftest/reftest.list b/gfx/tests/reftest/reftest.list index 6a4c192aaf9..d214f7cf8dc 100644 --- a/gfx/tests/reftest/reftest.list +++ b/gfx/tests/reftest/reftest.list @@ -1,4 +1,4 @@ # 468496-1 will also detect bugs in video drivers. -fails-if(/Mac\x20OS\x20X\x2010\.5/.test(http.oscpu)) == 468496-1.html 468496-1-ref.html # bug 486761, 660740 +== 468496-1.html 468496-1-ref.html random-if(bug685516) == 611498-1.html 611498-ref.html == 709477-1.html 709477-1-ref.html diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index 7f01aeff0f0..aa3464b7575 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -1453,7 +1453,7 @@ random-if(d2d) == 523468-1.html 523468-1-ref.html == 534804-1.html 534804-1-ref.html == 534808-1.html 534808-1-ref.html == 534808-2.html 534808-2-ref.html -fails-if(/Mac\x20OS\x20X\x2010\.7/.test(http.oscpu)) == 534919-1.html 534919-1-ref.html # Bug 705044 +fails-if(OSX==10.7) == 534919-1.html 534919-1-ref.html # Bug 705044 random == 536061.html 536061-ref.html # fixedpoint division in blur code makes this fail == 537507-1.xul 537507-1-ref.xul == 537507-2.html 537507-2-ref.html diff --git a/layout/reftests/canvas/reftest.list b/layout/reftests/canvas/reftest.list index 9b6d38c761a..b00520a9483 100644 --- a/layout/reftests/canvas/reftest.list +++ b/layout/reftests/canvas/reftest.list @@ -55,7 +55,7 @@ fails-if(Android) != text-font-lang.html text-font-lang-notref.html fails-if(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(/Mac\x20OS\x20X\x2010\.[56]/.test(http.oscpu)||(azureQuartz&&/Mac\x20OS\x20X\x2010\.[78]/.test(http.oscpu))) == linear-gradient-1b.html linear-gradient-1-ref.html +fails-if(OSX==10.6||(azureQuartz&&(OSX==10.7||OSX==10.8))) == linear-gradient-1b.html linear-gradient-1-ref.html == zero-dimensions.html zero-dimensions-ref.html @@ -72,7 +72,7 @@ fuzzy-if(azureSkia,9,470) random-if(Android) == dash-1.html dash-1-ref.svg # Bu fails == ctm-singular-sanity.html data:text/html,Pass # Bug 612033 == ctm-1.html ctm-1-ref.html -fails-if(/Mac\x20OS\x20X\x2010\.[56]/.test(http.oscpu)) == 672646-alpha-radial-gradient.html 672646-alpha-radial-gradient-ref.html # Bug 673333 +fails-if(OSX==10.6) == 672646-alpha-radial-gradient.html 672646-alpha-radial-gradient-ref.html # Bug 673333 == 674003-alpha-radial-gradient-superlum.html 674003-alpha-radial-gradient-superlum-ref.html != 693610-1.html 693610-1-notref.html # bug 693610: multiple glyph runs should not be overprinted diff --git a/layout/reftests/css-gradients/reftest.list b/layout/reftests/css-gradients/reftest.list index 742cc58cca5..3140f332de4 100644 --- a/layout/reftests/css-gradients/reftest.list +++ b/layout/reftests/css-gradients/reftest.list @@ -97,7 +97,7 @@ fails-if(d2d) == repeating-linear-1b.html repeating-linear-1-ref.html == repeating-radial-2b.html repeating-radial-2-ref.html == twostops-1a.html twostops-1-ref.html == twostops-1b.html twostops-1-ref.html -fails-if(/Mac\x20OS\x20X\x2010\.[56]/.test(http.oscpu)) == twostops-1c.html twostops-1-ref.html # bug 524173 +fails-if(OSX==10.6) == twostops-1c.html twostops-1-ref.html # bug 524173 == twostops-1d.html twostops-1-ref.html == twostops-1e.html twostops-1-ref.html == twostops-1f.html twostops-1-ref.html @@ -120,7 +120,7 @@ fuzzy-if(!contentSameGfxBackendAsCanvas,1,19999) fails-if(Android) == aja-linear fuzzy-if(!contentSameGfxBackendAsCanvas,2,20000) fails-if(Android) == aja-linear-4a.html aja-linear-4-ref.html fuzzy-if(!contentSameGfxBackendAsCanvas,2,20000) fails-if(Android) == aja-linear-4b.html aja-linear-4-ref.html fuzzy-if(!contentSameGfxBackendAsCanvas,2,20000) fails-if(Android) == aja-linear-5a.html aja-linear-5-ref.html -fuzzy-if(!contentSameGfxBackendAsCanvas,2,16477) fails-if(Android) fails-if(/Mac\x20OS\x20X\x2010\.5/.test(http.oscpu)) == aja-linear-6a.html aja-linear-6-ref.html # bug 526708 +fuzzy-if(!contentSameGfxBackendAsCanvas,2,16477) fails-if(Android) == aja-linear-6a.html aja-linear-6-ref.html # bug 526708 fails == aja-linear-6b.html aja-linear-6-ref.html # bug 522607 == height-dependence-1.html height-dependence-1-ref.html fails-if(cocoaWidget) == height-dependence-2.html height-dependence-2-ref.html # bug 535007 diff --git a/layout/reftests/indic-shaping/reftest.list b/layout/reftests/indic-shaping/reftest.list index 506350e236b..e38fee0b488 100644 --- a/layout/reftests/indic-shaping/reftest.list +++ b/layout/reftests/indic-shaping/reftest.list @@ -7,16 +7,16 @@ pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) != devanagari-4.html devan pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) == gujarati-1a.html gujarati-1-ref.html pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) != gujarati-1b.html gujarati-1-ref.html -fails-if(/Mac\x20OS\x20X\x2010\.[56]/.test(http.oscpu)) pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) == gujarati-2.html gujarati-2-ref.html # bug 760379 +fails-if(OSX==10.6) pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) == gujarati-2.html gujarati-2-ref.html # bug 760379 pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) != gujarati-3a.html gujarati-3-ref.html pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) == gujarati-3b.html gujarati-3-ref.html pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) != gujarati-4.html gujarati-4-notref.html -fails-if(/Mac\x20OS\x20X\x2010\.[56]/.test(http.oscpu)) pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) == bengali-1a.html bengali-1-ref.html # bug 760379 +fails-if(OSX==10.6) pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) == bengali-1a.html bengali-1-ref.html # bug 760379 pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) != bengali-1b.html bengali-1-ref.html pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) != bengali-2a.html bengali-2-ref.html -fails-if(/Mac\x20OS\x20X\x2010\.[56]/.test(http.oscpu)) pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) != bengali-2b.html bengali-2-ref.html # bug 760379 -fails-if(/Mac\x20OS\x20X\x2010\.[56]/.test(http.oscpu)) pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) == bengali-3a.html bengali-3-ref.html # bug 760379 +fails-if(OSX==10.6) pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) != bengali-2b.html bengali-2-ref.html # bug 760379 +fails-if(OSX==10.6) pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) == bengali-3a.html bengali-3-ref.html # bug 760379 pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) != bengali-3b.html bengali-3-ref.html pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) != bengali-3c.html bengali-3-ref.html -fails-if(/Mac\x20OS\x20X\x2010\.[56]/.test(http.oscpu)) pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) != bengali-3c.html bengali-3b.html # bug 760379 +fails-if(OSX==10.6) pref(gfx.font_rendering.harfbuzz.scripts,-1) HTTP(..) != bengali-3c.html bengali-3b.html # bug 760379 diff --git a/layout/reftests/svg/smil/transform/reftest.list b/layout/reftests/svg/smil/transform/reftest.list index 566637f27bc..6eda8fc0bf2 100644 --- a/layout/reftests/svg/smil/transform/reftest.list +++ b/layout/reftests/svg/smil/transform/reftest.list @@ -11,5 +11,5 @@ == scale-1.svg scale-1-ref.svg == skew-1.svg skew-1-ref.svg random-if(Android&&!browserIsRemote) == translate-clipPath-1.svg lime.svg # bug 760266 -fails-if(/Mac\x20OS\x20X\x2010\.[56]/.test(http.oscpu)) == translate-gradient-1.svg lime.svg +fails-if(OSX==10.6) == translate-gradient-1.svg lime.svg == translate-pattern-1.svg lime.svg