Issue #1053 - Part 2b: Remove android from /layout reftests

Also cleans up some other obsolete checks and stylo reftest lists.

2 files changed, 2 insertions, 146 deletions

diff --git a/layout/reftests/font-matching/reftest-stylo.list b/layout/reftests/font-matching/reftest-stylo.list
deleted file mode 100644
index 5902a983f5..0000000000
--- a/layout/reftests/font-matching/reftest-stylo.list
+++ /dev/null
@@ -1,143 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== CSS21-t1502-no-inherited-font-family.xhtml CSS21-t1502-no-inherited-font-family.xhtml
-
-# basic tests for bug 538730
-== synthetic-bold-1.html synthetic-bold-1.html
-== synthetic-bold-2.html synthetic-bold-2.html
-
-# synthetic bold/italic tests
-== defaultfont-bold.html defaultfont-bold.html
-== defaultfont-italic.html defaultfont-italic.html
-== defaultfont-oblique.html defaultfont-oblique.html
-== defaultfont-bolditalic.html defaultfont-bolditalic.html
-== defaultfont-bolditalic.html defaultfont-bolditalic.html
-
-== defaultjapanese-bold.html defaultjapanese-bold.html
-== defaultjapanese-italic.html defaultjapanese-italic.html
-== defaultjapanese-oblique.html defaultjapanese-oblique.html
-== defaultjapanese-bolditalic.html defaultjapanese-bolditalic.html
-== defaultjapanese-bolditalic.html defaultjapanese-bolditalic.html
-
-random-if(cocoaWidget) == impact-bold.html impact-bold.html
-# bug 539418
-== impact-italic.html impact-italic.html
-== impact-oblique.html impact-oblique.html
-== impact-bolditalic.html impact-bolditalic.html
-== impact-bolditalic.html impact-bolditalic.html
-
-== arialunicode-bold.html arialunicode-bold.html
-== arialunicode-italic.html arialunicode-italic.html
-== arialunicode-oblique.html arialunicode-oblique.html
-== arialunicode-bolditalic.html arialunicode-bolditalic.html
-== arialunicode-bolditalic.html arialunicode-bolditalic.html
-
-== lucidaconsole-bold.html lucidaconsole-bold.html
-== lucidaconsole-italic.html lucidaconsole-italic.html
-== lucidaconsole-oblique.html lucidaconsole-oblique.html
-== lucidaconsole-bolditalic.html lucidaconsole-bolditalic.html
-== lucidaconsole-bolditalic.html lucidaconsole-bolditalic.html
-
-# checking that we don't match fullnames, psnames (see bug 538103)
-== arial-variations-1.html arial-variations-1.html
-== arial-variations-2.html arial-variations-2.html
-== arial-variations-3.html arial-variations-3.html
-== arial-variations-4.html arial-variations-4.html
-== arial-variations-5.html arial-variations-5.html
-== arial-variations-6.html arial-variations-6.html
-
-# localized font family names should always match just as English names do
-== localized-family-names-001.html localized-family-names-001.html
-skip-if(Mulet) == localized-family-names-002.html localized-family-names-002.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-fails-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)&&!d2d) == localized-family-names-003.html localized-family-names-003.html
-# Bug 1258248
-== localized-family-names-004.html localized-family-names-004.html
-
-# family names with escaped spaces shouldn't match the names without the spaces
-== familyname-escapedidents.html familyname-escapedidents.html
-
-# weight mapping tests
-skip-if(B2G||Mulet) HTTP(..) == normalmedium.html normalmedium.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) HTTP(..) == normalmedium.html normalmedium.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# Linux fails due to bug 604815
-skip fuzzy-if(OSX==1010&&browserIsRemote,1,23) HTTP(..) == weightmapping-12.html weightmapping-12.html
-skip HTTP(..) == weightmapping-25.html weightmapping-25.html
-skip HTTP(..) == weightmapping-45.html weightmapping-45.html
-skip HTTP(..) == weightmapping-458.html weightmapping-458.html
-skip HTTP(..) == weightmapping-478.html weightmapping-478.html
-skip HTTP(..) == weightmapping-7.html weightmapping-7.html
-skip fuzzy-if(OSX==1010,1,30) HTTP(..) == weightmapping-12579.html weightmapping-12579.html
-
-skip skip-if(B2G||Mulet) HTTP(..) == stretchmapping-all.html stretchmapping-all.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip skip-if(B2G||Mulet) HTTP(..) == stretchmapping-reverse.html stretchmapping-reverse.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip fuzzy-if(OSX==1010&&browserIsRemote,1,17) fuzzy-if(Android,4,8) HTTP(..) == stretchmapping-35.html stretchmapping-35.html
-skip fuzzy-if(OSX==1010,3,5) HTTP(..) == stretchmapping-137.html stretchmapping-137.html
-
-# test for font-stretch using @font-face
-skip-if(B2G||Mulet) skip-if(Android) HTTP(..) == font-stretch-1.html font-stretch-1.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-shorthand-stretch-1.html
-# bugs 773482, 927602
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# 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.html
-== synthetic-style-2.html synthetic-style-2.html
-
-# Bug 765906 - synthetic bold should be used if necessary together with system fallback.
-# **NOTE** we skip these on Linux because of bug 769659.
-# test 1 uses Cherokee; expected to pass on OS X and Win7
-random-if(!(cocoaWidget||/^Windows\x20NT\x206\.1/.test(http.oscpu))) skip-if(gtkWidget) == bold-system-fallback-1.html bold-system-fallback-1.html
-# test 2 uses Chess symbols; expected to pass on Android
-random-if(!Android) skip-if(gtkWidget) == bold-system-fallback-2.html bold-system-fallback-2.html
-
-# 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.html
-
-== syntheticbold-rotated.html syntheticbold-rotated.html
-
-HTTP(..) == font-synthesis-1.html font-synthesis-1.html
-skip-if(Mulet) HTTP(..) == font-synthesis-2.html font-synthesis-2.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-
-# Bug 1060791 - support for format 10 cmap in Apple Symbols;
-# relevant fonts not present on other platforms.
-skip skip-if(!cocoaWidget) HTTP(..) == apple-symbols-1.html apple-symbols-1.html
-
-# distinguish between italic and oblique
-== simple-oblique.html simple-oblique.html
-== italic-oblique-1.html italic-oblique-1.html
-== italic-oblique-2.html italic-oblique-2.html
-== italic-oblique-3.html italic-oblique-3.html
-== italic-oblique-4.html italic-oblique-4.html
-== italic-oblique-5.html italic-oblique-5.html
-== italic-oblique-6.html italic-oblique-6.html
-== italic-oblique-7.html italic-oblique-7.html
-== italic-oblique-8.html italic-oblique-8.html
-== italic-oblique-9.html italic-oblique-9.html
-== italic-oblique-kinnari.html italic-oblique-kinnari.html
-
-# system font generic per-language tests, only works under OSX currently
-# Bug 1212731 - initial implementation caused startup regression and
-# regression with full-width digits display in UI elements. Disable
-# tests until these problems are corrected.
-# random-if(!OSX) == system-generic-fallback-1.html system-generic-fallback-1.html
-# random-if(!OSX||OSX<1008) == system-generic-fallback-2.html system-generic-fallback-2.html
-# random-if(!OSX||OSX<1008) == system-generic-fallback-3.html system-generic-fallback-3.html
-# random-if(!OSX||OSX<1008) == system-generic-fallback-4.html system-generic-fallback-4.html
-# random-if(!OSX) == system-generic-fallback-ko.html system-generic-fallback-ko.html
-# random-if(!OSX) == system-generic-fallback-zh-tw.html system-generic-fallback-zh-tw.html
-# random-if(!OSX) == system-generic-fallback-zh-cn.html system-generic-fallback-zh-cn.html
-# random-if(!OSX) == system-generic-fallback-zh-tw.html system-generic-fallback-zh-tw.html
-
diff --git a/layout/reftests/font-matching/reftest.list b/layout/reftests/font-matching/reftest.list
index ec2c98f21e..f9c396289c 100644
--- a/layout/reftests/font-matching/reftest.list
+++ b/layout/reftests/font-matching/reftest.list
@@ -67,7 +67,7 @@ fuzzy-if(OSX==1010,1,30) HTTP(..) == weightmapping-12579.html weightmapping-1257
 
 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&&browserIsRemote,1,17) 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
@@ -83,8 +83,7 @@ HTTP(..) == font-shorthand-stretch-1.html font-stretch-1-ref.html
 # **NOTE** we skip these on Linux because of bug 769659.
 # test 1 uses Cherokee; expected to pass on OS X and Win7
 random-if(!(cocoaWidget||/^Windows\x20NT\x206\.1/.test(http.oscpu))) skip-if(gtkWidget) != bold-system-fallback-1.html bold-system-fallback-1-notref.html
-# test 2 uses Chess symbols; expected to pass on Android
-random-if(!Android) skip-if(gtkWidget) != bold-system-fallback-2.html bold-system-fallback-2-notref.html
+skip-if(gtkWidget) != bold-system-fallback-2.html bold-system-fallback-2-notref.html
 
 # 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.