Bug 1092006 - Fix form_border_radius define & mark expected failures. r=wesj
authorMike Taylor <miket@mozilla.com>
Thu, 05 Feb 2015 08:08:00 +0100
changeset 227780 eecd602fe207ee20a96cc40f7612f20e70dcb599
parent 227779 f6d265d88cb4876c5796f67588a05092f4312bda
child 227781 7099b4cceabb5348105bddfdeb9102eb4d0bed13
push id28239
push userryanvm@gmail.com
push dateFri, 06 Feb 2015 13:52:40 +0000
treeherdermozilla-central@03b0004eba32 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswesj
bugs1092006
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1092006 - Fix form_border_radius define & mark expected failures. r=wesj
layout/reftests/box-shadow/reftest.list
layout/reftests/bugs/reftest.list
layout/reftests/forms/input/file/reftest.list
mobile/android/themes/core/defines.inc
--- a/layout/reftests/box-shadow/reftest.list
+++ b/layout/reftests/box-shadow/reftest.list
@@ -4,17 +4,17 @@
 random == boxshadow-blur-2.html boxshadow-blur-2-ref.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
 == tableboxshadow-trshadow.html tableboxshadow-trshadow-ref.html
 == tableboxshadow-tdshadow.html tableboxshadow-tdshadow-ref.html
 == boxshadow-rounding.html boxshadow-rounding-ref.html
-fails-if(B2G) == boxshadow-button.html boxshadow-button-ref.html
+fails-if(Android||B2G) == boxshadow-button.html boxshadow-button-ref.html
 fails-if(Android||B2G) == boxshadow-fileupload.html boxshadow-fileupload-ref.html
 == boxshadow-inner-basic.html boxshadow-inner-basic-ref.svg
 random-if(layersGPUAccelerated) == boxshadow-mixed.html boxshadow-mixed-ref.html
 random-if(d2d) fuzzy-if(B2G,12,18) == boxshadow-rounded-spread.html boxshadow-rounded-spread-ref.html
 skip-if(B2G&&browserIsRemote) HTTP(..) == boxshadow-dynamic.xul boxshadow-dynamic-ref.xul
 random-if(d2d) == boxshadow-onecorner.html boxshadow-onecorner-ref.html
 random-if(d2d) == boxshadow-twocorners.html boxshadow-twocorners-ref.html
 random-if(d2d) == boxshadow-threecorners.html boxshadow-threecorners-ref.html
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1307,19 +1307,19 @@ skip-if(B2G) == 478811-1.html 478811-1-r
 == 480880-1a.html 480880-1-ref.html
 == 480880-1b.html 480880-1-ref.html
 == 480880-1c.html 480880-1-ref.html
 == 480880-1d.html 480880-1-ref.html
 == 480880-1e.html 480880-1-ref.html
 == 480880-2a.html about:blank
 == 480880-2b.html about:blank
 == 480880-2c.html about:blank
-skip-if(B2G) == 481024-1a.html 481024-1-ref.html
-skip-if(B2G) == 481024-1b.html 481024-1-ref.html
-skip-if(B2G) == 481024-1c.html 481024-1-ref.html
+skip-if(B2G) fails-if(Android) == 481024-1a.html 481024-1-ref.html
+skip-if(B2G) fails-if(Android) == 481024-1b.html 481024-1-ref.html
+skip-if(B2G) fails-if(Android) == 481024-1c.html 481024-1-ref.html
 == 481024-1d.html 481024-1-ref.html
 == 481024-1e.html 481024-1-ref.html
 != 481948-1.html 481948-1-ref.html
 != 481948-2.html 481948-2-ref.html
 skip-if(B2G) fails-if(Android) random-if(winWidget) fails-if(gtk2Widget) == 481948-3.html 481948-3-ref.html # questionable test, see bug 488364
 == 482398-1.html 482398-1-ref.html
 random-if(d2d) skip-if(B2G&&browserIsRemote) == 482592-1a.xhtml 482592-1-ref.html # bug 586771
 random-if(d2d) skip-if(B2G&&browserIsRemote) == 482592-1b.xhtml 482592-1-ref.html # bug 586771
@@ -1502,17 +1502,17 @@ skip-if(B2G) fuzzy-if(Android&&AndroidVe
 random != 553571-1.html 553571-1-notref.html # expect dotted circle in test, not in ref: "fails" under harfbuzz, which doesn't consider the sequence invalid
 fuzzy-if(!contentSameGfxBackendAsCanvas,128,91) random-if(d2d) skip-if(azureSkiaGL) == 555388-1.html 555388-1-ref.html
 == 556661-1.html 556661-1-ref.html
 skip-if(B2G) fails-if(Android) == 557087-1.html 557087-ref.html
 skip-if(B2G) fails-if(Android) == 557087-2.html 557087-ref.html
 == 557736-1.html 557736-1-ref.html
 skip-if(B2G&&browserIsRemote) != 558011-1.xul 558011-1-ref.xul # bug 974780
 == 559284-1.html 559284-1-ref.html
-skip-if(B2G) == 560455-1.xul 560455-1-ref.xul
+skip-if(B2G) fails-if(Android) == 560455-1.xul 560455-1-ref.xul
 == 561981-1.html 561981-1-ref.html
 == 561981-2.html 561981-2-ref.html
 == 561981-3.html 561981-3-ref.html
 == 561981-4.html 561981-4-ref.html
 == 561981-5.html 561981-5-ref.html
 == 561981-6.html 561981-6-ref.html
 == 561981-7.html 561981-7-ref.html
 == 561981-8.html 561981-8-ref.html
--- 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||Android) fuzzy-if(OSX==1006,8,128) skip-if(B2G&&browserIsRemote) == simple.html simple-ref.xul # bug 974780
 fails-if(B2G||Android) fuzzy-if(OSX==1006,8,64) skip-if(B2G&&browserIsRemote) == rtl.html rtl-ref.xul # bug 974780
 fails-if(B2G||Android) fuzzy-if(OSX==1006,8,128) skip-if(B2G&&browserIsRemote) == size.html simple-ref.xul # bug 974780
 fails-if(B2G||Android) fuzzy-if(OSX==1006,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) skip-if(B2G&&browserIsRemote) == style.html style-ref.xul # bug 974780
 != width-clip.html width-clip-ref.html
 fails-if(B2G||Android) == color-inherit.html color-inherit-ref.html
--- a/mobile/android/themes/core/defines.inc
+++ b/mobile/android/themes/core/defines.inc
@@ -1,12 +1,12 @@
 %filter substitution
 
 %define form_border #bfbfbf
-%define form_border_radius-radius 2px
+%define form_border_radius 2px
 %define form_text #363b40
 %define form_text_disabled #bebebe
 %define form_background white
 %define form_background_disabled #f5f5f5
 %define form_background white
 
 %define color_about_background #F5F5F5
 %define color_about_item #FFFFFF