Bug 1354876 - Update tests expectations for font-variant. r?heycam
MozReview-Commit-ID: 9ZTz7hH5KV3
--- a/layout/reftests/font-features/reftest-stylo.list
+++ b/layout/reftests/font-features/reftest-stylo.list
@@ -23,17 +23,17 @@ HTTP(..) == font-features-turkish.html f
# The following should pass even if feature support isn't available,
# because both testcase and reference will have the default rendering,
# though they're not really meaningful unless the tests above passed already.
# compare feature specified within @font-face to same feature in style rule
fails HTTP(..) == font-features-hlig-2.html font-features-hlig-2.html
fails HTTP(..) == font-features-hlig-4.html font-features-hlig-4.html
HTTP(..) == font-features-hlig-5.html font-features-hlig-5.html
-fails HTTP(..) == font-features-ligatures-none.html font-features-ligatures-none.html
+HTTP(..) == font-features-ligatures-none.html font-features-ligatures-none.html
# check that feature in style rule overrides @font-face
fails HTTP(..) == font-features-hlig-3.html font-features-hlig-3.html
# compare font-language-override rendering to lang-tagged rendering
HTTP(..) == font-features-turkish-override-1.html font-features-turkish-override-1.html
fails HTTP(..) == font-features-turkish-override-2.html font-features-turkish-override-2.html
@@ -43,33 +43,33 @@ fails HTTP(..) == font-features-turkish-
HTTP(..) == font-features-turkish-override-5.html font-features-turkish-override-5.html
# check that last value wins if a feature is repeated
HTTP(..) == font-features-order-1.html font-features-order-1.html
fails HTTP(..) == font-features-order-2.html font-features-order-2.html
# check priority of feature settings vs. font-variant subproperty
fails HTTP(..) == font-features-order-3.html font-features-order-3.html
-fails HTTP(..) == font-features-order-4.html font-features-order-4.html
+HTTP(..) == font-features-order-4.html font-features-order-4.html
fails HTTP(..) == font-features-order-5.html font-features-order-5.html
# check priority involving feature settings and font-variant-alternates
fails HTTP(..) == alternates-order.html alternates-order.html
# check that font-specific values line up with @font-face feature settings
fails HTTP(..) == annotations.html annotations.html
# font-variant subproperties
# test for specific features being on and others off, based on prop values
# (debug problems with font-variant-debug.html which displays all props)
fails HTTP(..) == font-variant-alternates.html font-variant-alternates.html
fails HTTP(..) == font-variant-caps.html font-variant-caps.html
-fails HTTP(..) == font-variant-east-asian.html font-variant-east-asian.html
-fails HTTP(..) == font-variant-ligatures.html font-variant-ligatures.html
-fails HTTP(..) == font-variant-numeric.html font-variant-numeric.html
+HTTP(..) == font-variant-east-asian.html font-variant-east-asian.html
+HTTP(..) == font-variant-ligatures.html font-variant-ligatures.html
+HTTP(..) == font-variant-numeric.html font-variant-numeric.html
HTTP(..) == font-variant-position.html font-variant-position.html
# font-kerning
HTTP(..) == font-kerning-normal.html font-kerning-normal.html
HTTP(..) == font-kerning-auto.html font-kerning-auto.html
HTTP(..) == font-kerning-auto.html font-kerning-auto.html
HTTP(..) == font-kerning-normal.html font-kerning-normal.html
HTTP(..) == font-kerning-none.html font-kerning-none.html
@@ -92,23 +92,23 @@ random-if(!winWidget&&!cocoaWidget) fail
# Arial/Times New Roman on Win7+/OSX 10.6+ have kerning pairs that include spaces
random-if(!winWidget&&!cocoaWidget) fails-if(winWidget||cocoaWidget) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) HTTP(..) == kerning-spaces-arial-nokern.html kerning-spaces-arial-nokern.html
random-if(!winWidget&&!cocoaWidget) fails-if(winWidget||cocoaWidget) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) HTTP(..) == kerning-spaces-arial-kern.html kerning-spaces-arial-kern.html
random-if(!winWidget&&!cocoaWidget) fails-if(winWidget||cocoaWidget) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) HTTP(..) == kerning-spaces-tnr-nokern.html kerning-spaces-tnr-nokern.html
random-if(!winWidget&&!cocoaWidget) fails-if(winWidget||cocoaWidget) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) HTTP(..) == kerning-spaces-tnr-kern.html kerning-spaces-tnr-kern.html
# font-variant-caps fallback
# -- sanity check - none of these should look like the default rendering
-fails HTTP(..) == caps-fallback-smallcaps1.html caps-fallback-smallcaps1.html
+HTTP(..) == caps-fallback-smallcaps1.html caps-fallback-smallcaps1.html
HTTP(..) == caps-fallback-smallcaps2.html caps-fallback-smallcaps2.html
HTTP(..) == caps-fallback-petitecaps.html caps-fallback-petitecaps.html
fails HTTP(..) == caps-fallback-allsmallcaps.html caps-fallback-allsmallcaps.html
fails HTTP(..) == caps-fallback-allpetitecaps.html caps-fallback-allpetitecaps.html
# -- normal or fallback rendering
-fails HTTP(..) == caps-fallback-smallcaps1.html caps-fallback-smallcaps1.html
+HTTP(..) == caps-fallback-smallcaps1.html caps-fallback-smallcaps1.html
HTTP(..) == caps-fallback-smallcaps2.html caps-fallback-smallcaps2.html
HTTP(..) == caps-fallback-petitecaps.html caps-fallback-petitecaps.html
fails HTTP(..) == caps-fallback-allsmallcaps.html caps-fallback-allsmallcaps.html
fails HTTP(..) == caps-fallback-allpetitecaps.html caps-fallback-allpetitecaps.html
# font-variant-position fallback
== subsuper-fallback.html subsuper-fallback.html
HTTP(..) == subsuper-fallback.html subsuper-fallback.html
--- a/layout/reftests/text-transform/reftest-stylo.list
+++ b/layout/reftests/text-transform/reftest-stylo.list
@@ -5,35 +5,35 @@
== capitalize-4.html capitalize-4.html
== capitalize-5.html capitalize-5.html
== capitalize-6.html capitalize-6.html
== capitalize-7.html capitalize-7.html
== capitalize-7a.html capitalize-7a.html
== capitalize-8.html capitalize-8.html
== lowercase-1.html lowercase-1.html
== lowercase-sigma-1.html lowercase-sigma-1.html
-fails == small-caps-1.html small-caps-1.html
-fails HTTP(..) == fake-small-caps-1.html fake-small-caps-1.html
-fails HTTP(..) == opentype-small-caps-1.html opentype-small-caps-1.html
-fails HTTP(..) == opentype-small-caps-1.html opentype-small-caps-1.html
-fails HTTP(..) == graphite-small-caps-1.html graphite-small-caps-1.html
-fails HTTP(..) == graphite-small-caps-1.html graphite-small-caps-1.html
+== small-caps-1.html small-caps-1.html
+HTTP(..) == fake-small-caps-1.html fake-small-caps-1.html
+HTTP(..) == opentype-small-caps-1.html opentype-small-caps-1.html
+HTTP(..) == opentype-small-caps-1.html opentype-small-caps-1.html
+HTTP(..) == graphite-small-caps-1.html graphite-small-caps-1.html
+HTTP(..) == graphite-small-caps-1.html graphite-small-caps-1.html
== uppercase-1.html uppercase-1.html
== uppercase-szlig-1.html uppercase-szlig-1.html
# these use DejaVu Sans via @font-face for consistency of results
== all-upper.html all-upper.html
== all-lower.html all-lower.html
== all-title.html all-title.html
== smtp-upper.html smtp-upper.html
== smtp-lower.html smtp-lower.html
== smtp-title.html smtp-title.html
== turkish-casing-1.html turkish-casing-1.html
-fails HTTP(..) == small-caps-turkish-1.html small-caps-turkish-1.html
+HTTP(..) == small-caps-turkish-1.html small-caps-turkish-1.html
== greek-uppercase-1a.html greek-uppercase-1a.html
== greek-uppercase-1b.html greek-uppercase-1b.html
== greek-uppercase-2.html greek-uppercase-2.html
-fails HTTP(..) == greek-small-caps-1.html greek-small-caps-1.html
+HTTP(..) == greek-small-caps-1.html greek-small-caps-1.html
== irish-uppercase-1.html irish-uppercase-1.html
fails == irish-lowercase-1a.html irish-lowercase-1a.html
fails == irish-lowercase-1b.html irish-lowercase-1b.html
== fullwidth-1.html fullwidth-1.html
== fullwidth-2.html fullwidth-2.html
== fullwidth-all.html fullwidth-all.html
--- a/layout/style/test/stylo-failures.md
+++ b/layout/style/test/stylo-failures.md
@@ -169,22 +169,18 @@ to mochitest command.
* test_units_angle.html [3]
* test_variables.html `var(--var6)`: -x-system-font [1]
* Unimplemented CSS properties:
* place-{content,items,self} shorthands servo/servo#16391
* test_property_syntax_errors.html `place-` [30]
* test_align_shorthand_serialization.html [8]
* test_value_storage.html `place-` [7]
* font-variant-{alternates,east-asian,ligatures,numeric} properties servo/servo#15957
- * test_compute_data_with_start_struct.html `font-variant` [8]
- * test_inherit_computation.html `font-variant` [20]
- * test_inherit_storage.html `font-variant` [36]
- * test_initial_computation.html `font-variant` [10]
- * test_initial_storage.html `font-variant` [18]
- * test_value_storage.html `font-variant` [332]
+ * test_property_syntax_errors.html `font-variant-alternates` [2]
+ * test_value_storage.html `font-variant` [176]
* touch-action property servo/servo#16372
* test_compute_data_with_start_struct.html `touch-action` [2]
* test_inherit_computation.html `touch-action` [2]
* test_inherit_storage.html `touch-action` [2]
* test_initial_computation.html `touch-action` [4]
* test_initial_storage.html `touch-action` [4]
* test_value_storage.html `touch-action` [14]
* Properties implemented but not in geckolib: