Bug 1307332 - Remove B2G and Mulet annotations from reftest.list: layout/reftests/font-matching. r?dholbert
MozReview-Commit-ID: 9VV9gkp1d0k
--- a/layout/reftests/font-matching/reftest.list
+++ b/layout/reftests/font-matching/reftest.list
@@ -40,44 +40,44 @@ random-if(cocoaWidget) != impact-bold.ht
== arial-variations-2.html arial-variations-2-ref.html
== arial-variations-3.html arial-variations-3-ref.html
== arial-variations-4.html arial-variations-4-ref.html
== arial-variations-5.html arial-variations-5-ref.html
== arial-variations-6.html arial-variations-6-ref.html
# localized font family names should always match just as English names do
== localized-family-names-001.html localized-family-names-001-ref.html
-skip-if(Mulet) == localized-family-names-002.html localized-family-names-002-ref.html # MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
+== localized-family-names-002.html localized-family-names-002-ref.html
== localized-family-names-003.html localized-family-names-003-ref.html
== localized-family-names-004.html localized-family-names-004-ref.html
# family names with escaped spaces shouldn't match the names without the spaces
== familyname-escapedidents.html familyname-escapedidents-ref.html
# weight mapping tests
-skip-if(B2G||Mulet) HTTP(..) == normalmedium.html normalmedium-ref.html # bug 773482 # Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) HTTP(..) != normalmedium.html normalmedium-notref.html # bug 773482 # Initial mulet triage: parity with B2G/B2G Desktop
+HTTP(..) == normalmedium.html normalmedium-ref.html
+HTTP(..) != normalmedium.html normalmedium-notref.html
# Linux fails due to bug 604815
fuzzy-if(OSX==1010&&browserIsRemote,1,23) HTTP(..) == weightmapping-12.html weightmapping-12-ref.html
HTTP(..) == weightmapping-25.html weightmapping-25-ref.html
HTTP(..) == weightmapping-45.html weightmapping-45-ref.html
HTTP(..) == weightmapping-458.html weightmapping-458-ref.html
HTTP(..) == weightmapping-478.html weightmapping-478-ref.html
HTTP(..) == weightmapping-7.html weightmapping-7-ref.html
fuzzy-if(OSX==1010,1,30) HTTP(..) == weightmapping-12579.html weightmapping-12579-ref.html
-skip-if(B2G||Mulet) HTTP(..) == stretchmapping-all.html stretchmapping-all-ref.html # bug 773482 # Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) HTTP(..) == stretchmapping-reverse.html stretchmapping-reverse-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
+HTTP(..) == stretchmapping-all.html stretchmapping-all-ref.html
+HTTP(..) == stretchmapping-reverse.html stretchmapping-reverse-ref.html
fuzzy-if(OSX==1010&&browserIsRemote,1,17) fuzzy-if(Android,4,8) HTTP(..) == stretchmapping-35.html stretchmapping-35-ref.html
fuzzy-if(OSX==1010,3,5) HTTP(..) == stretchmapping-137.html stretchmapping-137-ref.html
# test for font-stretch using @font-face
-skip-if(B2G||Mulet) skip-if(Android) HTTP(..) == font-stretch-1.html font-stretch-1-ref.html # bugs 773482, 927602 # Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) skip-if(Android) HTTP(..) == font-shorthand-stretch-1.html font-stretch-1-ref.html # bugs 773482, 927602 # Initial mulet triage: parity with B2G/B2G Desktop
+skip-if(Android) HTTP(..) == font-stretch-1.html font-stretch-1-ref.html # bug 927602
+skip-if(Android) HTTP(..) == font-shorthand-stretch-1.html font-stretch-1-ref.html # bug 927602
# bug 724231 - applying synthetic styles to a single @font-face font
# should apply artificial obliquing, not switch to a true styled face
!= synthetic-style-1.html synthetic-style-1-notref.html
!= synthetic-style-2.html synthetic-style-2-notref.html
# Bug 765906 - synthetic bold should be used if necessary together with system fallback.
# **NOTE** we skip these on Linux because of bug 769659.
@@ -88,17 +88,17 @@ random-if(!Android) skip-if(gtkWidget) !
# Bug 769475 - applying 'italic' to Arabic text in Arial should NOT change family or metrics.
# Expected to pass on MacOSX and Windows; other platforms unknown, depending on font availability.
random-if(!(cocoaWidget||winWidget)) == arial-arabic.html arial-arabic-ref.html
!= syntheticbold-rotated.html syntheticbold-rotated-ref.html
HTTP(..) == font-synthesis-1.html font-synthesis-1-ref.html
-skip-if(Mulet) HTTP(..) == font-synthesis-2.html font-synthesis-2-ref.html # MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
+HTTP(..) == font-synthesis-2.html font-synthesis-2-ref.html
# Bug 1060791 - support for format 10 cmap in Apple Symbols;
# relevant fonts not present on other platforms.
skip-if(!cocoaWidget) HTTP(..) != apple-symbols-1.html apple-symbols-1-notref.html
# distinguish between italic and oblique
== simple-oblique.html simple-oblique-ref.html
== italic-oblique-1.html italic-oblique-ref.html