Bug 1364274 part 3 - Adjust test expectation. r=heycam draft
authorXidorn Quan <me@upsuper.org>
Wed, 05 Jul 2017 14:08:45 +1000
changeset 608729 beb99889b8f8c10dda6a95bd9ae45d0bbe789d86
parent 608728 37923ac7ab91c75245d14dafa7bef623ce92603b
child 637406 cb22b211ff4c4f54730b5192d962b264f04833c8
push id68393
push userxquan@mozilla.com
push dateFri, 14 Jul 2017 03:52:32 +0000
reviewersheycam
bugs1364274
milestone56.0a1
Bug 1364274 part 3 - Adjust test expectation. r=heycam MozReview-Commit-ID: GagkRtB8PGv
layout/generic/crashtests/crashtests.list
layout/reftests/css-ruby/reftest.list
layout/reftests/w3c-css/submitted/ruby/reftest.list
layout/reftests/w3c-css/submitted/text-decor-3/reftest.list
layout/style/crashtests/crashtests.list
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -590,17 +590,17 @@ load 1140268-1.html
 load 1145768.html
 load 1146103.html
 load 1146107.html
 load 1146114.html
 asserts(0-20) load 1153478.html # bug 1144852
 load 1153695.html
 load 1156222.html
 pref(layout.css.grid.enabled,true) load 1156257.html
-skip-if(stylo) load 1157011.html # bug 1323697
+load 1157011.html
 load 1169420-1.html
 load 1169420-2.html
 load 1183431.html
 load 1221112-1.html
 load 1221112-2.html
 load 1221874-1.html
 load 1222783.xhtml
 load 1223568-1.html
--- a/layout/reftests/css-ruby/reftest.list
+++ b/layout/reftests/css-ruby/reftest.list
@@ -1,55 +1,55 @@
 == bidi-1.html bidi-1-ref.html
 == bidi-2.html bidi-2-ref.html
 == box-generation-1.html box-generation-1-ref.html
 == box-generation-2.html box-generation-2-ref.html
 == box-generation-3.html box-generation-3-ref.html
 == box-generation-4.html box-generation-4-ref.html
 == box-generation-5.html box-generation-5-ref.html
-fails-if(styloVsGecko||stylo) == box-properties-1.html box-properties-1-ref.html
-fails-if(styloVsGecko||stylo) == box-properties-2.html box-properties-2-ref.html
-fails-if(styloVsGecko||stylo) == box-properties-3.html box-properties-3-ref.html
-fails-if(styloVsGecko||stylo) == box-properties-4.html box-properties-4-ref.html
+== box-properties-1.html box-properties-1-ref.html
+== box-properties-2.html box-properties-2-ref.html
+== box-properties-3.html box-properties-3-ref.html
+== box-properties-4.html box-properties-4-ref.html
 == dynamic-insertion-1.html dynamic-insertion-1-ref.html
 == dynamic-insertion-2.html dynamic-insertion-2-ref.html
-fails-if(styloVsGecko) == dynamic-insertion-3.html dynamic-insertion-3-ref.html
+== dynamic-insertion-3.html dynamic-insertion-3-ref.html
 == dynamic-removal-1.html dynamic-removal-1-ref.html
 == dynamic-removal-2.html dynamic-removal-2-ref.html
 == dynamic-removal-3.html dynamic-removal-3-ref.html
 == float-handling.html float-handling-ref.html
 test-pref(dom.meta-viewport.enabled,true) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == inflated-ruby-1.html inflated-ruby-1-ref.html
 == intra-level-whitespace-1.html intra-level-whitespace-1-ref.html
 == intra-level-whitespace-2.html intra-level-whitespace-2-ref.html
 == intra-level-whitespace-3.html intra-level-whitespace-3-ref.html
 == intrinsic-isize-1.html intrinsic-isize-1-ref.html
 == intrinsic-isize-2.html intrinsic-isize-2-ref.html
