From 45a1e29229805b5846b81f7f88ef944564e42b14 Mon Sep 17 00:00:00 2001 From: "L. David Baron" Date: Sun, 23 Mar 2014 18:44:49 -0700 Subject: [PATCH] Bug 986406 - Don't skip entire reftest directories on Android. r=roc --- layout/reftests/border-image/reftest.list | 4 +-- layout/reftests/box-shadow/reftest.list | 2 +- .../reftests/css-disabled/select/reftest.list | 2 +- layout/reftests/first-letter/reftest.list | 2 +- layout/reftests/forms/button/reftest.list | 8 +++--- layout/reftests/forms/input/file/reftest.list | 12 ++++---- .../reftests/forms/input/number/reftest.list | 8 +++--- .../reftests/forms/input/range/reftest.list | 2 +- layout/reftests/forms/meter/reftest.list | 2 +- layout/reftests/native-theme/reftest.list | 4 ++- layout/reftests/reftest.list | 28 +++++++++---------- layout/reftests/scrolling/reftest.list | 2 +- layout/reftests/text-shadow/reftest.list | 4 +-- 13 files changed, 41 insertions(+), 39 deletions(-) diff --git a/layout/reftests/border-image/reftest.list b/layout/reftests/border-image/reftest.list index c5d0cfb27d07..a287bddac5f7 100644 --- a/layout/reftests/border-image/reftest.list +++ b/layout/reftests/border-image/reftest.list @@ -15,8 +15,8 @@ != different-h-v-2.html different-h-v-ref.html != different-h-v-1.html different-h-v-2.html == center-scaling-1.html center-scaling-1-ref.html -== center-scaling-2.html center-scaling-2-ref.html -== center-scaling-3.html center-scaling-3-ref.html +fails-if(Android) == center-scaling-2.html center-scaling-2-ref.html # very different scaling (blurriness) on some sides +fails-if(Android) == center-scaling-3.html center-scaling-3-ref.html # very different scaling (blurriness) on some sides == center-scaling-4t.html center-scaling-4t-ref.html == center-scaling-4r.html center-scaling-4r-ref.html == center-scaling-4b.html center-scaling-4b-ref.html diff --git a/layout/reftests/box-shadow/reftest.list b/layout/reftests/box-shadow/reftest.list index 2c8f6e915e49..e18a0f50c05e 100644 --- a/layout/reftests/box-shadow/reftest.list +++ b/layout/reftests/box-shadow/reftest.list @@ -2,7 +2,7 @@ != boxshadow-blur.html boxshadow-blur-notref.html != boxshadow-blur.html boxshadow-blur-notref2.html random == boxshadow-blur-2.html boxshadow-blur-2-ref.html # fixedpoint division in blur code makes this fail -random fails-if(Android) != boxshadow-blur-2.html boxshadow-blur-2-notref.html # fixedpoint division in blur code makes this fail +random != boxshadow-blur-2.html boxshadow-blur-2-notref.html # fixedpoint division in blur code makes this fail == boxshadow-multiple.html boxshadow-multiple-ref.html == boxshadow-spread.html boxshadow-spread-ref.html == tableboxshadow-basic.html tableboxshadow-basic-ref.html diff --git a/layout/reftests/css-disabled/select/reftest.list b/layout/reftests/css-disabled/select/reftest.list index a7a546c3339f..b825d6b2c5e2 100644 --- a/layout/reftests/css-disabled/select/reftest.list +++ b/layout/reftests/css-disabled/select/reftest.list @@ -1,7 +1,7 @@ == select-fieldset-1.html select-fieldset-ref.html fails-if(Android) == select-fieldset-2.html select-fieldset-ref-disabled.html fails-if(Android) == select-fieldset-3.html select-fieldset-ref-disabled.html -fails-if(Android) == select-fieldset-4.html select-fieldset-ref.html +== select-fieldset-4.html select-fieldset-ref.html == select-fieldset-legend-1.html select-fieldset-legend-ref-1.html fails-if(Android) == select-fieldset-legend-2.html select-fieldset-legend-ref-2.html fails-if(Android) == select-fieldset-legend-3.html select-fieldset-legend-ref-3.html diff --git a/layout/reftests/first-letter/reftest.list b/layout/reftests/first-letter/reftest.list index 30bd3a84ba4e..bcb407152d05 100644 --- a/layout/reftests/first-letter/reftest.list +++ b/layout/reftests/first-letter/reftest.list @@ -23,7 +23,7 @@ fails == quote-1e.html quote-1-ref.html # bug 509685 == quote-1e.html quote-1b.html == quote-1f.html quote-1-ref.html fails == dynamic-1.html dynamic-1-ref.html # bug 8253 -fails-if(Android) random-if(d2d) == dynamic-2.html dynamic-2-ref.html +random-if(d2d) == dynamic-2.html dynamic-2-ref.html == dynamic-3a.html dynamic-3-ref.html == dynamic-3b.html dynamic-3-ref.html == 23605-1.html 23605-1-ref.html diff --git a/layout/reftests/forms/button/reftest.list b/layout/reftests/forms/button/reftest.list index 4a85f05d0797..2ffdde8909a4 100644 --- a/layout/reftests/forms/button/reftest.list +++ b/layout/reftests/forms/button/reftest.list @@ -6,10 +6,10 @@ asserts(1) != first-letter-1.html first-letter-1-noref.html # The buttons in these tests have some fancy shading applied to their corners # on B2G, despite their "-moz-appearance: none; background: gray", so they # don't quite match the reference case's normal
. That's why they're fuzzy. -fuzzy-if(B2G,125,20) == percent-height-child-1.html percent-height-child-1-ref.html -fuzzy-if(B2G,125,80) == percent-height-child-2.html percent-height-child-2-ref.html -fuzzy-if(B2G,125,20) == percent-width-child-1.html percent-width-child-1-ref.html -fuzzy-if(B2G,125,80) == percent-width-child-2.html percent-width-child-2-ref.html +fuzzy-if(B2G||Android,125,20) == percent-height-child-1.html percent-height-child-1-ref.html +fuzzy-if(B2G||Android,125,80) == percent-height-child-2.html percent-height-child-2-ref.html +fuzzy-if(B2G||Android,125,20) == percent-width-child-1.html percent-width-child-1-ref.html +fuzzy-if(B2G||Android,125,80) == percent-width-child-2.html percent-width-child-2-ref.html == vertical-centering.html vertical-centering-ref.html diff --git a/layout/reftests/forms/input/file/reftest.list b/layout/reftests/forms/input/file/reftest.list index eb7653b5aaf9..61d9367c4a6c 100644 --- a/layout/reftests/forms/input/file/reftest.list +++ b/layout/reftests/forms/input/file/reftest.list @@ -1,8 +1,8 @@ # B2G failures: bug 855352. -fails-if(B2G) fuzzy-if(OSX==10.6,8,128) skip-if(B2G&&browserIsRemote) == simple.html simple-ref.xul # bug 974780 -fails-if(B2G) fuzzy-if(OSX==10.6,8,64) skip-if(B2G&&browserIsRemote) == rtl.html rtl-ref.xul # bug 974780 -fails-if(B2G) fuzzy-if(OSX==10.6,8,128) skip-if(B2G&&browserIsRemote) == size.html simple-ref.xul # bug 974780 -fails-if(B2G) fuzzy-if(OSX==10.6,8,64) skip-if(B2G&&browserIsRemote) == background.html background-ref.xul # bug 974780 -fails-if(B2G) skip-if(B2G&&browserIsRemote) == style.html style-ref.xul # bug 974780 +fails-if(B2G||Android) fuzzy-if(OSX==10.6,8,128) skip-if(B2G&&browserIsRemote) == simple.html simple-ref.xul # bug 974780 +fails-if(B2G||Android) fuzzy-if(OSX==10.6,8,64) skip-if(B2G&&browserIsRemote) == rtl.html rtl-ref.xul # bug 974780 +fails-if(B2G||Android) fuzzy-if(OSX==10.6,8,128) skip-if(B2G&&browserIsRemote) == size.html simple-ref.xul # bug 974780 +fails-if(B2G||Android) fuzzy-if(OSX==10.6,8,64) skip-if(B2G&&browserIsRemote) == background.html background-ref.xul # bug 974780 +fails-if(B2G||Android) skip-if(B2G&&browserIsRemote) == style.html style-ref.xul # bug 974780 != width-clip.html width-clip-ref.html -fails-if(B2G) == color-inherit.html color-inherit-ref.html +fails-if(B2G||Android) == color-inherit.html color-inherit-ref.html diff --git a/layout/reftests/forms/input/number/reftest.list b/layout/reftests/forms/input/number/reftest.list index a2918e770100..edfe074ad053 100644 --- a/layout/reftests/forms/input/number/reftest.list +++ b/layout/reftests/forms/input/number/reftest.list @@ -24,10 +24,10 @@ fuzzy-if(/^Windows\x20NT\x205\.1/.test(http.oscpu),64,4) fuzzy-if(cocoaWidget,63 == number-auto-width-1.html number-auto-width-1-ref.html # min-height/max-height tests: -skip-if(B2G) == number-min-height-1.html number-min-height-1-ref.html -skip-if(B2G) == number-min-height-2.html number-min-height-2-ref.html -skip-if(B2G) == number-max-height-1.html number-max-height-1-ref.html -skip-if(B2G) == number-max-height-2.html number-max-height-2-ref.html +skip-if(B2G||Android) == number-min-height-1.html number-min-height-1-ref.html +skip-if(B2G||Android) == number-min-height-2.html number-min-height-2-ref.html +skip-if(B2G||Android) == number-max-height-1.html number-max-height-1-ref.html +skip-if(B2G||Android) == number-max-height-2.html number-max-height-2-ref.html # focus # autofocus is disabled on B2G diff --git a/layout/reftests/forms/input/range/reftest.list b/layout/reftests/forms/input/range/reftest.list index 830db2254760..f7c74f31aaf4 100644 --- a/layout/reftests/forms/input/range/reftest.list +++ b/layout/reftests/forms/input/range/reftest.list @@ -27,7 +27,7 @@ fuzzy-if(B2G,1,1) == max-prop.html 100pct-common-ref.html == direction-unthemed-1.html direction-unthemed-1-ref.html # ::-moz-range-progress pseudo-element: -fails-if(B2G) == moz-range-progress-1.html moz-range-progress-1-ref.html +fails-if(B2G||Android) == moz-range-progress-1.html moz-range-progress-1-ref.html == moz-range-progress-2.html moz-range-progress-2-ref.html == moz-range-progress-3.html moz-range-progress-3-ref.html diff --git a/layout/reftests/forms/meter/reftest.list b/layout/reftests/forms/meter/reftest.list index fe30d2b86c26..17a4a8aa8194 100644 --- a/layout/reftests/forms/meter/reftest.list +++ b/layout/reftests/forms/meter/reftest.list @@ -1,4 +1,4 @@ -== values.html values-ref.html +fuzzy-if(Android,128,16) == 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 diff --git a/layout/reftests/native-theme/reftest.list b/layout/reftests/native-theme/reftest.list index 23dd3363bf7d..ce5cf67ee6da 100644 --- a/layout/reftests/native-theme/reftest.list +++ b/layout/reftests/native-theme/reftest.list @@ -76,7 +76,9 @@ skip-if(!winWidget) == scroll-thumb-minimum-size-notheme.html scroll-thumb-minim # These tests have been written to test the overflow of the window widget # (bug 568825) but we can't test it on Windows and Cocoa because they have # animated progress bars. +# Nothing shows up on Android, presumably because that appearance type is +# not implemented. skip-if(cocoaWidget) skip-if(winWidget) == progress-overflow.html progress-overflow-ref.html -skip-if(cocoaWidget) skip-if(winWidget) != progress-overflow-small.html progress-nobar.html +fails-if(Android) skip-if(cocoaWidget) skip-if(winWidget) != progress-overflow-small.html progress-nobar.html == 676387-1.xul 676387-1-ref.xul diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list index 825f1a878867..077a4b2687f6 100644 --- a/layout/reftests/reftest.list +++ b/layout/reftests/reftest.list @@ -25,7 +25,7 @@ skip-if(B2G) include backgrounds/reftest.list skip-if(B2G) include bidi/reftest.list # border-image -skip-if(Android||B2G) include border-image/reftest.list +skip-if(B2G) include border-image/reftest.list # border-radius/ skip-if(B2G) include border-radius/reftest.list @@ -40,7 +40,7 @@ skip-if(B2G) include box-ordinal/reftest.list skip-if(B2G) include box-properties/reftest.list # box-shadow/ -skip-if(Android||B2G) include box-shadow/reftest.list +skip-if(B2G) include box-shadow/reftest.list # bugs/ include bugs/reftest.list @@ -52,7 +52,7 @@ include canvas/reftest.list include css-animations/reftest.list # blending/ -skip-if(B2G||Android) include css-blending/reftest.list +skip-if(B2G) include css-blending/reftest.list # css calc() tests include css-calc/reftest.list @@ -64,10 +64,10 @@ skip-if(B2G) include css-charset/reftest.list skip-if(B2G) include css-default/reftest.list # css :disable tests -skip-if(Android||B2G) include css-disabled/reftest.list +skip-if(B2G) include css-disabled/reftest.list # css :enable tests -skip-if(Android||B2G) include css-enabled/reftest.list +skip-if(B2G) include css-enabled/reftest.list # css @import tests skip-if(B2G) include css-import/reftest.list @@ -91,10 +91,10 @@ skip-if(B2G) include css-required/reftest.list skip-if(B2G) include css-optional/reftest.list # css valid -skip-if(Android||B2G) include css-valid/reftest.list +skip-if(B2G) include css-valid/reftest.list # css invalid -skip-if(Android||B2G) include css-invalid/reftest.list +skip-if(B2G) include css-invalid/reftest.list # css-submit-invalid skip-if(B2G) include css-submit-invalid/reftest.list @@ -109,10 +109,10 @@ include css-selectors/reftest.list skip-if(B2G) include css-transitions/reftest.list # css :-moz-ui-invalid -skip-if(Android||B2G) include css-ui-invalid/reftest.list +skip-if(B2G) include css-ui-invalid/reftest.list # css :-moz-ui-valid -skip-if(Android||B2G) include css-ui-valid/reftest.list +skip-if(B2G) include css-ui-valid/reftest.list # css values and units skip-if(B2G) include css-valuesandunits/reftest.list @@ -145,7 +145,7 @@ skip-if(B2G) include dom/reftest.list skip-if(B2G) include generated-content/reftest.list # first-letter/ -skip-if(Android||B2G) include first-letter/reftest.list +skip-if(B2G) include first-letter/reftest.list # first-line/ skip-if(B2G) include first-line/reftest.list @@ -169,7 +169,7 @@ skip-if(B2G&&browserIsRemote) include font-inflation/reftest.list skip-if(B2G) include font-matching/reftest.list # forms -skip-if(Android) include forms/reftest.list +include forms/reftest.list # gfx include ../../gfx/tests/reftest/reftest.list @@ -217,7 +217,7 @@ skip-if(B2G) include margin-collapsing/reftest.list skip-if(B2G) include marquee/reftest.list # native-theme/ -skip-if(Android||B2G) include native-theme/reftest.list +skip-if(B2G) include native-theme/reftest.list # netwerk/ skip-if(B2G) include ../../netwerk/test/reftest/reftest.list @@ -256,7 +256,7 @@ skip-if(B2G) include pagination/reftest.list skip-if(B2G) include scoped-style/reftest.list # scrolling -skip-if(Android&&AndroidVersion>=15) include scrolling/reftest.list +include scrolling/reftest.list # selection include selection/reftest.list @@ -297,7 +297,7 @@ skip-if(B2G) include text-decoration/reftest.list skip-if(B2G) include text-indent/reftest.list # text-shadow/ -skip-if(Android||B2G) include text-shadow/reftest.list +skip-if(B2G) include text-shadow/reftest.list # text-svgglyphs/ include text-svgglyphs/reftest.list diff --git a/layout/reftests/scrolling/reftest.list b/layout/reftests/scrolling/reftest.list index c80f653c4ca2..d474ed9e66e0 100644 --- a/layout/reftests/scrolling/reftest.list +++ b/layout/reftests/scrolling/reftest.list @@ -12,7 +12,7 @@ skip-if(B2G&&browserIsRemote) HTTP == simple-1.html simple-1.html?ref skip-if(B2G) HTTP == subpixel-1.html#d subpixel-1-ref.html#d fuzzy-if(Android,4,120) HTTP == text-1.html text-1.html?ref fuzzy-if(Android,4,120) HTTP == text-2.html?up text-2.html?ref -skip-if(B2G) fuzzy-if(Android&&AndroidVersion<15,251,722) fails-if(Android&&AndroidVersion>=15) HTTP == transformed-1.html transformed-1.html?ref #Bug 900607 +skip-if(B2G) fuzzy-if(Android&&AndroidVersion<15,251,722) HTTP == transformed-1.html transformed-1.html?ref HTTP == transformed-1.html?up transformed-1.html?ref fuzzy-if(Android,5,20000) == uncovering-1.html uncovering-1-ref.html fuzzy-if(Android,5,20000) == uncovering-2.html uncovering-2-ref.html diff --git a/layout/reftests/text-shadow/reftest.list b/layout/reftests/text-shadow/reftest.list index 94e924a3707e..4256191a260c 100644 --- a/layout/reftests/text-shadow/reftest.list +++ b/layout/reftests/text-shadow/reftest.list @@ -24,9 +24,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 -needs-focus == text-shadow-selected-1.html text-shadow-selected-1-ref.html +fails-if(Android) needs-focus == text-shadow-selected-1.html text-shadow-selected-1-ref.html # different foreground color on Android needs-focus != text-shadow-selected-2.html text-shadow-selected-2-notref.html -needs-focus == text-shadow-selected-2.html text-shadow-selected-2-ref.html +fails-if(Android) needs-focus == text-shadow-selected-2.html text-shadow-selected-2-ref.html # different foreground color on Android # bug 692744 == text-shadow-on-space-1.html text-shadow-on-space-1-ref.html