No bug - Adjust some Android reftest expectations now that they're passing again. r=gbrown, a=test-only
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 14 Jan 2015 13:46:20 -0500
changeset 242876 454907933777
parent 242875 483bad7e5e88
child 242878 9b99fc7b7c20
push id4324
push userryanvm@gmail.com
push date2015-01-14 20:33 +0000
treeherdermozilla-beta@454907933777 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown, test-only
milestone36.0
No bug - Adjust some Android reftest expectations now that they're passing again. r=gbrown, a=test-only These tests were originally marked as failing on 2.3 so that Android 2.3 could be enabled in production. Something today made them start passing again, so remove the failing annotations.
image/test/reftest/generic/reftest.list
layout/reftests/backgrounds/reftest.list
layout/reftests/font-face/reftest.list
--- a/image/test/reftest/generic/reftest.list
+++ b/image/test/reftest/generic/reftest.list
@@ -1,1 +1,1 @@
-fails-if(Android&&(AndroidVersion==10||AndroidVersion==17)) HTTP == accept-image-catchall.html accept-image-catchall-ref.html
+HTTP == accept-image-catchall.html accept-image-catchall-ref.html
--- a/layout/reftests/backgrounds/reftest.list
+++ b/layout/reftests/backgrounds/reftest.list
@@ -119,29 +119,29 @@ pref(layout.css.box-decoration-break.ena
 fails == background-size-zoom-repeat.html background-size-zoom-repeat-ref.html
 
 # -moz-default-background-color and -moz-default-color (bug 591341)
 == background-moz-default-background-color.html background-moz-default-background-color-ref.html
 
 random-if(B2G) == fixed-bg-with-transform-outside-viewport-1.html fixed-bg-with-transform-outside-viewport-ref.html
 
 HTTP == root-background-1.html root-background-ref.html
-fails-if(Android&&(AndroidVersion==10||AndroidVersion==17)) HTTP != root-background-1.html about:blank
+HTTP != root-background-1.html about:blank
 
 random-if(B2G) == really-big-background.html really-big-background-ref.html
 == body-background.html body-background-ref.html
 == table-background.html table-background-ref.html
 == table-background-print.html table-background-print-ref.html
 != div-background.html div-background-ref.html
 
 == background-repeat-1-ref.html background-repeat-1.html
 
 == multi-background-clip-content-border.html multi-background-clip-content-border-ref.html
 
-fails-if(Android&&(AndroidVersion==10||AndroidVersion==17)) HTTP == background-referrer.html background-referrer-ref.html
+HTTP == background-referrer.html background-referrer-ref.html
 
 == attachment-scroll-positioning-1.html attachment-scroll-positioning-1-ref.html
 == attachment-local-positioning-1.html attachment-local-positioning-1-ref.html
 == attachment-local-positioning-2.html attachment-local-positioning-2-ref.html
 == attachment-local-positioning-3.html attachment-local-positioning-3-ref.html
 == attachment-local-positioning-4.html attachment-local-positioning-4-ref.html
 == attachment-local-positioning-5.html attachment-local-positioning-5-ref.html
 
--- a/layout/reftests/font-face/reftest.list
+++ b/layout/reftests/font-face/reftest.list
@@ -147,18 +147,18 @@ HTTP(..) != font-familiy-whitespace-1.ht
 skip-if(B2G) HTTP(..) == ivs-1.html ivs-1-ref.html # bug 773482
 skip-if(B2G) HTTP(..) == cjkcisvs-1.html cjkcisvs-1-ref.html
 
 skip-if(B2G) HTTP(..) == missing-names.html missing-names-ref.html # bug 773482
 
 # Tests for bug 670900 - handling of 404 (not found) error in @font-face URL
 # (using Chunkfive font data returned from a .sjs file)
 HTTP(..) == font-error-404-1.html font-error-404-1-ref.html # HTTP status 404, don't load
-skip-if(B2G) fails-if(Android&&(AndroidVersion==10||AndroidVersion==17)) HTTP(..) == font-error-404-2.html font-error-404-2-ref.html # HTTP status 200, load # bug 773482
-fails-if(Android&&(AndroidVersion==10||AndroidVersion==17)) HTTP(..) != font-error-404-1.html font-error-404-2.html # sanity-check that the results differ
+skip-if(B2G) HTTP(..) == font-error-404-2.html font-error-404-2-ref.html # HTTP status 200, load # bug 773482
+HTTP(..) != font-error-404-1.html font-error-404-2.html # sanity-check that the results differ
 
 # Font load redirection
 HTTP(..) == font-redirect.html order-1-ref.html
 
 # Tests for potential regressions from bug 879963
 == dynamic-duplicate-rule-1a.html dynamic-duplicate-rule-1-ref.html
 == dynamic-duplicate-rule-1b.html dynamic-duplicate-rule-1-ref.html
 == dynamic-duplicate-rule-1c.html dynamic-duplicate-rule-1-ref.html