-fails-if(styloVsGecko||stylo) == justification-1.html justification-1-ref.html
-fails-if(styloVsGecko) == justification-2.html justification-2-ref.html
+== justification-1.html justification-1-ref.html
+== justification-2.html justification-2-ref.html
 fuzzy-if(winWidget,255,792) == lang-specific-style-1.html lang-specific-style-1-ref.html # bug 1134947
 == line-breaking-1.html line-breaking-1-ref.html
-fails-if(styloVsGecko||stylo) == line-breaking-2.html line-breaking-2-ref.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),3,2) skip-if(styloVsGecko||stylo) == line-break-suppression-1.html line-break-suppression-1-ref.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),3,2) skip-if(styloVsGecko||stylo) == line-break-suppression-2.html line-break-suppression-2-ref.html
-skip-if(styloVsGecko||stylo) == line-break-suppression-3.html line-break-suppression-3-ref.html
+== line-breaking-2.html line-breaking-2-ref.html
+fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),3,2) == line-break-suppression-1.html line-break-suppression-1-ref.html
+fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),3,2) == line-break-suppression-2.html line-break-suppression-2-ref.html
+== line-break-suppression-3.html line-break-suppression-3-ref.html
 == line-break-suppression-4.html line-break-suppression-4-ref.html
 == line-break-suppression-5.html line-break-suppression-5-ref.html
 == line-height-1.html line-height-1-ref.html
 == line-height-2.html line-height-2-ref.html
 == line-height-3.html line-height-3-ref.html
 == line-height-4.html line-height-4-ref.html
 test-pref(font.minimum-size.ja,16) fails-if(styloVsGecko||stylo) == min-font-size-1.html min-font-size-1-ref.html
-skip-if(styloVsGecko) load nested-ruby-1.html
+load nested-ruby-1.html
 == no-transform.html no-transform-ref.html
-fails-if(styloVsGecko||stylo) == relative-positioning-1.html relative-positioning-1-ref.html
+== relative-positioning-1.html relative-positioning-1-ref.html
 == relative-positioning-2.html relative-positioning-2-ref.html
-fails-if(styloVsGecko||stylo) == ruby-align-1.html ruby-align-1-ref.html
-fails-if(styloVsGecko||stylo) == ruby-align-1a.html ruby-align-1-ref.html
-fails-if(styloVsGecko||stylo) == ruby-align-2.html ruby-align-2-ref.html
-fails-if(styloVsGecko||stylo) == ruby-align-2a.html ruby-align-2-ref.html
+== ruby-align-1.html ruby-align-1-ref.html
+== ruby-align-1a.html ruby-align-1-ref.html
+== ruby-align-2.html ruby-align-2-ref.html
+== ruby-align-2a.html ruby-align-2-ref.html
 == ruby-position-horizontal.html ruby-position-horizontal-ref.html
 == ruby-position-vertical-lr.html ruby-position-vertical-lr-ref.html
 == ruby-position-vertical-rl.html ruby-position-vertical-rl-ref.html
 != ruby-reflow-1-opaqueruby.html ruby-reflow-1-noruby.html
 fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),13,1) == ruby-reflow-1-transparentruby.html ruby-reflow-1-noruby.html
 == ruby-span-1.html ruby-span-1-ref.html
 == ruby-whitespace-1.html ruby-whitespace-1-ref.html
 == ruby-whitespace-2.html ruby-whitespace-2-ref.html
--- a/layout/reftests/w3c-css/submitted/ruby/reftest.list
+++ b/layout/reftests/w3c-css/submitted/ruby/reftest.list
@@ -1,21 +1,21 @@
 # Tests for inlinizing block-level boxes
-skip-if(styloVsGecko||stylo) == ruby-inlinize-blocks-001.html ruby-inlinize-blocks-001-ref.html
-fails-if(styloVsGecko||stylo) == ruby-inlinize-blocks-002.html ruby-inlinize-blocks-002-ref.html
+== ruby-inlinize-blocks-001.html ruby-inlinize-blocks-001-ref.html
+== ruby-inlinize-blocks-002.html ruby-inlinize-blocks-002-ref.html
 == ruby-inlinize-blocks-003.html ruby-inlinize-blocks-003-ref.html
