From d4018f8ad0d3012a63be61cb03046153fafbd7bb Mon Sep 17 00:00:00 2001
From: Michelle Goossens <michelle@masterwayz.nl>
Date: Sun, 12 Sep 2021 22:14:42 +0000
Subject: [PATCH] Bug 1727925 - Part 4: Migrate wpt and wpt-headless on Windows
 10-32 from AWS to Azure r=jmaher

Differential Revision: https://phabricator.services.mozilla.com/D125305
---
 taskcluster/ci/test/test-platforms.yml        | 14 ++---
 .../filter-contrast-002.html.ini              |  1 +
 .../svg-mutation-function-to-url.html.ini     |  3 +-
 ...g-mutation-single-to-multiple-001.html.ini |  2 +-
 .../svg-mutation-url-to-function.html.ini     |  2 +-
 .../svg-shorthand-hue-rotate-001.html.ini     |  1 +
 ...mmediately-after-hidden.tentative.html.ini |  4 +-
 ...ady-focused-iframe-different-site.html.ini |  1 +
 ...lement-after-focusing-out-iframes.html.ini |  2 +-
 .../meta/resource-timing/TAO-match.html.ini   | 51 -------------------
 ...ent-confirmation-enrollment.https.html.ini |  8 +--
 ...ment-confirmation.tentative.https.html.ini |  1 +
 .../web-platform/meta/url/failure.html.ini    |  1 +
 .../meta/web-share/share-empty.https.html.ini |  6 ---
 14 files changed, 23 insertions(+), 74 deletions(-)

diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
index 2940315f5570..0cfa6f8e6c61 100644
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -135,8 +135,6 @@ windows10-32-shippable-qr/opt:
         - browsertime
         - raptor-chrome
         - raptor-firefox
-        - web-platform-tests
-        - web-platform-tests-wdspec-headless
         - windows-talos
 
 windows10-32-qr/opt:
@@ -144,20 +142,15 @@ windows10-32-qr/opt:
     test-sets:
         - browsertime
         - raptor-firefox
-        - web-platform-tests
-        - web-platform-tests-wdspec-headless
         - windows-talos
 
-windows10-32-qr/debug:
-    build-platform: win32/debug
-    test-sets:
-        - web-platform-tests
-
 windows10-32-2004-shippable-qr/opt:
     build-platform: win32-shippable/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
+        - web-platform-tests
+        - web-platform-tests-wdspec-headless
         - windows32-2004-tests
 
 
@@ -166,11 +159,14 @@ windows10-32-2004-qr/opt:
     test-sets:
         - awsy
         - desktop-screenshot-capture
+        - web-platform-tests
+        - web-platform-tests-wdspec-headless
         - windows32-2004-tests
 
 windows10-32-2004-qr/debug:
     build-platform: win32/debug
     test-sets:
+        - web-platform-tests
         - windows-7-tests
         - windows32-2004-tests
         - windows10-32-2004-failure-tests
diff --git a/testing/web-platform/meta/css/filter-effects/filter-contrast-002.html.ini b/testing/web-platform/meta/css/filter-effects/filter-contrast-002.html.ini
index cbef6094b804..8017bc3797d5 100644
--- a/testing/web-platform/meta/css/filter-effects/filter-contrast-002.html.ini
+++ b/testing/web-platform/meta/css/filter-effects/filter-contrast-002.html.ini
@@ -1,5 +1,6 @@
 [filter-contrast-002.html]
   expected:
+    if win10_2004 and bits == 32: PASS
     if (os == "win") and not fission and (processor == "x86_64") and not swgl and not debug: [FAIL, PASS]
     if (os == "win") and not fission and (processor == "x86_64") and not swgl and debug: FAIL
     if (os == "win") and fission: FAIL
