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

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

2 files changed, 3 insertions, 51 deletions

diff --git a/layout/reftests/text-shadow/reftest-stylo.list b/layout/reftests/text-shadow/reftest-stylo.list
deleted file mode 100644
index 84c0feff6..000000000
--- a/layout/reftests/text-shadow/reftest-stylo.list
+++ /dev/null
@@ -1,48 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== 723669.html 723669.html
-
-skip-if((B2G&&browserIsRemote)||Mulet) == basic.xul basic.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(Android) skip-if((B2G&&browserIsRemote)||Mulet) == basic-negcoord.xul basic-negcoord.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == blur.xul blur.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == color-inherit.xul color-inherit.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == multiple-noblur.xul multiple-noblur.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == blur-opacity.html blur-opacity.html
-
-== basic.html basic.html
-== basic-negcoord.html basic-negcoord.html
-== basic-opacity.html basic-opacity.html
-== blur.html blur.html
-== color-inherit.html color-inherit.html
-== color-parserorder.html color-parserorder.html
-== decorations-multiple-zorder.html decorations-multiple-zorder.html
-== multiple-noblur.html multiple-noblur.html
-== quirks-decor-noblur.html quirks-decor-noblur.html
-== standards-decor-noblur.html standards-decor-noblur.html
-== padding-decoration.html padding-decoration.html
-== textindent.html textindent.html
-== lineoverflow.html lineoverflow.html
-
-== overflow-not-scrollable-1.html overflow-not-scrollable-1.html
-== overflow-not-scrollable-1.html overflow-not-scrollable-1.html
-== overflow-not-scrollable-2.html overflow-not-scrollable-2.html
-
-needs-focus == text-shadow-selected-1.html text-shadow-selected-1.html
-fails-if(Android||B2G) fuzzy-if(skiaContent,1,1000) needs-focus == text-shadow-selected-1.html text-shadow-selected-1.html
-# different foreground selection color on Android/B2G
-needs-focus == text-shadow-selected-2.html text-shadow-selected-2.html
-fails-if(Android||B2G) fuzzy-if(skiaContent,1,1400) needs-focus == text-shadow-selected-2.html text-shadow-selected-2.html
-# different foreground selection color on Android/B2G
-
-# bug 692744
-== text-shadow-on-space-1.html text-shadow-on-space-1.html
-
-# bug 721750
-skip needs-focus == text-shadow-on-selection-1.html text-shadow-on-selection-1.html
-skip needs-focus == text-shadow-on-selection-2.html text-shadow-on-selection-2.html
-
-== overflow-decoration.html overflow-decoration.html
diff --git a/layout/reftests/text-shadow/reftest.list b/layout/reftests/text-shadow/reftest.list
index 7e5e4b5fc..c89725715 100644
--- a/layout/reftests/text-shadow/reftest.list
+++ b/layout/reftests/text-shadow/reftest.list
@@ -1,7 +1,7 @@
 == 723669.html 723669-ref.html
 
 == basic.xul basic-ref.xul
-random-if(Android) == basic-negcoord.xul basic-negcoord-ref.xul
+== basic-negcoord.xul basic-negcoord-ref.xul
 != blur.xul blur-notref.xul
 == color-inherit.xul color-inherit-ref.xul
 == multiple-noblur.xul multiple-noblur-ref.xul
@@ -26,9 +26,9 @@ HTTP(..) == blur-opacity.html blur-opacity-ref.html
 == overflow-not-scrollable-2.html overflow-not-scrollable-2-ref.html
 
 needs-focus != text-shadow-selected-1.html text-shadow-selected-1-notref.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,1,1000) needs-focus == text-shadow-selected-1.html text-shadow-selected-1-ref.html # different foreground selection color on Android
+fuzzy-if(skiaContent,1,1000) needs-focus == text-shadow-selected-1.html text-shadow-selected-1-ref.html
 needs-focus != text-shadow-selected-2.html text-shadow-selected-2-notref.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,1,1400) needs-focus == text-shadow-selected-2.html text-shadow-selected-2-ref.html # different foreground selection color on Android
+fuzzy-if(skiaContent,1,1400) needs-focus == text-shadow-selected-2.html text-shadow-selected-2-ref.html
 
 # bug 692744
 == text-shadow-on-space-1.html text-shadow-on-space-1-ref.html