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

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

4 files changed, 3 insertions, 427 deletions

diff --git a/layout/reftests/bidi/dirAuto/reftest-stylo.list b/layout/reftests/bidi/dirAuto/reftest-stylo.list
deleted file mode 100644
index 991841fee0..0000000000
--- a/layout/reftests/bidi/dirAuto/reftest-stylo.list
+++ /dev/null
@@ -1,120 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== bdi-auto-dir-default.html bdi-auto-dir-default.html
-== dir_auto-set-contained-dir-L.html dir_auto-set-contained-dir-L.html
-== dir_auto-set-contained-dir-R.html dir_auto-set-contained-dir-R.html
-== dir_auto-set-contained-invalid-dir-L.html dir_auto-set-contained-invalid-dir-L.html
-== dir_auto-set-contained-invalid-dir-R.html dir_auto-set-contained-invalid-dir-R.html
-== dir_auto-unset-contained-dir-L.html dir_auto-unset-contained-dir-L.html
-== dir_auto-unset-contained-dir-R.html dir_auto-unset-contained-dir-R.html
-== dynamicDirAuto-setLTR-Auto1.html dynamicDirAuto-setLTR-Auto1.html
-== dynamicDirAuto-setLTR-Auto2.html dynamicDirAuto-setLTR-Auto2.html
-== dynamicDirAuto-setLTR-Auto3.html dynamicDirAuto-setLTR-Auto3.html
-== dynamicDirAuto-setLTR-Auto4.html dynamicDirAuto-setLTR-Auto4.html
-== dynamicDirAuto-setLTR-Auto5.html dynamicDirAuto-setLTR-Auto5.html
-== dynamicDirAuto-setLTR-Auto6.html dynamicDirAuto-setLTR-Auto6.html
-== dynamicDirAuto-setLTR-LTR1.html dynamicDirAuto-setLTR-LTR1.html
-== dynamicDirAuto-setLTR-LTR2.html dynamicDirAuto-setLTR-LTR2.html
-== dynamicDirAuto-setLTR-LTR3.html dynamicDirAuto-setLTR-LTR3.html
-== dynamicDirAuto-setLTR-LTR4.html dynamicDirAuto-setLTR-LTR4.html
-== dynamicDirAuto-setLTR-LTR5.html dynamicDirAuto-setLTR-LTR5.html
-== dynamicDirAuto-setLTR-LTR6.html dynamicDirAuto-setLTR-LTR6.html
-== dynamicDirAuto-setLTR-LTR7.html dynamicDirAuto-setLTR-LTR7.html
-== dynamicDirAuto-setLTR-LTR8.html dynamicDirAuto-setLTR-LTR8.html
-== dynamicDirAuto-setLTR-RTL1.html dynamicDirAuto-setLTR-RTL1.html
-== dynamicDirAuto-setLTR-RTL2.html dynamicDirAuto-setLTR-RTL2.html
-== dynamicDirAuto-setLTR-RTL3.html dynamicDirAuto-setLTR-RTL3.html
-== dynamicDirAuto-setLTR-RTL4.html dynamicDirAuto-setLTR-RTL4.html
-== dynamicDirAuto-setLTR-RTL5.html dynamicDirAuto-setLTR-RTL5.html
-== dynamicDirAuto-setLTR-RTL6.html dynamicDirAuto-setLTR-RTL6.html
-== dynamicDirAuto-setLTR-RTL7.html dynamicDirAuto-setLTR-RTL7.html
-== dynamicDirAuto-setLTR-RTL8.html dynamicDirAuto-setLTR-RTL8.html
-== dynamicDirAuto-setLTR-NoDir1.html dynamicDirAuto-setLTR-NoDir1.html
-== dynamicDirAuto-setLTR-NoDir2.html dynamicDirAuto-setLTR-NoDir2.html
-== dynamicDirAuto-setLTR-NoDir3.html dynamicDirAuto-setLTR-NoDir3.html
-== dynamicDirAuto-setLTR-NoDir4.html dynamicDirAuto-setLTR-NoDir4.html
-== dynamicDirAuto-setLTR-NoDir5.html dynamicDirAuto-setLTR-NoDir5.html
-== dynamicDirAuto-setLTR-NoDir6.html dynamicDirAuto-setLTR-NoDir6.html
-== dynamicDirAuto-setLTR-NoDir7.html dynamicDirAuto-setLTR-NoDir7.html
-== dynamicDirAuto-setLTR-NoDir8.html dynamicDirAuto-setLTR-NoDir8.html
-== dynamicDirAuto-setLTR-InvalidDir1.html dynamicDirAuto-setLTR-InvalidDir1.html
-== dynamicDirAuto-setLTR-InvalidDir2.html dynamicDirAuto-setLTR-InvalidDir2.html
-== dynamicDirAuto-setLTR-InvalidDir3.html dynamicDirAuto-setLTR-InvalidDir3.html
-== dynamicDirAuto-setLTR-InvalidDir4.html dynamicDirAuto-setLTR-InvalidDir4.html
-== dynamicDirAuto-setLTR-InvalidDir5.html dynamicDirAuto-setLTR-InvalidDir5.html
-== dynamicDirAuto-setLTR-InvalidDir6.html dynamicDirAuto-setLTR-InvalidDir6.html
-== dynamicDirAuto-setLTR-InvalidDir7.html dynamicDirAuto-setLTR-InvalidDir7.html
-== dynamicDirAuto-setLTR-InvalidDir7.html dynamicDirAuto-setLTR-InvalidDir7.html
-== dynamicDirAuto-setRTL-Auto1.html dynamicDirAuto-setRTL-Auto1.html
-== dynamicDirAuto-setRTL-Auto2.html dynamicDirAuto-setRTL-Auto2.html
-== dynamicDirAuto-setRTL-Auto3.html dynamicDirAuto-setRTL-Auto3.html
-== dynamicDirAuto-setRTL-Auto4.html dynamicDirAuto-setRTL-Auto4.html
-== dynamicDirAuto-setRTL-Auto5.html dynamicDirAuto-setRTL-Auto5.html
-== dynamicDirAuto-setRTL-Auto6.html dynamicDirAuto-setRTL-Auto6.html
-== dynamicDirAuto-setRTL-LTR1.html dynamicDirAuto-setRTL-LTR1.html
-== dynamicDirAuto-setRTL-LTR2.html dynamicDirAuto-setRTL-LTR2.html
-== dynamicDirAuto-setRTL-LTR3.html dynamicDirAuto-setRTL-LTR3.html
-== dynamicDirAuto-setRTL-LTR4.html dynamicDirAuto-setRTL-LTR4.html
-== dynamicDirAuto-setRTL-LTR5.html dynamicDirAuto-setRTL-LTR5.html
-== dynamicDirAuto-setRTL-LTR6.html dynamicDirAuto-setRTL-LTR6.html
-== dynamicDirAuto-setRTL-LTR7.html dynamicDirAuto-setRTL-LTR7.html
-== dynamicDirAuto-setRTL-LTR8.html dynamicDirAuto-setRTL-LTR8.html
-== dynamicDirAuto-setRTL-RTL1.html dynamicDirAuto-setRTL-RTL1.html
-== dynamicDirAuto-setRTL-RTL2.html dynamicDirAuto-setRTL-RTL2.html
-== dynamicDirAuto-setRTL-RTL3.html dynamicDirAuto-setRTL-RTL3.html
-== dynamicDirAuto-setRTL-RTL4.html dynamicDirAuto-setRTL-RTL4.html
-== dynamicDirAuto-setRTL-RTL5.html dynamicDirAuto-setRTL-RTL5.html
-== dynamicDirAuto-setRTL-RTL6.html dynamicDirAuto-setRTL-RTL6.html
-== dynamicDirAuto-setRTL-RTL7.html dynamicDirAuto-setRTL-RTL7.html
-== dynamicDirAuto-setRTL-RTL8.html dynamicDirAuto-setRTL-RTL8.html
-== dynamicDirAuto-setRTL-NoDir1.html dynamicDirAuto-setRTL-NoDir1.html
-== dynamicDirAuto-setRTL-NoDir2.html dynamicDirAuto-setRTL-NoDir2.html
-== dynamicDirAuto-setRTL-NoDir3.html dynamicDirAuto-setRTL-NoDir3.html
-== dynamicDirAuto-setRTL-NoDir4.html dynamicDirAuto-setRTL-NoDir4.html
-== dynamicDirAuto-setRTL-NoDir5.html dynamicDirAuto-setRTL-NoDir5.html
-== dynamicDirAuto-setRTL-NoDir6.html dynamicDirAuto-setRTL-NoDir6.html
-== dynamicDirAuto-setRTL-NoDir7.html dynamicDirAuto-setRTL-NoDir7.html
-== dynamicDirAuto-setRTL-NoDir8.html dynamicDirAuto-setRTL-NoDir8.html
-== dynamicDirAuto-setRTL-InvalidDir1.html dynamicDirAuto-setRTL-InvalidDir1.html
-== dynamicDirAuto-setRTL-InvalidDir2.html dynamicDirAuto-setRTL-InvalidDir2.html
-== dynamicDirAuto-setRTL-InvalidDir3.html dynamicDirAuto-setRTL-InvalidDir3.html
-== dynamicDirAuto-setRTL-InvalidDir4.html dynamicDirAuto-setRTL-InvalidDir4.html
-== dynamicDirAuto-setRTL-InvalidDir5.html dynamicDirAuto-setRTL-InvalidDir5.html
-== dynamicDirAuto-setRTL-InvalidDir6.html dynamicDirAuto-setRTL-InvalidDir6.html
-== dynamicDirAuto-setRTL-InvalidDir7.html dynamicDirAuto-setRTL-InvalidDir7.html
-== dynamicDirAuto-setRTL-InvalidDir8.html dynamicDirAuto-setRTL-InvalidDir8.html
-== dynamicDirAuto-addLTR-Auto.html dynamicDirAuto-addLTR-Auto.html
-== dynamicDirAuto-addRTL-Auto.html dynamicDirAuto-addRTL-Auto.html
-== dynamicDirAuto-ChangeText-LTR1.html dynamicDirAuto-ChangeText-LTR1.html
-== dynamicDirAuto-ChangeText-LTR2.html dynamicDirAuto-ChangeText-LTR2.html
-== dynamicDirAuto-ChangeText-LTR3.html dynamicDirAuto-ChangeText-LTR3.html
-== dynamicDirAuto-ChangeText-LTR4.html dynamicDirAuto-ChangeText-LTR4.html
-== dynamicDirAuto-ChangeText-LTR5.html dynamicDirAuto-ChangeText-LTR5.html
-== dynamicDirAuto-ChangeText-LTR6.html dynamicDirAuto-ChangeText-LTR6.html
-== dynamicDirAuto-ChangeText-LTR7.html dynamicDirAuto-ChangeText-LTR7.html
-== dynamicDirAuto-ChangeText-LTR8.html dynamicDirAuto-ChangeText-LTR8.html
-== dynamicDirAuto-ChangeText-LTR9.html dynamicDirAuto-ChangeText-LTR9.html
-== dynamicDirAuto-ChangeText-LTR10.html dynamicDirAuto-ChangeText-LTR10.html
-== dynamicDirAuto-ChangeText-RTL1.html dynamicDirAuto-ChangeText-RTL1.html
-== dynamicDirAuto-ChangeText-RTL2.html dynamicDirAuto-ChangeText-RTL2.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,30,1) == dynamicDirAuto-ChangeText-RTL3.html dynamicDirAuto-ChangeText-RTL3.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,30,1) == dynamicDirAuto-ChangeText-RTL4.html dynamicDirAuto-ChangeText-RTL4.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,30,1) == dynamicDirAuto-ChangeText-RTL5.html dynamicDirAuto-ChangeText-RTL5.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,30,1) == dynamicDirAuto-ChangeText-RTL6.html dynamicDirAuto-ChangeText-RTL6.html
-== dynamicDirAuto-ChangeText-RTL7.html dynamicDirAuto-ChangeText-RTL7.html
-== dynamicDirAuto-ChangeText-RTL8.html dynamicDirAuto-ChangeText-RTL8.html
-== dynamicDirAuto-ChangeText-RTL9.html dynamicDirAuto-ChangeText-RTL9.html
-== dynamicDirAuto-ChangeText-RTL10.html dynamicDirAuto-ChangeText-RTL10.html
-== dynamicDirAuto-DeleteText-LTR1.html dynamicDirAuto-DeleteText-LTR1.html
-== dynamicDirAuto-DeleteText-LTR2.html dynamicDirAuto-DeleteText-LTR2.html
-== dynamicDirAuto-DeleteText-LTR3.html dynamicDirAuto-DeleteText-LTR3.html
-== dynamicDirAuto-DeleteText-RTL1.html dynamicDirAuto-DeleteText-RTL1.html
-== dynamicDirAuto-DeleteText-RTL2.html dynamicDirAuto-DeleteText-RTL2.html
-== dynamicDirAuto-DeleteText-RTL3.html dynamicDirAuto-DeleteText-RTL3.html
-== 839886-1.html 839886-1.html
-== 859093-1.html 859093-1.html
-== 889742-1.html 889742-1.html
-== 1103348-1.html 1103348-1.html
-== 1169267-delete-add-1a.html 1169267-delete-add-1a.html
-== 1169267-delete-add-1b.html 1169267-delete-add-1b.html
-== 1169267-delete-add-2a.html 1169267-delete-add-2a.html
-== 1169267-delete-add-2b.html 1169267-delete-add-2b.html
diff --git a/layout/reftests/bidi/numeral/reftest-stylo.list b/layout/reftests/bidi/numeral/reftest-stylo.list
deleted file mode 100644
index b3cf247da3..0000000000
--- a/layout/reftests/bidi/numeral/reftest-stylo.list
+++ /dev/null
@@ -1,121 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-pref(bidi.numeral,0) == arabic-1.html arabic-1.html
-pref(bidi.numeral,1) == arabic-1.html arabic-1.html
-pref(bidi.numeral,2) == arabic-1.html arabic-1.html
-pref(bidi.numeral,3) == arabic-1.html arabic-1.html
-pref(bidi.numeral,4) == arabic-1.html arabic-1.html
-skip pref(bidi.numeral,0) == arabic-2.html arabic-2.html
-skip pref(bidi.numeral,1) == arabic-2.html arabic-2.html
-skip pref(bidi.numeral,2) == arabic-2.html arabic-2.html
-skip pref(bidi.numeral,3) == arabic-2.html arabic-2.html
-skip pref(bidi.numeral,4) == arabic-2.html arabic-2.html
-pref(bidi.numeral,0) == arabic-3.html arabic-3.html
-pref(bidi.numeral,1) == arabic-3.html arabic-3.html
-pref(bidi.numeral,2) == arabic-3.html arabic-3.html
-pref(bidi.numeral,3) == arabic-3.html arabic-3.html
-pref(bidi.numeral,4) == arabic-3.html arabic-3.html
-pref(bidi.numeral,0) == arabic-4.html arabic-4.html
-pref(bidi.numeral,1) == arabic-4.html arabic-4.html
-pref(bidi.numeral,2) == arabic-4.html arabic-4.html
-pref(bidi.numeral,3) == arabic-4.html arabic-4.html
-pref(bidi.numeral,4) == arabic-4.html arabic-4.html
-pref(bidi.numeral,0) == arabic-5.html arabic-5.html
-pref(bidi.numeral,1) == arabic-5.html arabic-5.html
-pref(bidi.numeral,2) == arabic-5.html arabic-5.html
-pref(bidi.numeral,3) == arabic-5.html arabic-5.html
-pref(bidi.numeral,4) == arabic-5.html arabic-5.html
-pref(bidi.numeral,0) == bug441782-1.html bug441782-1.html
-pref(bidi.numeral,1) == bug441782-1.html bug441782-1.html
-pref(bidi.numeral,2) == bug441782-1.html bug441782-1.html
-pref(bidi.numeral,3) == bug441782-1.html bug441782-1.html
-pref(bidi.numeral,4) == bug441782-1.html bug441782-1.html
-pref(bidi.numeral,0) == bug441782-2.html bug441782-2.html
-pref(bidi.numeral,1) == bug441782-2.html bug441782-2.html
-pref(bidi.numeral,2) == bug441782-2.html bug441782-2.html
-pref(bidi.numeral,3) == bug441782-2.html bug441782-2.html
-pref(bidi.numeral,4) == bug441782-2.html bug441782-2.html
-pref(bidi.numeral,0) == bug441782-3.html bug441782-3.html
-fails-if(winWidget&&!layersGPUAccelerated&&!(/^Windows\x20NT\x205\.1/.test(http.oscpu))&&!skiaContent) fuzzy-if(winWidget&&!d2d&&d3d11,13,1) pref(bidi.numeral,1) == bug441782-3.html bug441782-3.html
-fails-if(winWidget&&!layersGPUAccelerated&&!(/^Windows\x20NT\x205\.1/.test(http.oscpu))&&!skiaContent) fuzzy-if(winWidget&&!d2d&&d3d11,13,1) pref(bidi.numeral,2) == bug441782-3.html bug441782-3.html
-fails-if(winWidget&&!layersGPUAccelerated&&!(/^Windows\x20NT\x205\.1/.test(http.oscpu))&&!skiaContent) fuzzy-if(winWidget&&!d2d&&d3d11,13,1) pref(bidi.numeral,3) == bug441782-3.html bug441782-3.html
-pref(bidi.numeral,4) == bug441782-3.html bug441782-3.html
-pref(bidi.numeral,0) == bug441782-4.html bug441782-4.html
-pref(bidi.numeral,1) == bug441782-4.html bug441782-4.html
-pref(bidi.numeral,2) == bug441782-4.html bug441782-4.html
-pref(bidi.numeral,3) == bug441782-4.html bug441782-4.html
-pref(bidi.numeral,4) == bug441782-4.html bug441782-4.html
-pref(bidi.numeral,0) == bug441782-5.html bug441782-5.html
-pref(bidi.numeral,1) == bug441782-5.html bug441782-5.html
-pref(bidi.numeral,2) == bug441782-5.html bug441782-5.html
-pref(bidi.numeral,3) == bug441782-5.html bug441782-5.html
-pref(bidi.numeral,4) == bug441782-5.html bug441782-5.html
-pref(bidi.numeral,0) == bug467672-1.html bug467672-1.html
-pref(bidi.numeral,1) == bug467672-1.html bug467672-1.html
-pref(bidi.numeral,2) == bug467672-1.html bug467672-1.html
-pref(bidi.numeral,3) == bug467672-1.html bug467672-1.html
-pref(bidi.numeral,4) == bug467672-1.html bug467672-1.html
-pref(bidi.numeral,5) == bug467672-1.html bug467672-1.html
-pref(bidi.numeral,6) == bug467672-1.html bug467672-1.html
-pref(bidi.numeral,0) == bug467672-2.html bug467672-2.html
-pref(bidi.numeral,1) == bug467672-2.html bug467672-2.html
-pref(bidi.numeral,2) == bug467672-2.html bug467672-2.html
-pref(bidi.numeral,3) == bug467672-2.html bug467672-2.html
-pref(bidi.numeral,4) == bug467672-2.html bug467672-2.html
-pref(bidi.numeral,5) == bug467672-2.html bug467672-2.html
-pref(bidi.numeral,6) == bug467672-2.html bug467672-2.html
-pref(bidi.numeral,0) == bug467672-3.html bug467672-3.html
-pref(bidi.numeral,1) == bug467672-3.html bug467672-3.html
-pref(bidi.numeral,2) == bug467672-3.html bug467672-3.html
-pref(bidi.numeral,3) == bug467672-3.html bug467672-3.html
-pref(bidi.numeral,4) == bug467672-3.html bug467672-3.html
-pref(bidi.numeral,5) == bug467672-3.html bug467672-3.html
-pref(bidi.numeral,6) == bug467672-3.html bug467672-3.html
-pref(bidi.numeral,0) == bug467672-4.html bug467672-4.html
-pref(bidi.numeral,1) == bug467672-4.html bug467672-4.html
-pref(bidi.numeral,2) == bug467672-4.html bug467672-4.html
-pref(bidi.numeral,3) == bug467672-4.html bug467672-4.html
-pref(bidi.numeral,4) == bug467672-4.html bug467672-4.html
-pref(bidi.numeral,5) == bug467672-4.html bug467672-4.html
-pref(bidi.numeral,6) == bug467672-4.html bug467672-4.html
-pref(bidi.numeral,0) == bug467672-5.html bug467672-5.html
-pref(bidi.numeral,1) == bug467672-5.html bug467672-5.html
-pref(bidi.numeral,2) == bug467672-5.html bug467672-5.html
-pref(bidi.numeral,3) == bug467672-5.html bug467672-5.html
-pref(bidi.numeral,4) == bug467672-5.html bug467672-5.html
-pref(bidi.numeral,5) == bug467672-5.html bug467672-5.html
-pref(bidi.numeral,6) == bug467672-5.html bug467672-5.html
-pref(bidi.numeral,0) == persian-1.html persian-1.html
-pref(bidi.numeral,1) == persian-1.html persian-1.html
-pref(bidi.numeral,2) == persian-1.html persian-1.html
-pref(bidi.numeral,3) == persian-1.html persian-1.html
-pref(bidi.numeral,4) == persian-1.html persian-1.html
-pref(bidi.numeral,5) == persian-1.html persian-1.html
-pref(bidi.numeral,6) == persian-1.html persian-1.html
-skip pref(bidi.numeral,0) == persian-2.html persian-2.html
-skip pref(bidi.numeral,1) == persian-2.html persian-2.html
-skip pref(bidi.numeral,2) == persian-2.html persian-2.html
-skip pref(bidi.numeral,3) == persian-2.html persian-2.html
-skip pref(bidi.numeral,4) == persian-2.html persian-2.html
-skip pref(bidi.numeral,5) == persian-2.html persian-2.html
-skip pref(bidi.numeral,6) == persian-2.html persian-2.html
-pref(bidi.numeral,0) == persian-3.html persian-3.html
-pref(bidi.numeral,1) == persian-3.html persian-3.html
-pref(bidi.numeral,2) == persian-3.html persian-3.html
-pref(bidi.numeral,3) == persian-3.html persian-3.html
-pref(bidi.numeral,4) == persian-3.html persian-3.html
-pref(bidi.numeral,5) == persian-3.html persian-3.html
-pref(bidi.numeral,6) == persian-3.html persian-3.html
-pref(bidi.numeral,0) == persian-4.html persian-4.html
-pref(bidi.numeral,1) == persian-4.html persian-4.html
-pref(bidi.numeral,2) == persian-4.html persian-4.html
-pref(bidi.numeral,3) == persian-4.html persian-4.html
-pref(bidi.numeral,4) == persian-4.html persian-4.html
-pref(bidi.numeral,5) == persian-4.html persian-4.html
-pref(bidi.numeral,6) == persian-4.html persian-4.html
-pref(bidi.numeral,0) == persian-5.html persian-5.html
-pref(bidi.numeral,1) == persian-5.html persian-5.html
-pref(bidi.numeral,2) == persian-5.html persian-5.html
-pref(bidi.numeral,3) == persian-5.html persian-5.html
-pref(bidi.numeral,4) == persian-5.html persian-5.html
-pref(bidi.numeral,5) == persian-5.html persian-5.html
-pref(bidi.numeral,6) == persian-5.html persian-5.html
diff --git a/layout/reftests/bidi/reftest-stylo.list b/layout/reftests/bidi/reftest-stylo.list
deleted file mode 100644
index d0a854e7f3..0000000000
--- a/layout/reftests/bidi/reftest-stylo.list
+++ /dev/null
@@ -1,183 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-include dirAuto/reftest-stylo.list
-include numeral/reftest-stylo.list
-== bdi-element.html bdi-element.html
-== bidi-000.html bidi-000.html
-== bidi-001.html bidi-001.html
-== bidi-001-j.html bidi-001-j.html
-== bidi-001-v.html bidi-001-v.html
-== bidi-002.html bidi-002.html
-== bidi-003.html bidi-003.html
-== bidi-004.html bidi-004.html
-== bidi-004-j.html bidi-004-j.html
-== bidi-005.html bidi-005.html
-random-if(cocoaWidget) == bidi-006.html bidi-006.html
-# bug 734313
-random-if(cocoaWidget) == bidi-006-j.html bidi-006-j.html
-# bug 734313
-== bidiSVG-01.svg bidiSVG-01.svg
-== bidiSVG-02.svg bidiSVG-02.svg
-skip == bidiSVG-03.svg bidiSVG-03.svg
-== bidiSVG-04.svg bidiSVG-04.svg
-== bidiSVG-05.svg bidiSVG-05.svg
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) HTTP(..) == bidiMirroring.svg bidiMirroring.svg
-# test for glyph mirroring in right-to-left text
-== mirroring-01.html mirroring-01.html
-# quote marks are not supposed to mirror, but Unicode 5.0 said they should, so some systems do it
-random-if(cocoaWidget) == mirroring-02.html mirroring-02.html
-== mirroring-03.html mirroring-03.html
-== mixedChartype-00.html mixedChartype-00.html
-== mixedChartype-00-j.html mixedChartype-00-j.html
-== mixedChartype-01.html mixedChartype-01.html
-== mixedChartype-01-j.html mixedChartype-01-j.html
-== mixedChartype-02.html mixedChartype-02.html
-== mixedChartype-02-j.html mixedChartype-02-j.html
-== mixedChartype-03.html mixedChartype-03.html
-== mixedChartype-03-j.html mixedChartype-03-j.html
-== unicode-bidi-anonymous-001.html unicode-bidi-anonymous-001.html
-== unicode-bidi-anonymous-002.html unicode-bidi-anonymous-002.html
-== unicode-bidi-isolate-basic.html unicode-bidi-isolate-basic.html
-== unicode-bidi-isolate-aharon.html unicode-bidi-isolate-aharon.html
-fails fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,73,1) fuzzy-if(skiaContent,104,32) == unicode-bidi-plaintext.html unicode-bidi-plaintext.html
-== unicode-bidi-plaintext-textarea-1.html unicode-bidi-plaintext-textarea-1.html
-== unicode-bidi-plaintext-textarea-2.html unicode-bidi-plaintext-textarea-2.html
-== unicode-bidi-plaintext-textarea-3.html unicode-bidi-plaintext-textarea-3.html
-== unicode-bidi-plaintext-textarea-4.html unicode-bidi-plaintext-textarea-4.html
-== with-first-letter-1a.html with-first-letter-1a.html
-== with-first-letter-1b.html with-first-letter-1b.html
-random-if(cocoaWidget) == with-first-letter-2a.html with-first-letter-2a.html
-# bug 734313
-random-if(cocoaWidget) == with-first-letter-2b.html with-first-letter-2b.html
-# bug 734313
-== 83958-1a.html 83958-1a.html
-== 83958-1b.html 83958-1b.html
-== 83958-1c.html 83958-1c.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,111,7) == 83958-2a.html 83958-2a.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,111,7) == 83958-2b.html 83958-2b.html
-== 115921-1.html 115921-1.html
-== 115921-2.html 115921-2.html
-== 151407-1.html 151407-1.html
-== 151407-1a.html 151407-1a.html
-== 151407-2-ltr.html 151407-2-ltr.html
-== 151407-2-rtl.html 151407-2-rtl.html
-== 151407-2-auto.html 151407-2-auto.html
-== 151407-2-empty.html 151407-2-empty.html
-== 151407-2-foopy.html 151407-2-foopy.html
-== 151407-3-ltr.html 151407-3-ltr.html
-== 151407-3-rtl.html 151407-3-rtl.html
-== 151407-3-auto.html 151407-3-auto.html
-== 151407-3-foopy.html 151407-3-foopy.html
-== 229367-1.html 229367-1.html
-== 229367-2.html 229367-2.html
-== 229367-3.html 229367-3.html
-== 258928-1.html 258928-1.html
-== 263359-1.html 263359-1.html
-== 263359-1a.html 263359-1a.html
-== 263359-1b.html 263359-1b.html
-== 263359-2.html 263359-2.html
-== 263359-3.html 263359-3.html
-== 263359-4.html 263359-4.html
-random-if(winWidget) fuzzy-if(skiaContent,1,1700) == 267459-1.html 267459-1.html
-# depends on windows version, see bug 590101
-fuzzy-if(skiaContent,1,1100) == 267459-2.html 267459-2.html
-== 299065-1.html 299065-1.html
-random-if(winWidget) == 305643-1.html 305643-1.html
-# depends on windows version, see bug 590101
-== 332655-1.html 332655-1.html
-== 332655-2.html 332655-2.html
-== 381279-1.html 381279-1.html
-== 386339.html 386339.html
-== 409375.html 409375.html
-== 413542-1.html 413542-1.html
-== 413542-2.html 413542-2.html
-random-if((B2G&&browserIsRemote)||Mulet) == 413928-1.html 413928-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if((B2G&&browserIsRemote)||Mulet) == 413928-2.html 413928-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 425338-1a.html 425338-1a.html
-== 425338-1b.html 425338-1b.html
-skip == 489517-1.html 489517-1.html
-== 489887-1.html 489887-1.html
-== 492231-1.html 492231-1.html
-== 496006-1.html 496006-1.html
-== 503269-1.html 503269-1.html
-== 503957-1.html 503957-1.html
-== 525740-1.html 525740-1.html
-== 536963-1.html 536963-1.html
-== 562169-1.html 562169-1.html
-== 562169-1a.html 562169-1a.html
-== 562169-2.html 562169-2.html
-== 562169-2a.html 562169-2a.html
-== 562169-3.html 562169-3.html
-== 562169-3a.html 562169-3a.html
-skip == 562169-4.html 562169-4.html
-== 588739-1.html 588739-1.html
-== 588739-2.html 588739-2.html
-== 588739-3.html 588739-3.html
-== 612843-1.html 612843-1.html
-== 613149-1a.html 613149-1a.html
-== 613149-1b.html 613149-1b.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,36,2) == 613149-2a.html 613149-2a.html
-fuzzy-if(Android,24,1) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,36,2) == 613149-2b.html 613149-2b.html
-== 613157-1.html 613157-1.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,255,6) == 613157-2.html 613157-2.html
-== 662288-1.html 662288-1.html
-skip == 670226-1.html 670226-1.html
-== 676245-1.html 676245-1.html
-skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,3) == 698291-1.html 698291-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 698706-1.html 698706-1.html
-== 704837-1.html 704837-1.html
-== 712600-1.html 712600-1.html
-== 712600-2.html 712600-2.html
-skip == 712600-2-dyn.html 712600-2-dyn.html
-== 712600-3.html 712600-3.html
-== 718236-1.html 718236-1.html
-== 718236-2.html 718236-2.html
-== 718236-3.html 718236-3.html
-skip-if(B2G||Mulet) == 726420-1.html 726420-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 726460-1.html 726460-1.html
-== 729047-1.html 729047-1.html
-== 730562-1.html 730562-1.html
-== 746987-1.html 746987-1.html
-== 746987-2.html 746987-2.html
-== 746987-3.html 746987-3.html
-== 746987-4.html 746987-4.html
-== 779003-1.html 779003-1.html
-== 779003-1-dynamic.html 779003-1-dynamic.html
-== 817406-1.html 817406-1.html
-== 817406-2.html 817406-2.html
-== 817406-3.html 817406-3.html
-== 817406-4.html 817406-4.html
-== 847242-1.html 847242-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,11) == 869833-1.xul 869833-1.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 922530-1.html 922530-1.html
-== 922550-1.html 922550-1.html
-== 1067268-1.html 1067268-1.html
-== 1069941-inline-bidi-border-1.html 1069941-inline-bidi-border-1.html
-== 1069941-inline-bidi-margin-1.html 1069941-inline-bidi-margin-1.html
-skip-if(B2G||Mulet) == 1155359-1.xul 1155359-1.xul
-== 1157726-1.html 1157726-1.html
-skip == 1161752.html 1161752.html
-== 1161752-5-embed.html 1161752-5-embed.html
-== brackets-1a-ltr.html brackets-1a-ltr.html
-== brackets-1a-rtl.html brackets-1a-rtl.html
-== brackets-1b-ltr.html brackets-1b-ltr.html
-== brackets-1b-rtl.html brackets-1b-rtl.html
-== brackets-1c-ltr.html brackets-1c-ltr.html
-== brackets-1c-rtl.html brackets-1c-rtl.html
-== brackets-2a-ltr.html brackets-2a-ltr.html
-fuzzy-if(Android,254,557) == brackets-2a-rtl.html brackets-2a-rtl.html
-== brackets-2b-ltr.html brackets-2b-ltr.html
-== brackets-2b-rtl.html brackets-2b-rtl.html
-== brackets-2c-ltr.html brackets-2c-ltr.html
-fuzzy-if(Android,254,231) == brackets-2c-rtl.html brackets-2c-rtl.html
-== brackets-3a-ltr.html brackets-3a-ltr.html
-== brackets-3a-rtl.html brackets-3a-rtl.html
-== brackets-3b-ltr.html brackets-3b-ltr.html
-== brackets-3b-rtl.html brackets-3b-rtl.html
-== 1217833-1.html 1217833-1.html
-== 1217833-2.html 1217833-2.html
-== 1231175-1.html 1231175-1.html
diff --git a/layout/reftests/bidi/reftest.list b/layout/reftests/bidi/reftest.list
index 5044e657fe..a8e445aec4 100644
--- a/layout/reftests/bidi/reftest.list
+++ b/layout/reftests/bidi/reftest.list
@@ -109,7 +109,7 @@ random-if(winWidget) == 305643-1.html 305643-1-ref.html # depends on windows ver
 == 613149-1a.html 613149-1-ref.html
 == 613149-1b.html 613149-1-ref.html
 fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,36,2) == 613149-2a.html 613149-2-ref.html