diff --git a/testing/web-platform/meta/css/filter-effects/svg-mutation-function-to-url.html.ini b/testing/web-platform/meta/css/filter-effects/svg-mutation-function-to-url.html.ini
index edd8d271c3a5..c95ea034af62 100644
--- a/testing/web-platform/meta/css/filter-effects/svg-mutation-function-to-url.html.ini
+++ b/testing/web-platform/meta/css/filter-effects/svg-mutation-function-to-url.html.ini
@@ -1,9 +1,10 @@
 [svg-mutation-function-to-url.html]
   expected:
+    if win10_2004 and bits == 32: PASS
     if (os == "win") and not fission and (processor == "x86_64") and not swgl and debug: FAIL
     if (os == "win") and not fission and (processor == "x86_64") and not swgl and not debug: [FAIL, PASS]
     if (os == "win") and not fission and (processor == "x86_64") and swgl: PASS
-    if (os == "win") and not fission and (processor == "x86"): PASS
+    if (os == "win") and (processor == "x86"): PASS
     if (os == "win") and fission: FAIL
     if (os == "android") and swgl: PASS
     if (os == "linux") and swgl: PASS
diff --git a/testing/web-platform/meta/css/filter-effects/svg-mutation-single-to-multiple-001.html.ini b/testing/web-platform/meta/css/filter-effects/svg-mutation-single-to-multiple-001.html.ini
index 4b7691bbbec0..3b58f7575277 100644
--- a/testing/web-platform/meta/css/filter-effects/svg-mutation-single-to-multiple-001.html.ini
+++ b/testing/web-platform/meta/css/filter-effects/svg-mutation-single-to-multiple-001.html.ini
@@ -1,9 +1,9 @@
 [svg-mutation-single-to-multiple-001.html]
   expected:
+    if win10_2004 and bits == 32: PASS
     if (os == "win") and not fission and (processor == "x86_64") and not swgl and not debug: [FAIL, PASS]
     if (os == "win") and not fission and (processor == "x86_64") and not swgl and debug: FAIL
     if (os == "win") and not fission and (processor == "x86_64") and swgl: PASS
-    if (os == "win") and not fission and (processor == "x86"): PASS
     if (os == "android") and swgl: PASS
     if (os == "mac") and not webrender: FAIL
     if (os == "linux") and swgl: PASS
diff --git a/testing/web-platform/meta/css/filter-effects/svg-mutation-url-to-function.html.ini b/testing/web-platform/meta/css/filter-effects/svg-mutation-url-to-function.html.ini
index c0b1a31324e6..6437a91dd40f 100644
--- a/testing/web-platform/meta/css/filter-effects/svg-mutation-url-to-function.html.ini
+++ b/testing/web-platform/meta/css/filter-effects/svg-mutation-url-to-function.html.ini
@@ -1,9 +1,9 @@
 [svg-mutation-url-to-function.html]
   expected:
+    if win10_2004 and bits == 32: PASS
     if (os == "win") and not fission and (processor == "x86_64") and not swgl and debug: FAIL
     if (os == "win") and not fission and (processor == "x86_64") and not swgl and not debug: [FAIL, PASS]
     if (os == "win") and not fission and (processor == "x86_64") and swgl: PASS
-    if (os == "win") and not fission and (processor == "x86"): PASS
     if (os == "mac") and debug and not webrender: FAIL
     if (os == "win") and fission: FAIL
     if (os == "mac") and devedition: ["PASS", "FAIL"]
diff --git a/testing/web-platform/meta/css/filter-effects/svg-shorthand-hue-rotate-001.html.ini b/testing/web-platform/meta/css/filter-effects/svg-shorthand-hue-rotate-001.html.ini
index fa4eab8649cf..08abee73052f 100644
--- a/testing/web-platform/meta/css/filter-effects/svg-shorthand-hue-rotate-001.html.ini
+++ b/testing/web-platform/meta/css/filter-effects/svg-shorthand-hue-rotate-001.html.ini
@@ -1,5 +1,6 @@
 [svg-shorthand-hue-rotate-001.html]
   expected:
