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

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

10 files changed, 6 insertions, 81 deletions

diff --git a/layout/reftests/css-disabled/button/reftest-stylo.list b/layout/reftests/css-disabled/button/reftest-stylo.list
deleted file mode 100644
index ae9af02ea9..0000000000
--- a/layout/reftests/css-disabled/button/reftest-stylo.list
+++ /dev/null
@@ -1,14 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== button-fieldset-1.html button-fieldset-1.html
-fails-if(B2G||Mulet) fuzzy-if(skiaContent,1,7) == button-fieldset-2.html button-fieldset-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet) fuzzy-if(skiaContent,1,7) == button-fieldset-3.html button-fieldset-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails fuzzy-if(skiaContent,1,7) == button-fieldset-4.html button-fieldset-4.html
-== button-fieldset-legend-1.html button-fieldset-legend-1.html
-fails-if(B2G||Mulet) == button-fieldset-legend-2.html button-fieldset-legend-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet) == button-fieldset-legend-3.html button-fieldset-legend-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== button-fieldset-legend-4.html button-fieldset-legend-4.html
-== button-fieldset-legend-5.html button-fieldset-legend-5.html
diff --git a/layout/reftests/css-disabled/fieldset/reftest-stylo.list b/layout/reftests/css-disabled/fieldset/reftest-stylo.list
deleted file mode 100644
index ce458358fa..0000000000
--- a/layout/reftests/css-disabled/fieldset/reftest-stylo.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== fieldset-enabled.html fieldset-enabled.html
-fuzzy-if(skiaContent,2,5) == fieldset-disabled.html fieldset-disabled.html
-== fieldset-fieldset-1.html fieldset-fieldset-1.html
-fuzzy-if(skiaContent,1,11) == fieldset-fieldset-2.html fieldset-fieldset-2.html
-fuzzy-if(skiaContent,1,11) == fieldset-fieldset-3.html fieldset-fieldset-3.html
-fails fuzzy-if(skiaContent,1,11) == fieldset-fieldset-4.html fieldset-fieldset-4.html
-== fieldset-legend-1.html fieldset-legend-1.html
-== fieldset-legend-2.html fieldset-legend-2.html
-== fieldset-legend-3.html fieldset-legend-3.html
-== fieldset-legend-4.html fieldset-legend-4.html
-== fieldset-legend-5.html fieldset-legend-5.html
diff --git a/layout/reftests/css-disabled/input/reftest-stylo.list b/layout/reftests/css-disabled/input/reftest-stylo.list
deleted file mode 100644
index 1098da7eac..0000000000
--- a/layout/reftests/css-disabled/input/reftest-stylo.list
+++ /dev/null
@@ -1,10 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== input-fieldset-1.html input-fieldset-1.html
-fuzzy-if(skiaContent,1,7) == input-fieldset-2.html input-fieldset-2.html
-fuzzy-if(skiaContent,1,7) == input-fieldset-3.html input-fieldset-3.html
-fails fuzzy-if(skiaContent,1,7) == input-fieldset-4.html input-fieldset-4.html
-== input-fieldset-legend-1.html input-fieldset-legend-1.html
-== input-fieldset-legend-2.html input-fieldset-legend-2.html
-== input-fieldset-legend-3.html input-fieldset-legend-3.html
-== input-fieldset-legend-4.html input-fieldset-legend-4.html
-== input-fieldset-legend-5.html input-fieldset-legend-5.html
diff --git a/layout/reftests/css-disabled/label/reftest-stylo.list b/layout/reftests/css-disabled/label/reftest-stylo.list
deleted file mode 100644
index d6630943f7..0000000000
--- a/layout/reftests/css-disabled/label/reftest-stylo.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== label.html label.html
diff --git a/layout/reftests/css-disabled/object/reftest-stylo.list b/layout/reftests/css-disabled/object/reftest-stylo.list
deleted file mode 100644
index 95bf97bcad..0000000000
--- a/layout/reftests/css-disabled/object/reftest-stylo.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== object.html object.html
diff --git a/layout/reftests/css-disabled/output/reftest-stylo.list b/layout/reftests/css-disabled/output/reftest-stylo.list
deleted file mode 100644
index 68e7140dd5..0000000000
--- a/layout/reftests/css-disabled/output/reftest-stylo.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== output.html output.html
diff --git a/layout/reftests/css-disabled/reftest-stylo.list b/layout/reftests/css-disabled/reftest-stylo.list
deleted file mode 100644
index 126670dbfe..0000000000
--- a/layout/reftests/css-disabled/reftest-stylo.list
+++ /dev/null
@@ -1,9 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-include fieldset/reftest-stylo.list
-include input/reftest-stylo.list
-include button/reftest-stylo.list
-include textarea/reftest-stylo.list
-include select/reftest-stylo.list
-include object/reftest-stylo.list
-include label/reftest-stylo.list
-include output/reftest-stylo.list
diff --git a/layout/reftests/css-disabled/select/reftest-stylo.list b/layout/reftests/css-disabled/select/reftest-stylo.list
deleted file mode 100644
index b9b5740c79..0000000000
--- a/layout/reftests/css-disabled/select/reftest-stylo.list
+++ /dev/null
@@ -1,14 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== select-fieldset-1.html select-fieldset-1.html
-fails-if(Android||B2G||Mulet) fuzzy-if(skiaContent,2,17) == select-fieldset-2.html select-fieldset-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) fuzzy-if(skiaContent,2,17) == select-fieldset-3.html select-fieldset-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android) fuzzy-if(skiaContent,2,13) == select-fieldset-4.html select-fieldset-4.html
-== select-fieldset-legend-1.html select-fieldset-legend-1.html
-fails-if(Android||B2G||Mulet) fuzzy-if(skiaContent,2,6) == select-fieldset-legend-2.html select-fieldset-legend-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) fuzzy-if(skiaContent,2,8) == select-fieldset-legend-3.html select-fieldset-legend-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(skiaContent,2,12) == select-fieldset-legend-4.html select-fieldset-legend-4.html
-fuzzy-if(skiaContent,2,5) == select-fieldset-legend-5.html select-fieldset-legend-5.html
diff --git a/layout/reftests/css-disabled/select/reftest.list b/layout/reftests/css-disabled/select/reftest.list
index 700f06471c..4843110461 100644
--- a/layout/reftests/css-disabled/select/reftest.list
+++ b/layout/reftests/css-disabled/select/reftest.list
@@ -1,9 +1,9 @@
-fuzzy-if(Android,12,1) == select-fieldset-1.html select-fieldset-ref.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,2,17) == select-fieldset-2.html select-fieldset-ref-disabled.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,2,17) == select-fieldset-3.html select-fieldset-ref-disabled.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,2,13) == select-fieldset-4.html select-fieldset-ref.html
+== select-fieldset-1.html select-fieldset-ref.html
+fuzzy-if(skiaContent,2,17) == select-fieldset-2.html select-fieldset-ref-disabled.html
+fuzzy-if(skiaContent,2,17) == select-fieldset-3.html select-fieldset-ref-disabled.html
+fuzzy-if(skiaContent,2,13) == select-fieldset-4.html select-fieldset-ref.html
 == select-fieldset-legend-1.html select-fieldset-legend-ref-1.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,2,6) == select-fieldset-legend-2.html select-fieldset-legend-ref-2.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,2,8) == select-fieldset-legend-3.html select-fieldset-legend-ref-3.html