-fuzzy-if(Android,24,1) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,36,2) == 613149-2b.html 613149-2-ref.html
+fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,36,2) == 613149-2b.html 613149-2-ref.html
 == 613157-1.html 613157-1-ref.html
 fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,255,6) == 613157-2.html 613157-2-ref.html
 == 662288-1.html 662288-1-ref.html
@@ -157,11 +157,11 @@ fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,11) == 869833-1.xul 869833-1-ref.xul
 == brackets-1c-ltr.html brackets-1c-ltr-ref.html
 == brackets-1c-rtl.html brackets-1c-rtl-ref.html
 == brackets-2a-ltr.html brackets-2a-ltr-ref.html
-fuzzy-if(Android,254,557) == brackets-2a-rtl.html brackets-2a-rtl-ref.html
+== brackets-2a-rtl.html brackets-2a-rtl-ref.html
 == brackets-2b-ltr.html brackets-2b-ltr-ref.html
 == brackets-2b-rtl.html brackets-2b-rtl-ref.html
 == brackets-2c-ltr.html brackets-2c-ltr-ref.html
-fuzzy-if(Android,254,231) == brackets-2c-rtl.html brackets-2c-rtl-ref.html
+== brackets-2c-rtl.html brackets-2c-rtl-ref.html
 == brackets-3a-ltr.html brackets-3a-ltr-ref.html
 == brackets-3a-rtl.html brackets-3a-rtl-ref.html
 == brackets-3b-ltr.html brackets-3b-ltr-ref.html