+    if win10_2004 and bits == 32: PASS
     if (os == "win") and not fission and (processor == "x86_64") and not swgl and debug: FAIL
     if (os == "win") and not fission and (processor == "x86_64") and not swgl and not debug: [FAIL, PASS]
     if (os == "win") and fission: FAIL
diff --git a/testing/web-platform/meta/editing/other/edit-in-textcontrol-immediately-after-hidden.tentative.html.ini b/testing/web-platform/meta/editing/other/edit-in-textcontrol-immediately-after-hidden.tentative.html.ini
index 6b134ef7b94a..2e75ffc3c315 100644
--- a/testing/web-platform/meta/editing/other/edit-in-textcontrol-immediately-after-hidden.tentative.html.ini
+++ b/testing/web-platform/meta/editing/other/edit-in-textcontrol-immediately-after-hidden.tentative.html.ini
@@ -6,7 +6,9 @@
     expected: FAIL
 
   [<textarea> is hidden by "keydown" event listener]
-    expected: FAIL
+    expected:
+      if win10_2004 and (bits == 32): [PASS, FAIL]
+      FAIL
 
   [<textarea> is hidden by "keypress" event listener]
     expected: FAIL
diff --git a/testing/web-platform/meta/focus/focus-already-focused-iframe-different-site.html.ini b/testing/web-platform/meta/focus/focus-already-focused-iframe-different-site.html.ini
index 8d32b04fcdd9..df39b77cb16e 100644
--- a/testing/web-platform/meta/focus/focus-already-focused-iframe-different-site.html.ini
+++ b/testing/web-platform/meta/focus/focus-already-focused-iframe-different-site.html.ini
@@ -3,3 +3,4 @@
     if (os == "linux") and not fission and not debug: [OK, TIMEOUT]
     if (os == "mac") and not debug: [OK, TIMEOUT]
     if (os == "win") and (processor == "x86_64"): [OK, TIMEOUT]
+    if win10_2004 and (bits == 32): [OK, TIMEOUT]
diff --git a/testing/web-platform/meta/focus/iframe-activeelement-after-focusing-out-iframes.html.ini b/testing/web-platform/meta/focus/iframe-activeelement-after-focusing-out-iframes.html.ini
index eb16576c76f2..b7ef6b5d5db4 100644
--- a/testing/web-platform/meta/focus/iframe-activeelement-after-focusing-out-iframes.html.ini
+++ b/testing/web-platform/meta/focus/iframe-activeelement-after-focusing-out-iframes.html.ini
@@ -2,7 +2,7 @@
   [Check iframe activeElement after focusing out different site iframe]
     expected:
       if (os == "win") and not swgl and not debug and not fission and (processor == "x86_64"): [FAIL, PASS]
-      if (os == "win") and not swgl and not debug and not fission and (processor == "x86"): PASS
+      if (os == "win") and not swgl and not debug and not fission and (processor == "x86"): [PASS, FAIL]
       if (os == "win") and not swgl and debug: PASS
       if (os == "mac") and debug: PASS
       if os == "android": PASS
diff --git a/testing/web-platform/meta/resource-timing/TAO-match.html.ini b/testing/web-platform/meta/resource-timing/TAO-match.html.ini
index cec3082f916e..bd2c030efd66 100644
--- a/testing/web-platform/meta/resource-timing/TAO-match.html.ini
+++ b/testing/web-platform/meta/resource-timing/TAO-match.html.ini
@@ -1,355 +1,304 @@
 [TAO-match.html]
   expected:
     if (os == "win") and ccov: OK
