Bug 1704636 - run many windows 7-32 tests on windows10x64 via wow64. r=ahal,webdriver-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D112372
2021-04-26 14:43:31 +00:00 · 2021-04-26 14:43:31 +00:00 · 1bab60f4c0
--- a/docshell/test/chrome/chrome.ini
+++ b/docshell/test/chrome/chrome.ini
@ -62,6 +62,7 @@ skip-if = (os == 'win' && processor == 'aarch64') # bug 1533819
 [test_bug311007.xhtml]
 [test_bug321671.xhtml]
 [test_bug360511.xhtml]
+skip-if = (os == 'win' && processor == 'x86')
 [test_bug364461.xhtml]
 skip-if = (os == 'win' && processor == 'aarch64') # bug 1533814
 [test_bug396519.xhtml]
--- a/taskcluster/ci/test/awsy.yml
+++ b/taskcluster/ci/test/awsy.yml
@ -48,7 +48,7 @@ awsy:
                by-test-platform:
                    .*-devedition/.*: []  # don't run on devedition
                    windows.*-32.*/opt: []
-                    (linux|windows10|mac)(?!.*shippable).*/opt: []
+                    (linux|windows10-64|mac)(?!.*shippable).*/opt: []
                    default: ['integration', 'mozilla-central', 'mozilla-beta', 'mozilla-release']

 awsy-tp6:
@ -66,7 +66,7 @@ awsy-tp6:
                by-test-platform:
                    .*-devedition/.*: []  # don't run on devedition
                    windows.*-32.*/opt: []
-                    (linux|windows10|mac)(?!.*shippable).*/opt: []
+                    (linux|windows10-64|mac)(?!.*shippable).*/opt: []
                    default: ['integration', 'mozilla-central', 'mozilla-beta', 'mozilla-release']
    mozharness:
        extra-options:
@ -94,7 +94,7 @@ awsy-base:
                by-test-platform:
                    .*-devedition/.*: []  # don't run on devedition
                    windows.*-32.*/opt: []
-                    (linux|windows10|mac)(?!.*shippable).*/opt: []
+                    (linux|windows10-64|mac)(?!.*shippable).*/opt: []
                    default: ['integration', 'mozilla-central', 'mozilla-beta', 'mozilla-release']
    mozharness:
        extra-options:
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@ -244,7 +244,7 @@ mochitest-chrome:
            windows10-64-ccov-qr/opt: 3
            .*-asan/opt: 3
            .*-tsan/opt: 6
-            (linux.*64|windows.*-..|macosx10..)/debug: 3
+            (linux.*64|windows.*|macosx1015-64)/debug: 3
            default: 2
    max-run-time: 3600
    e10s: false
@ -440,7 +440,7 @@ mochitest-media:
            windows10-64.*: 1
            macosx.*64.*/.*: 2
            windows10-aarch64/.*: 1
-            windows7-32-shippable/.*: 2
+            windows.*32-shippable/.*: 2
            linux1804-64(-shippable|-devedition|-.*qr)/opt: 2
            linux.*64-tsan/opt: 4
            default: 3
--- a/taskcluster/ci/test/reftest.yml
+++ b/taskcluster/ci/test/reftest.yml
@ -234,7 +234,7 @@ reftest-gpu:
            fission: []
            default:
                by-test-platform:
-                    windows10.*: []
+                    windows10-64.*: []
                    default: built-projects
    instance-size: default
    virtualization: virtual-with-gpu
@ -254,7 +254,7 @@ reftest-no-accel:
            fission: []
            default:
                by-test-platform:
-                    windows10.*: []
+                    windows10-64.*: []
                    default: built-projects
    chunks:
        by-test-platform:
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@ -160,55 +160,79 @@ windows7-32/debug:
    build-platform: win32/debug
    test-sets:
        - windows-reftest-gpu
-        - windows-tests
-        - web-platform-tests
-        - mochitest-webgpu
+        - windows-7-tests

 windows7-32/opt:
    build-platform: win32/opt
    test-sets:
-        - awsy
-        - desktop-screenshot-capture
        - windows-reftest-gpu
-        - windows-talos
-        - windows-tests
-        - web-platform-tests
-        - raptor-firefox
-        - browsertime
-        - mochitest-webgpu
-        - web-platform-tests-wdspec-headless
+        - windows-7-tests

 windows7-32-shippable/opt:
    build-platform: win32-shippable/opt
    test-sets:
