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

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

3 files changed, 1 insertions, 53 deletions

diff --git a/layout/reftests/forms/meter/default-style/reftest-stylo.list b/layout/reftests/forms/meter/default-style/reftest-stylo.list
deleted file mode 100644
index 55cd0b3e3..000000000
--- a/layout/reftests/forms/meter/default-style/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== default-style.html default-style.html
-== default-style-dyn.html default-style-dyn.html
diff --git a/layout/reftests/forms/meter/reftest-stylo.list b/layout/reftests/forms/meter/reftest-stylo.list
deleted file mode 100644
index ef10df30d..000000000
--- a/layout/reftests/forms/meter/reftest-stylo.list
+++ /dev/null
@@ -1,49 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(Android,128,16) == values.html values.html
-== values-rtl.html values-rtl.html
-== margin-padding.html margin-padding.html
-== margin-padding-rtl.html margin-padding-rtl.html
-skip-if(B2G||Mulet) == bar-pseudo-element.html bar-pseudo-element.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== bar-pseudo-element-rtl.html bar-pseudo-element-rtl.html
-
-# vertical tests
-== values-vertical.html values-vertical.html
-== values-vertical-rtl.html values-vertical-rtl.html
-== margin-padding-vertical.html margin-padding-vertical.html
-== margin-padding-vertical-rtl.html margin-padding-vertical-rtl.html
-skip-if(B2G||Mulet) == bar-pseudo-element-vertical.html bar-pseudo-element-vertical.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== bar-pseudo-element-vertical-rtl.html bar-pseudo-element-vertical-rtl.html
-
-# The following test is disabled but kept in the repository because the
-# transformations will not behave exactly the same for <meter> and two divs.
-# However, it would be possible to manually check those.
-# == transformations.html transformations.html
-
-# default style
-include default-style/reftest-stylo.list
-
-# Tests for bugs:
-== block-invalidate.html block-invalidate.html
-== in-cells.html in-cells.html
-== max-height.html max-height.html
-
-# Tests for block and inline orientation in combination with writing-mode
-# XXX Remove default-preferences setting here after bug 1138384 makes
-#     it the default for all channels
-
-== meter-orient-vertical.html meter-orient-vertical.html
-== meter-orient-horizontal.html meter-orient-horizontal.html
-== meter-orient-block.html meter-orient-block.html
-== meter-orient-inline.html meter-orient-inline.html
-== meter-vlr.html meter-vlr.html
-== meter-vlr-orient-block.html meter-vlr-orient-block.html
-== meter-vlr-orient-inline.html meter-vlr-orient-inline.html
-== meter-vlr-orient-horizontal.html meter-vlr-orient-horizontal.html
-skip == meter-vlr-orient-vertical.html meter-vlr-orient-vertical.html
-== meter-vrl.html meter-vrl.html
-== meter-vrl-orient-block.html meter-vrl-orient-block.html
-== meter-vrl-orient-inline.html meter-vrl-orient-inline.html
-== meter-vrl-orient-horizontal.html meter-vrl-orient-horizontal.html
-== meter-vrl-orient-vertical.html meter-vrl-orient-vertical.html
diff --git a/layout/reftests/forms/meter/reftest.list b/layout/reftests/forms/meter/reftest.list
index 0a92a6004..ec0b5fcb0 100644
--- a/layout/reftests/forms/meter/reftest.list
+++ b/layout/reftests/forms/meter/reftest.list
@@ -1,4 +1,4 @@
-fuzzy-if(Android,128,16) == values.html values-ref.html
+== values.html values-ref.html
 == values-rtl.html values-rtl-ref.html
 == margin-padding.html margin-padding-ref.html
 == margin-padding-rtl.html margin-padding-rtl-ref.html