-    if (os == "win") and (processor == "x86"): OK
     if os == "android": OK
     TIMEOUT
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a case-sensitive match. (iframe)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains the origin and a wildcard. (iframe)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value contains only the origin. (iframe)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       TIMEOUT
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a case-sensitive match. (image)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains the origin and a wildcard. (image)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value contains only the origin. (image)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a case-sensitive match. (script)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains the origin and a wildcard. (script)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value contains only the origin. (script)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a case-sensitive match. (stylesheet)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains the origin and a wildcard. (stylesheet)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value contains only the origin. (stylesheet)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value contains only a wildcard. (iframe)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a wildcard. (iframe)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value list contains a null origin. (iframe)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains multiple wildcards. (iframe)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value contains only the uppercased origin. (iframe)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value contains the origin, a space, then a wildcard. (iframe)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header is not present. (iframe)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value contains only a wildcard. (image)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a wildcard. (image)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value list contains a null origin. (image)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains multiple wildcards. (image)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value contains only the uppercased origin. (image)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value contains the origin, a space, then a wildcard. (image)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header is not present. (image)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value contains only a wildcard. (script)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a wildcard. (script)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value list contains a null origin. (script)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains multiple wildcards. (script)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value contains only the uppercased origin. (script)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value contains the origin, a space, then a wildcard. (script)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header is not present. (script)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value contains only a wildcard. (stylesheet)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a wildcard. (stylesheet)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value list contains a null origin. (stylesheet)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains multiple wildcards. (stylesheet)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value contains only the uppercased origin. (stylesheet)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value contains the origin, a space, then a wildcard. (stylesheet)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header is not present. (stylesheet)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value contains only the origin. (XMLHttpRequest)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value contains only a wildcard. (XMLHttpRequest)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a case-sensitive match. (XMLHttpRequest)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains the origin and a wildcard. (XMLHttpRequest)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a wildcard. (XMLHttpRequest)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value list contains a null origin. (XMLHttpRequest)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains multiple wildcards. (XMLHttpRequest)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value contains only the uppercased origin. (XMLHttpRequest)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value contains the origin, a space, then a wildcard. (XMLHttpRequest)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header is not present. (XMLHttpRequest)]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "win") and (processor == "x86"): PASS
       if os == "android": PASS
       NOTRUN
diff --git a/testing/web-platform/meta/secure-payment-confirmation/secure-payment-confirmation-enrollment.https.html.ini b/testing/web-platform/meta/secure-payment-confirmation/secure-payment-confirmation-enrollment.https.html.ini
index 58a0ccfa09ee..6d358700b398 100644
--- a/testing/web-platform/meta/secure-payment-confirmation/secure-payment-confirmation-enrollment.https.html.ini
+++ b/testing/web-platform/meta/secure-payment-confirmation/secure-payment-confirmation-enrollment.https.html.ini
@@ -6,7 +6,7 @@
     expected:
       if (os == "linux") and not debug and (processor == "x86_64") and fission: [FAIL, TIMEOUT]
       if (os == "linux") and not debug and (processor == "x86_64") and not fission: [FAIL, TIMEOUT]
-      if (os == "win") and (processor == "x86") and not debug: TIMEOUT
+      if (os == "win") and (processor == "x86"): [FAIL, TIMEOUT]
       if (os == "linux") and not debug and (processor == "x86"): [TIMEOUT, FAIL]
       if (os == "mac") and not debug: [TIMEOUT, FAIL]
       if os == "android": TIMEOUT
@@ -18,7 +18,6 @@
       if (os == "linux") and not debug and (processor == "x86_64") and fission: [FAIL, NOTRUN]
       if (os == "linux") and not debug and (processor == "x86_64") and not fission: [FAIL, NOTRUN]
       if (os == "win") and ccov: TIMEOUT
-      if (os == "win") and (processor == "x86") and not debug: NOTRUN
       if (os == "linux") and not debug and (processor == "x86"): [NOTRUN, FAIL]
       if (os == "mac") and not debug: [NOTRUN, TIMEOUT]
       if os == "android": NOTRUN
@@ -28,7 +27,7 @@
     expected:
       if (os == "linux") and not debug and (processor == "x86_64") and fission: [TIMEOUT, NOTRUN]
       if (os == "linux") and not debug and (processor == "x86_64") and not fission: [TIMEOUT, NOTRUN]