-skip-if(styloVsGecko||stylo) == ruby-inlinize-blocks-004.html ruby-inlinize-blocks-004-ref.html
-skip-if(styloVsGecko||stylo) == ruby-inlinize-blocks-005.html ruby-inlinize-blocks-005-ref.html
+== ruby-inlinize-blocks-004.html ruby-inlinize-blocks-004-ref.html
+== ruby-inlinize-blocks-005.html ruby-inlinize-blocks-005-ref.html
 
 # Tests for autohiding base-identical annotations
 == ruby-autohide-001.html ruby-autohide-001-ref.html
 == ruby-autohide-002.html ruby-autohide-002-ref.html
 == ruby-autohide-003.html ruby-autohide-003-ref.html
 == ruby-autohide-004.html ruby-autohide-001-ref.html
 
 # Tests for ruby with text-combine-upright
-fails-if(styloVsGecko||stylo) == ruby-text-combine-upright-001a.html ruby-text-combine-upright-001-ref.html
-fails-if(styloVsGecko||stylo) == ruby-text-combine-upright-001b.html ruby-text-combine-upright-001-ref.html
+== ruby-text-combine-upright-001a.html ruby-text-combine-upright-001-ref.html
+== ruby-text-combine-upright-001b.html ruby-text-combine-upright-001-ref.html
 == ruby-text-combine-upright-002a.html ruby-text-combine-upright-002-ref.html
 == ruby-text-combine-upright-002b.html ruby-text-combine-upright-002-ref.html
 
 # Tests for nested ruby
-fails-if(styloVsGecko) == nested-ruby-pairing-001.html nested-ruby-pairing-001-ref.html
+== nested-ruby-pairing-001.html nested-ruby-pairing-001-ref.html
--- a/layout/reftests/w3c-css/submitted/text-decor-3/reftest.list
+++ b/layout/reftests/w3c-css/submitted/text-decor-3/reftest.list
@@ -1,9 +1,9 @@
-fails-if(stylo) == ruby-text-decoration-01.html ruby-text-decoration-01-ref.html
+== ruby-text-decoration-01.html ruby-text-decoration-01-ref.html
 == text-decoration-propagation-01.html text-decoration-propagation-01-ref.html
 == text-decoration-propagation-dynamic-001.html text-decoration-propagation-dynamic-001-ref.html
 
 # text-emphasis-style
 == text-emphasis-style-property-001.html text-emphasis-style-property-001-ref.html
 fuzzy-if(gtkWidget,3,4) fuzzy-if(skiaContent,104,80)  == text-emphasis-style-property-002.html text-emphasis-style-property-002-ref.html
 == text-emphasis-style-property-003.html text-emphasis-style-property-003-ref.html
 == text-emphasis-style-property-004.html text-emphasis-style-property-004-ref.html
--- a/layout/style/crashtests/crashtests.list
+++ b/layout/style/crashtests/crashtests.list
@@ -127,19 +127,19 @@ load 1164813-1.html
 load 1167782-1.html
 load 1186768-1.xhtml
 load 1200568-1.html
 load 1206105-1.html
 load 1223688-1.html
 load 1223694-1.html
 load 1226400-1.html
 load 1227501-1.html
-skip-if(stylo) load 1230408-1.html # bug 1323716
-skip-if(stylo) load 1233135-1.html # bug 1323716
-skip-if(stylo) load 1233135-2.html # bug 1323716
+load 1230408-1.html
+load 1233135-1.html
+load 1233135-2.html
 load 1238660-1.html
 load 1245260-1.html
 load 1247865-1.html
 asserts-if(stylo,0-1) load 1264396-1.html # bug 1324677
 # The following test relies on -webkit-text-fill-color being behind the
 # layout.css.prefixes.webkit pref
 pref(layout.css.prefixes.webkit,false) load 1265611-1.html
 load border-image-visited-link.html