-        - awsy
-        - desktop-screenshot-capture
        - windows-reftest-gpu
-        - windows-talos
-        - windows-tests
-        - web-platform-tests
-        - web-platform-tests-wdspec-headless
-        - raptor-chrome
-        - raptor-chromium
-        - raptor-firefox
-        - browsertime
-        - mochitest-webgpu
+        - windows-7-tests

 # win7 qr builds for try purposes
 windows7-32-qr/debug:
    build-platform: win32/debug
    test-sets:
        - mochitest-webgpu
-        - windows-qr-tests
-        - web-platform-tests
+        - windows7-qr-tests

 windows7-32-qr/opt:
    build-platform: win32/opt
    test-sets:
-        - awsy
-        - windows-qr-tests
-        - windows-talos
+        - windows7-qr-tests
+
+# win10-32 qr builds for try purposes
+windows10-32-qr/debug:
+    build-platform: win32/debug
+    test-sets:
        - web-platform-tests
+        - windows32-qr-tests
+
+windows10-32-qr/opt:
+    build-platform: win32/opt
+    test-sets:
+        - awsy
+        - web-platform-tests
+        - windows-talos
+        - windows32-qr-tests
+
+windows10-32-shippable/opt:
+    build-platform: win32-shippable/opt
+    test-sets:
+        - awsy
+        - browsertime
+        - desktop-screenshot-capture
+        - raptor-chrome
+        - raptor-chromium
+        - raptor-firefox
+        - web-platform-tests
+        - web-platform-tests-wdspec-headless
+        - windows32-tests
+        - windows-talos
+
+windows10-32/opt:
+    build-platform: win32/opt
+    test-sets:
+        - awsy
+        - browsertime
+        - desktop-screenshot-capture
+        - raptor-firefox
+        - web-platform-tests
+        - web-platform-tests-wdspec-headless
+        - windows32-tests
+        - windows-talos
+
+windows10-32/debug:
+    build-platform: win32/debug
+    test-sets:
+        - web-platform-tests
+        - windows32-tests
+

 # win64
 windows10-64-ccov-qr/opt:
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@ -296,9 +296,52 @@ windows-qr-tests:
    - reftest
    - test-verify

+windows7-qr-tests:
+    - mochitest-browser-chrome
+    - mochitest-media
+    - mochitest-webgl1-core
+    - mochitest-webgl2-core
+    - reftest
+
+windows32-qr-tests:
+    - crashtest
+    - marionette
+    - mochitest-chrome-gpu
+    - mochitest-plain
+    - mochitest-plain-gpu
+    - test-verify
+
 windows-reftest-gpu:
    - reftest-gpu

+windows-7-tests:
+    - cppunit
+    - gtest
+    - mochitest-browser-chrome
+    - mochitest-media
+    - mochitest-webgpu
+    - reftest
+    - reftest-no-accel
+    - xpcshell
+
+windows32-tests:
+    - crashtest
+    - firefox-ui-functional-local
+    - firefox-ui-functional-remote
+    # - jittest  # See comment in windows-ccov-tests set.
+    - jsreftest
+    - marionette
+    - mochitest-a11y
+    - mochitest-chrome
+    - mochitest-chrome-gpu
+    - mochitest-plain
+    - mochitest-plain-gpu
+    - mochitest-remote
+    - telemetry-tests-client
+    - test-verify
+    - test-verify-gpu
+    - test-verify-wpt
+
 windows-tests:
    - cppunit
    - crashtest
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@ -94,6 +94,21 @@ WINDOWS_WORKER_TYPES = {
        "virtual-with-gpu": "t-win7-32-gpu",
        "hardware": "t-win10-64-1803-hw",
    },