-      if (os == "win") and (processor == "x86") and debug: TIMEOUT
+      if (os == "win") and (processor == "x86"): [FAIL, TIMEOUT]
       if (os == "linux") and not debug and (processor == "x86"): [NOTRUN, TIMEOUT]
       if (os == "mac") and debug: TIMEOUT
       if (os == "win") and (processor == "x86_64") and not ccov: FAIL
@@ -38,14 +37,17 @@
   [Payment credential requires residentKey to be "required", not "preferred".]
     expected:
       if (os == "win") and (processor == "x86_64") and not ccov: FAIL
+      if win10_2004 and (bits == 32): FAIL
       NOTRUN
 
   [Payment credential requires residentKey to be "required", not "discouraged".]
     expected:
       if (os == "win") and (processor == "x86_64") and not ccov: FAIL
+      if win10_2004 and (bits == 32): FAIL
       NOTRUN
 
   [Payment credential requires authenticatorAttachment to be "platform", not "cross-platform".]
     expected:
       if (os == "win") and (processor == "x86_64") and not ccov: TIMEOUT
+      if win10_2004 and (bits == 32): TIMEOUT
       NOTRUN
diff --git a/testing/web-platform/meta/secure-payment-confirmation/secure-payment-confirmation.tentative.https.html.ini b/testing/web-platform/meta/secure-payment-confirmation/secure-payment-confirmation.tentative.https.html.ini
index 81ba99fe0388..5187b75a512d 100644
--- a/testing/web-platform/meta/secure-payment-confirmation/secure-payment-confirmation.tentative.https.html.ini
+++ b/testing/web-platform/meta/secure-payment-confirmation/secure-payment-confirmation.tentative.https.html.ini
@@ -1,6 +1,7 @@
 [secure-payment-confirmation.tentative.https.html]
   expected:
     if (os == "win") and (processor == "x86_64") and not ccov: TIMEOUT
+    if win10_2004 and (bits == 32 ) and not ccov: TIMEOUT
   [Valid payment method data does not throw exceptions.]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/url/failure.html.ini b/testing/web-platform/meta/url/failure.html.ini
index 086e840cb3b0..634749afa8bb 100644
--- a/testing/web-platform/meta/url/failure.html.ini
+++ b/testing/web-platform/meta/url/failure.html.ini
@@ -4,6 +4,7 @@
   max-asserts: 3
   expected:
     if (os == "win") and (processor == "x86_64"): OK
+    if win10_2004 and bits == 32: OK
     CRASH
   [URL's href: file://example:1/ should throw]
     expected: FAIL
diff --git a/testing/web-platform/meta/web-share/share-empty.https.html.ini b/testing/web-platform/meta/web-share/share-empty.https.html.ini
index e29305daad3e..8f9cb5e2b89d 100644
--- a/testing/web-platform/meta/web-share/share-empty.https.html.ini
+++ b/testing/web-platform/meta/web-share/share-empty.https.html.ini
@@ -2,29 +2,23 @@
   [share with no arguments (same as empty dictionary)]
     expected:
       if (os == "win") and ccov: FAIL
-      if (processor == "x86") and (os == "win"): FAIL
 
   [share with an empty dictionary]
     expected:
       if (os == "win") and ccov: FAIL
-      if (processor == "x86") and (os == "win"): FAIL
 
   [share with a undefined argument (same as empty dictionary)]
     expected:
       if (os == "win") and ccov: FAIL
-      if (processor == "x86") and (os == "win"): FAIL
 
   [share with a null argument (same as empty dictionary)]
     expected:
       if (os == "win") and ccov: FAIL
-      if (processor == "x86") and (os == "win"): FAIL
 
   [share with a dictionary containing only surplus fields]
     expected:
       if (os == "win") and ccov: FAIL
-      if (processor == "x86") and (os == "win"): FAIL
 
   [share with an empty files member]
     expected:
       if (os == "win") and ccov: FAIL
-      if (processor == "x86") and (os == "win"): FAIL