+fuzzy-if(skiaContent,2,6) == select-fieldset-legend-2.html select-fieldset-legend-ref-2.html
+fuzzy-if(skiaContent,2,8) == select-fieldset-legend-3.html select-fieldset-legend-ref-3.html
 fuzzy-if(skiaContent,2,12) == select-fieldset-legend-4.html select-fieldset-legend-ref-4.html
 fuzzy-if(skiaContent,2,5) == select-fieldset-legend-5.html select-fieldset-legend-ref-5.html
diff --git a/layout/reftests/css-disabled/textarea/reftest-stylo.list b/layout/reftests/css-disabled/textarea/reftest-stylo.list
deleted file mode 100644
index 46e598475f..0000000000
--- a/layout/reftests/css-disabled/textarea/reftest-stylo.list
+++ /dev/null
@@ -1,10 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(skiaContent,1,10) == textarea-fieldset-1.html textarea-fieldset-1.html
-== textarea-fieldset-2.html textarea-fieldset-2.html
-== textarea-fieldset-3.html textarea-fieldset-3.html
-== textarea-fieldset-4.html textarea-fieldset-4.html
-fuzzy-if(skiaContent,1,5) == textarea-fieldset-legend-1.html textarea-fieldset-legend-1.html
-fuzzy-if(skiaContent,1,5) == textarea-fieldset-legend-2.html textarea-fieldset-legend-2.html
-fuzzy-if(skiaContent,1,5) == textarea-fieldset-legend-3.html textarea-fieldset-legend-3.html
-fuzzy-if(skiaContent,1,5) == textarea-fieldset-legend-4.html textarea-fieldset-legend-4.html
-fuzzy-if(skiaContent,1,5) == textarea-fieldset-legend-5.html textarea-fieldset-legend-5.html