+    "windows10-32": {
+        "virtual": "t-win10-64",
+        "virtual-with-gpu": "t-win10-64-gpu-s",
+        "hardware": "t-win10-64-1803-hw",
+    },
+    "windows10-32-shippable": {
+        "virtual": "t-win10-64",
+        "virtual-with-gpu": "t-win10-64-gpu-s",
+        "hardware": "t-win10-64-1803-hw",
+    },
+    "windows10-32-qr": {
+        "virtual": "t-win10-64",
+        "virtual-with-gpu": "t-win10-64-gpu-s",
+        "hardware": "t-win10-64-1803-hw",
+    },
    "windows10-64": {
        "virtual": "t-win10-64",
        "virtual-with-gpu": "t-win10-64-gpu-s",
@ -1441,7 +1456,10 @@ def apply_raptor_tier_optimization(config, tasks):
@transforms.add
 def disable_try_only_platforms(config, tasks):
    """Turns off platforms that should only run on try."""
-    try_only_platforms = ("windows7-32-qr/.*",)
+    try_only_platforms = (
+        "windows7-32-qr/.*",
+        "windows10-32-qr/.*",
+    )
    for task in tasks:
        if any(re.match(k + "$", task["test-platform"]) for k in try_only_platforms):
            task["run-on-projects"] = []
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-bg-pos-206.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-bg-pos-206.xht.ini
@ -1,8 +1,7 @@
 [background-bg-pos-206.xht]
  expected:
-    if (os == "win") and (version == "6.1.7601"): FAIL
-    if not webrender and (os == "win") and (bits == 64): FAIL
    if (os == "android") and e10s: PASS
+    if (os == "win"): FAIL
  fuzzy:
    if webrender and (os == "win"): maxDifference=92;totalPixels=0-2206
    if swgl and (os == "mac"): maxDifference=1-1;totalPixels=1-1
--- a/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-3.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-3.html.ini
@ -1,5 +1,4 @@
 [attachment-local-clipping-color-3.html]
  expected:
-    if (os == "win") and (version == "6.1.7601"): FAIL
-    if not webrender and (os == "win") and (bits == 64): FAIL
+    if not webrender and (os == "win"): FAIL
    if not webrender and (os == "mac"): FAIL
--- a/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4.html.ini
@ -1,5 +1,4 @@
 [attachment-local-clipping-color-4.html]
  expected:
-    if (os == "win") and (version == "6.1.7601"): FAIL
-    if not webrender and (os == "win") and (bits == 64): FAIL
+    if not webrender and (os == "win"): FAIL
    if not webrender and (os == "mac"): FAIL
--- a/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-5.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-5.html.ini
@ -1,3 +1,3 @@
 [attachment-local-clipping-color-5.html]
  expected:
-    if (os == "win") and not webrender and (processor == "x86_64"): FAIL
+    if (os == "win") and not webrender: FAIL
--- a/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2.html.ini
@ -1,4 +1,3 @@
 [attachment-local-positioning-2.html]
  expected:
-    if (os == "win") and (version == "6.1.7601"): FAIL
-    if not webrender and (os == "win") and (bits == 64): FAIL
+    if not webrender and (os == "win"): FAIL
--- a/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-3.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-3.html.ini
@ -1,5 +1,4 @@
 [attachment-local-positioning-3.html]
  expected:
-    if (os == "win") and (version == "6.1.7601"): FAIL
-    if not webrender and (os == "win") and (bits == 64): FAIL
+    if not webrender and (os == "win"): FAIL
    if os == "android": PASS
--- a/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-4.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-4.html.ini
@ -1,4 +1,3 @@
 [attachment-local-positioning-4.html]
  expected:
-    if (os == "win") and (version == "6.1.7601"): FAIL
-    if not webrender and (os == "win") and (bits == 64): FAIL
+    if not webrender and (os == "win"): FAIL
--- a/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-5.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-5.html.ini
@ -2,5 +2,4 @@
  disabled:
    if os == "android": bug 1550895 (frequently fails on geckoview)
  expected:
-    if (os == "win") and (version == "6.1.7601"): FAIL
-    if not webrender and (os == "win") and (bits == 64): FAIL
+    if not webrender and (os == "win"): FAIL
--- a/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1.html.ini
@ -1,4 +1,3 @@
 [attachment-scroll-positioning-1.html]
  expected:
-    if (os == "win") and (version == "6.1.7601"): FAIL
-    if not webrender and (os == "win") and (bits == 64): FAIL
+    if not webrender and (os == "win"): FAIL
--- a/testing/web-platform/meta/css/css-backgrounds/child-move-reveals-parent-background.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/child-move-reveals-parent-background.html.ini
@ -1,4 +1,3 @@
 [child-move-reveals-parent-background.html]
  expected:
-    if not webrender and (os == "win") and (bits == 64): FAIL
-    if not webrender and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not webrender and (os == "win"): FAIL
--- a/testing/web-platform/meta/css/css-font-loading/idlharness.https.html.ini
+++ b/testing/web-platform/meta/css/css-font-loading/idlharness.https.html.ini
@ -1,13 +1,5 @@
 [idlharness.https.html]
  prefs: [layout.css.font-metrics-overrides.enabled:true]

-  [FontFace interface: attribute variationSettings]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
  [FontFaceSet interface object length]
    expected: FAIL
-
-  [FontFace interface: fontFace must inherit property "variationSettings" with the proper type]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
--- a/testing/web-platform/meta/css/css-fonts/animations/font-variation-settings-composition.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/animations/font-variation-settings-composition.html.ini
@ -1,111 +1,42 @@
-[font-variation-settings-composition.html]
-  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add [normal\] to replace ['test' 200\] at (1.5) should be ['test' 200\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add [normal\] to replace ['test' 200\] at (0.5) should be ['test' 200\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 50\] from add ['test' 100\] to replace ['test' 200\] at (0) should be ['test' 150\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['aaaa' 100, 'bbbb' 200\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (0) should be ['aaaa' 120, 'bbbb' 250\]]
-    expected: FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (1.5) should be ['aaaa' 35, 'bbbb' 125\]]
-    expected: FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add [normal\] to replace ['test' 200\] at (0) should be [normal\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 50\] from add ['test' 100\] to add ['test' 200\] at (-0.3) should be ['test' 120\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add [normal\] to replace ['test' 200\] at (1) should be ['test' 200\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['aaaa' 100, 'bbbb' 200\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (1) should be ['aaaa' 130, 'bbbb' 300\]]
-    expected: FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add [normal\] to add ['test' 200\] at (0.5) should be ['test' 300\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 50\] from add ['test' 100\] to replace ['test' 200\] at (0.5) should be ['test' 175\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add [normal\] to add ['test' 200\] at (-0.3) should be [normal\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add [normal\] to add ['test' 200\] at (0) should be [normal\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (-0.3) should be ['aaaa' 17, 'bbbb' 35\]]
-    expected: FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 50\] from add ['test' 100\] to add ['test' 200\] at (0.5) should be ['test' 200\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add [normal\] to add ['test' 200\] at (1) should be ['test' 300\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add [normal\] to replace ['test' 200\] at (-0.3) should be [normal\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 50\] from add ['test' 100\] to add ['test' 200\] at (1) should be ['test' 250\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 50\] from add ['test' 100\] to replace ['test' 200\] at (1.5) should be ['test' 225\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['aaaa' 100, 'bbbb' 200\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (1.5) should be ['aaaa' 135, 'bbbb' 325\]]
-    expected: FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 50\] from add ['test' 100\] to replace ['test' 200\] at (1) should be ['test' 200\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 50\] from add ['test' 100\] to replace ['test' 200\] at (-0.3) should be ['test' 135\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 50\] from add ['test' 100\] to add ['test' 200\] at (0) should be ['test' 150\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add [normal\] to add ['test' 200\] at (1.5) should be ['test' 300\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['aaaa' 100, 'bbbb' 200\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (-0.3) should be ['aaaa' 117, 'bbbb' 235\]]
-    expected: FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (1) should be ['aaaa' 30, 'bbbb' 100\]]
-    expected: FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['aaaa' 100, 'bbbb' 200\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (0.5) should be ['aaaa' 125, 'bbbb' 275\]]
-    expected: FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (0) should be ['aaaa' 20, 'bbbb' 50\]]
-    expected: FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 50\] from add ['test' 100\] to add ['test' 200\] at (1.5) should be ['test' 300\]]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (0.5) should be ['aaaa' 25, 'bbbb' 75\]]
-    expected: FAIL
-
+[font-variation-settings-composition.html]
+  [Compositing: property <font-variation-settings> underlying ['aaaa' 100, 'bbbb' 200\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (-0.3) should be ['aaaa' 117, 'bbbb' 235\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+
+  [Compositing: property <font-variation-settings> underlying ['aaaa' 100, 'bbbb' 200\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (0) should be ['aaaa' 120, 'bbbb' 250\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+
+  [Compositing: property <font-variation-settings> underlying ['aaaa' 100, 'bbbb' 200\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (0.5) should be ['aaaa' 125, 'bbbb' 275\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+
+  [Compositing: property <font-variation-settings> underlying ['aaaa' 100, 'bbbb' 200\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (1) should be ['aaaa' 130, 'bbbb' 300\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+
+  [Compositing: property <font-variation-settings> underlying ['aaaa' 100, 'bbbb' 200\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (1.5) should be ['aaaa' 135, 'bbbb' 325\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+
+  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (-0.3) should be ['aaaa' 17, 'bbbb' 35\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+
+  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (0) should be ['aaaa' 20, 'bbbb' 50\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+
+  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (0.5) should be ['aaaa' 25, 'bbbb' 75\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+
+  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (1) should be ['aaaa' 30, 'bbbb' 100\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+
+  [Compositing: property <font-variation-settings> underlying ['test' 100\] from add ['aaaa' 20, 'bbbb' 50\] to add ['aaaa' 30, 'bbbb' 100\] at (1.5) should be ['aaaa' 35, 'bbbb' 125\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+
+  
--- a/testing/web-platform/meta/css/css-fonts/animations/font-variation-settings-interpolation.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/animations/font-variation-settings-interpolation.html.ini
--- a/testing/web-platform/meta/css/css-fonts/calc-in-font-variation-settings.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/calc-in-font-variation-settings.html.ini
@ -1,5 +0,0 @@
-[calc-in-font-variation-settings.html]
-  [calc() in font-variation-settings]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
--- a/testing/web-platform/meta/css/css-fonts/inheritance.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/inheritance.html.ini
@ -1,17 +0,0 @@
-[inheritance.html]
-  [Property font-variation-settings inherits]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Property font-variation-settings has initial value normal]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Property font-optical-sizing has initial value auto]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Property font-optical-sizing inherits]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
--- a/testing/web-platform/meta/css/css-fonts/matching/fixed-stretch-style-over-weight.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/matching/fixed-stretch-style-over-weight.html.ini
@ -1,3 +1,4 @@
 [fixed-stretch-style-over-weight.html]
  expected:
+    if (os == "win") and processor == "x86": PASS
    if processor == "x86": FAIL
--- a/testing/web-platform/meta/css/css-fonts/matching/range-descriptor-reversed.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/matching/range-descriptor-reversed.html.ini
@ -1,3 +1,4 @@
 [range-descriptor-reversed.html]
  expected:
+    if (os == "win") and processor == "x86": PASS
    if processor == "x86": FAIL
--- a/testing/web-platform/meta/css/css-fonts/matching/stretch-distance-over-weight-distance.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/matching/stretch-distance-over-weight-distance.html.ini
@ -1,3 +1,4 @@
 [stretch-distance-over-weight-distance.html]
  expected:
+    if (os == "win") and processor == "x86": PASS
    if processor == "x86": FAIL
--- a/testing/web-platform/meta/css/css-fonts/matching/style-ranges-over-weight-direction.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/matching/style-ranges-over-weight-direction.html.ini
@ -1,3 +1,4 @@
 [style-ranges-over-weight-direction.html]
  expected:
+    if (os == "win") and processor == "x86": PASS
    if processor == "x86": FAIL
--- a/testing/web-platform/meta/css/css-fonts/parsing/font-optical-sizing-computed.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/parsing/font-optical-sizing-computed.html.ini
@ -1,9 +0,0 @@
-[font-optical-sizing-computed.html]
-  [Property font-optical-sizing value 'auto']
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Property font-optical-sizing value 'none']
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
--- a/testing/web-platform/meta/css/css-fonts/parsing/font-optical-sizing-valid.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/parsing/font-optical-sizing-valid.html.ini
@ -1,9 +0,0 @@
-[font-optical-sizing-valid.html]
-  [e.style['font-optical-sizing'\] = "auto" should set the property value]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [e.style['font-optical-sizing'\] = "none" should set the property value]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
--- a/testing/web-platform/meta/css/css-fonts/parsing/font-variation-settings-computed.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/parsing/font-variation-settings-computed.html.ini
@ -1,24 +1,4 @@
 [font-variation-settings-computed.html]
-  [Property font-variation-settings value 'normal']
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Property font-variation-settings value '"wght" 700, "XHGT" 0.7']
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Property font-variation-settings value '"wght" 700']
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Property font-variation-settings value '"XHGT" calc(0.4 + 0.3)']
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
  [Property font-variation-settings value '"wght" 700, "wght" 500' duplicate values should be removed, keeping the rightmost occurrence.]
-    expected: FAIL
-
-  [Property font-variation-settings value '"AB@D" 0.5']
    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
+      if os == "win" and bits == 32: FAIL
--- a/testing/web-platform/meta/css/css-fonts/parsing/font-variation-settings-valid.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/parsing/font-variation-settings-valid.html.ini
@ -1,29 +0,0 @@
-[font-variation-settings-valid.html]
-  [e.style['font-variation-settings'\] = "\\"wght\\" 700, \\"XHGT\\" 0.7" should set the property value]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [e.style['font-variation-settings'\] = "\\"wght\\" 700" should set the property value]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [e.style['font-variation-settings'\] = "normal" should set the property value]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [e.style['font-variation-settings'\] = "\\"a cd\\" 0.5" should set the property value]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [e.style['font-variation-settings'\] = "\\"ab@d\\" 0.5" should set the property value]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [e.style['font-variation-settings'\] = "'wght' 1e3, 'slnt' -450.0e-1" should set the property value]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [e.style['font-variation-settings'\] = "'wght' 700" should set the property value]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
--- a/testing/web-platform/meta/css/css-fonts/variations/font-variation-settings-inherit.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/variations/font-variation-settings-inherit.html.ini
@ -1,13 +0,0 @@
-[font-variation-settings-inherit.html]
-  [Test font-variation-settings for duplicates using 'yyyy' 1, 'yyyy' 2]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Test font-variation-settings for child inheritance]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
-  [Test font-variation-settings for child override]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
--- a/testing/web-platform/meta/css/css-pseudo/first-letter-allowed-properties.html.ini
+++ b/testing/web-platform/meta/css/css-pseudo/first-letter-allowed-properties.html.ini
@ -8,10 +8,6 @@
  [borderImage should be applied to first-letter pseudo elements.]
    expected: FAIL

-  [fontVariationSettings should be applied to first-letter pseudo elements.]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
  [margin should be applied to first-letter pseudo elements.]
    expected: FAIL

--- a/testing/web-platform/meta/css/css-pseudo/first-line-allowed-properties.html.ini
+++ b/testing/web-platform/meta/css/css-pseudo/first-line-allowed-properties.html.ini
@ -1,8 +1,4 @@
 [first-line-allowed-properties.html]
-  [fontVariationSettings should be applied to first-line pseudo elements.]
-    expected:
-      if (processor == "x86") and (os == "win"): FAIL
-
  [textJustify should be applied to first-line pseudo elements.]
    expected: FAIL

--- a/testing/web-platform/meta/css/css-scrollbars/textarea-scrollbar-width-none.html.ini
+++ b/testing/web-platform/meta/css/css-scrollbars/textarea-scrollbar-width-none.html.ini
@ -1,6 +1,6 @@
 [textarea-scrollbar-width-none.html]
  expected:
-    if (os == "win") and (version == "6.1.7601"): FAIL
-    if not webrender and (os == "win") and (bits == 64): FAIL
    if webrender and (os == 'android'): PASS
    if (os == "android"): FAIL
+  fuzzy:
+    if not webrender and (os == "win") and bits == 32: maxDifference=112;totalPixels=0-3900
--- a/testing/web-platform/meta/css/css-text-decor/text-decoration-thickness-from-font-variable.html.ini
+++ b/testing/web-platform/meta/css/css-text-decor/text-decoration-thickness-from-font-variable.html.ini
@ -1,4 +1,3 @@
 [text-decoration-thickness-from-font-variable.html]
  expected:
-    if (os == "win") and (processor == "x86"): FAIL
    if os == "linux": FAIL
--- a/testing/web-platform/meta/css/css-text-decor/text-underline-offset-variable.html.ini
+++ b/testing/web-platform/meta/css/css-text-decor/text-underline-offset-variable.html.ini
@ -1,3 +0,0 @@
-[text-underline-offset-variable.html]
-  expected:
-    if processor == "x86": FAIL
--- a/testing/web-platform/meta/css/css-text-decor/text-underline-position-from-font-variable.html.ini
+++ b/testing/web-platform/meta/css/css-text-decor/text-underline-position-from-font-variable.html.ini
@ -1,4 +1,3 @@
 [text-underline-position-from-font-variable.html]
  expected:
    if os == "linux": FAIL
-    if (os == "win") and (processor == "x86"): FAIL
--- a/testing/web-platform/meta/css/css-text/word-break/word-break-normal-bo-000.html.ini
+++ b/testing/web-platform/meta/css/css-text/word-break/word-break-normal-bo-000.html.ini
@ -1,3 +1,3 @@
 [word-break-normal-bo-000.html]
  expected:
-    if (os == "win") and (processor == "x86_64"): FAIL
+    if (os == "win"): FAIL