Rebaseline win11-blink-rel

Update blink infra to support rebaseline for Win11 Bug: 1295890 Change-Id: I7cb2a2f92370b3d93f154ff5b6247399f3997286 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3630003 Reviewed-by: Stephen Chenney <schenney@chromium.org> Reviewed-by: Stephen Martinis <martiniss@chromium.org> Commit-Queue: Weizhong Xia <weizhong@google.com> Reviewed-by: Jonathan Lee <jonathanjlee@google.com> Cr-Commit-Position: refs/heads/main@{#1001309}
marcosholgado · May 10, 2022 · 9afdbe5 · 9afdbe5
1 parent fe42187
commit 9afdbe5
Show file tree

Hide file tree

Showing 26 changed files with 85 additions and 38 deletions.
diff --git a/docs/testing/web_test_expectations.md b/docs/testing/web_test_expectations.md
@@ -303,14 +303,14 @@ The syntax of a line is roughly:
   applicable to that file.
 * If specified, modifiers must be one of `Fuchsia`, `Mac`, `Mac10.12`,
   `Mac10.13`, `Mac10.14`, `Mac10.15`, `Mac11`, `Mac11-arm64`, `Linux`, `Trusty`,
-  `Win`, `Win7`, `Win10.20h2`, and, optionally, `Release`, or `Debug`. Check the
+  `Win`, `Win7`, `Win10.20h2`, `Win11`, and, optionally, `Release`, or `Debug`. Check the
   top of
   [TestExpectations](../../third_party/blink/web_tests/TestExpectations) or the
   `ALL_SYSTEMS` macro in
   [third_party/blink/tools/blinkpy/web_tests/port/base.py](../../third_party/blink/tools/blinkpy/web_tests/port/base.py)
   for an up-to-date list.
-* Some modifiers are meta keywords, e.g. `Win` represents both `Win7` and
-  `Win10.20h2`. See the `CONFIGURATION_SPECIFIER_MACROS` dictionary in
+* Some modifiers are meta keywords, e.g. `Win` represents `Win7`,
+  `Win10.20h2` and `Win11`. See the `CONFIGURATION_SPECIFIER_MACROS` dictionary in
   [third_party/blink/tools/blinkpy/web_tests/port/base.py](../../third_party/blink/tools/blinkpy/web_tests/port/base.py)
   for the meta keywords and which modifiers they represent.
 * Expectations can be one or more of `Crash`, `Failure`, `Pass`, `Rebaseline`,

diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
@@ -102014,7 +102014,9 @@
       {
         "args": [
           "--num-retries=3",
-          "--git-revision=${got_revision}"
+          "--git-revision=${got_revision}",
+          "--target",
+          "Release_x64"
         ],
         "isolate_name": "blink_web_tests",
         "merge": {
@@ -102040,7 +102042,7 @@
               "os": "Windows-11-22000"
             }
           ],
-          "hard_timeout": 900,
+          "hard_timeout": 1200,
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 12
         },

diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
@@ -511,6 +511,15 @@
           'hard_timeout': 1200,
         },
       },
+      'win11-blink-rel-dummy': {
+        'swarming': {
+          'hard_timeout': 1200,
+        },
+        'args': [
+          '--target',
+          'Release_x64',
+        ],
+      },
     },
   },
   'breakpad_unittests': {

diff --git a/third_party/blink/tools/blinkpy/common/checkout/baseline_optimizer_unittest.py b/third_party/blink/tools/blinkpy/common/checkout/baseline_optimizer_unittest.py
@@ -63,6 +63,10 @@ def setUp(self):
                 'port_name': 'win-win10.20h2',
                 'specifiers': ['Win10.20h2', 'Release']
             },
+            'Fake Test Win11': {
+                'port_name': 'win-win11',
+                'specifiers': ['Win11', 'Release']
+            },
             'Fake Test Linux': {
                 'port_name': 'linux-trusty',
                 'specifiers': ['Trusty', 'Release']
@@ -93,7 +97,7 @@ def setUp(self):
         # tests need to be adjusted accordingly.
         self.assertEqual(sorted(self.host.port_factory.all_port_names()), [
             'linux-trusty', 'mac-mac10.12', 'mac-mac10.13', 'mac-mac10.14',
-            'mac-mac10.15', 'mac-mac11', 'win-win10.20h2'
+            'mac-mac10.15', 'mac-mac11', 'win-win10.20h2', 'win-win11'
         ])
 
     def _assert_optimization(self,

diff --git a/third_party/blink/tools/blinkpy/common/config/builders.json b/third_party/blink/tools/blinkpy/common/config/builders.json
@@ -59,6 +59,11 @@
         "port_name": "win-win10.20h2",
         "specifiers": ["Win10.20h2", "Release"]
     },
+    "Win11 Tests x64": {
+        "main": "chromium.win",
+        "port_name": "win-win11",
+        "specifiers": ["Win11", "Release"]
+    },
     "fuchsia_x64": {
         "main": "tryserver.chromium.linux",
         "port_name": "fuchsia",
@@ -135,6 +140,12 @@
         "specifiers": ["Win10.20h2", "Release"],
         "is_try_builder": true
     },
+    "win11-blink-rel": {
+        "main": "tryserver.blink",
+        "port_name": "win-win11",
+        "specifiers": ["Win11", "Release"],
+        "is_try_builder": true
+    },
     "linux-rel": {
         "main": "tryserver.chromium.linux",
         "port_name": "linux-trusty",

diff --git a/third_party/blink/tools/blinkpy/common/system/platform_info.py b/third_party/blink/tools/blinkpy/common/system/platform_info.py
@@ -192,12 +192,11 @@ def _determine_linux_version(self, _):
 
     def _determine_win_version(self, win_version_tuple):
         if win_version_tuple[:2] == (10, 0):
-            # came across instances where build number was 15063.
-            # Treat those as 1909.
-            if win_version_tuple[2] > 19000:
-                return '10.20h2'
+            # For win11 platform.win32_ver() returns (10, 0, 22000)
+            if win_version_tuple[2] >= 22000:
+                return '11'
             else:
-                return '10.1909'
+                return '10.20h2'
         if win_version_tuple[:2] == (6, 3):
             return '8.1'
         if win_version_tuple[:2] == (6, 2):

diff --git a/third_party/blink/tools/blinkpy/common/system/platform_info_unittest.py b/third_party/blink/tools/blinkpy/common/system/platform_info_unittest.py
@@ -201,12 +201,17 @@ def test_os_version(self):
             self.make_info(
                 fake_sys('win32', tuple([10, 0, 1234])),
                 fake_platform(win_version_string="10.0.1234")).os_version,
-            '10.1909')
+            '10.20h2')
         self.assertEqual(
             self.make_info(
                 fake_sys('win32', tuple([10, 0, 19042])),
                 fake_platform(win_version_string="10.0.19042")).os_version,
             '10.20h2')
+        self.assertEqual(
+            self.make_info(
+                fake_sys('win32', tuple([10, 0, 23000])),
+                fake_platform(win_version_string="10.0.23000")).os_version,
+            '11')
         self.assertEqual(
             self.make_info(
                 fake_sys('win32', tuple([6, 3, 1234])),

diff --git a/third_party/blink/tools/blinkpy/web_tests/port/base.py b/third_party/blink/tools/blinkpy/web_tests/port/base.py
@@ -149,6 +149,7 @@ class Port(object):
         ('mac11-arm64', 'arm64'),
         ('win7', 'x86'),
         ('win10.20h2', 'x86'),
+        ('win11', 'x64'),
         ('trusty', 'x86_64'),
         ('fuchsia', 'x86_64'),
     )
@@ -158,7 +159,7 @@ class Port(object):
             'mac10.12', 'mac10.13', 'mac10.14', 'mac10.15', 'mac11',
             'mac11-arm64'
         ],
-        'win': ['win7', 'win10.20h2'],
+        'win': ['win7', 'win10.20h2', 'win11'],
         'linux': ['trusty'],
         'fuchsia': ['fuchsia'],
     }

diff --git a/third_party/blink/tools/blinkpy/web_tests/port/win.py b/third_party/blink/tools/blinkpy/web_tests/port/win.py
@@ -51,10 +51,11 @@
 class WinPort(base.Port):
     port_name = 'win'
 
-    SUPPORTED_VERSIONS = ('win7', 'win10.20h2')
+    SUPPORTED_VERSIONS = ('win7', 'win10.20h2', 'win11')
 
     FALLBACK_PATHS = {}
-    FALLBACK_PATHS['win10.20h2'] = ['win']
+    FALLBACK_PATHS['win11'] = ['win']
+    FALLBACK_PATHS['win10.20h2'] = ['win10'] + FALLBACK_PATHS['win11']
     FALLBACK_PATHS['win7'] = ['win7'] + FALLBACK_PATHS['win10.20h2']
 
     BUILD_REQUIREMENTS_URL = 'https://chromium.googlesource.com/chromium/src/+/main/docs/windows_build_instructions.md'
@@ -67,9 +68,11 @@ def determine_full_port_name(cls, host, options, port_name):
             if host.platform.os_version in ('vista', '7sp0', '7sp1'):
                 version = 'win7'
             # Same for win8, win10.1909 we treat it as win10.
-            elif host.platform.os_version in ('8', '8.1', '10.1909', '10.20h2',
-                                              'future'):
+            elif host.platform.os_version in ('8', '8.1', '10.1909',
+                                              '10.20h2'):
                 version = 'win10.20h2'
+            elif host.platform.os_version in ('11', 'future'):
+                version = 'win11'
             else:
                 version = host.platform.os_version
             port_name = port_name + '-' + version

diff --git a/third_party/blink/tools/blinkpy/web_tests/port/win_unittest.py b/third_party/blink/tools/blinkpy/web_tests/port/win_unittest.py
@@ -91,9 +91,12 @@ def test_versions(self):
         self.assert_name('win-win7', '7sp0', 'win-win7')
         self.assert_name('win-win7', 'vista', 'win-win7')
 
-        self.assert_name(None, 'future', 'win-win10.20h2')
-        self.assert_name('win', 'future', 'win-win10.20h2')
-        self.assert_name('win-win10.20h2', 'future', 'win-win10.20h2')
+        self.assert_name(None, 'win11', 'win-win11')
+        self.assert_name('win', 'win11', 'win-win11')
+
+        self.assert_name(None, 'future', 'win-win11')
+        self.assert_name('win', 'future', 'win-win11')
+        self.assert_name('win-win11', 'future', 'win-win11')
 
         with self.assertRaises(AssertionError):
             self.assert_name(None, 'w2k', 'win-win7')
@@ -107,8 +110,8 @@ def assert_baseline_paths(self, port_name, *expected_paths):
             self.assertTrue(port.baseline_search_path()[i].endswith(path))
 
     def test_baseline_path(self):
-        self.assert_baseline_paths('win-win7', 'win7', '/win')
-        self.assert_baseline_paths('win-win10.20h2', 'win')
+        self.assert_baseline_paths('win-win7', 'win7', 'win10', '/win')
+        self.assert_baseline_paths('win-win10.20h2', 'win10', 'win')
 
     def test_operating_system(self):
         self.assertEqual('win', self.make_port().operating_system())

diff --git a/third_party/blink/web_tests/ASANExpectations b/third_party/blink/web_tests/ASANExpectations
@@ -1,4 +1,4 @@
-# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10.20h2 ]
+# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10.20h2 Win11 ]
 # tags: [ Release Debug ]
 # results: [ Timeout Crash Pass Failure Slow Skip ]
 

diff --git a/third_party/blink/web_tests/FlagExpectations/disable-layout-ng b/third_party/blink/web_tests/FlagExpectations/disable-layout-ng
@@ -1,4 +1,4 @@
-# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
+# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 Win11 ]
 # tags: [ Release Debug ]
 # results: [ Timeout Crash Pass Failure Slow Skip ]
 

diff --git a/third_party/blink/web_tests/FlagExpectations/disable-site-isolation-trials b/third_party/blink/web_tests/FlagExpectations/disable-site-isolation-trials
@@ -1,4 +1,4 @@
-# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
+# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 Win11 ]
 # tags: [ Release Debug ]
 # results: [ Timeout Crash Pass Failure Slow Skip ]
 

diff --git a/third_party/blink/web_tests/FlagExpectations/force-renderer-accessibility b/third_party/blink/web_tests/FlagExpectations/force-renderer-accessibility
@@ -1,4 +1,4 @@
-# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
+# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 Win11 ]
 # results: [ Timeout Crash Pass Failure Slow Skip ]
 
 # Expectations for --force-renderer-accessibility

diff --git a/third_party/blink/web_tests/FlagExpectations/skia-vulkan-swiftshader b/third_party/blink/web_tests/FlagExpectations/skia-vulkan-swiftshader
@@ -1,4 +1,4 @@
-# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
+# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 Win11 ]
 # tags: [ Release Debug ]
 # results: [ Timeout Crash Pass Failure Slow Skip ]
 

diff --git a/third_party/blink/web_tests/LeakExpectations b/third_party/blink/web_tests/LeakExpectations
@@ -1,4 +1,4 @@
-# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10.20h2 ]
+# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10.20h2 Win11 ]
 # tags: [ Release Debug ]
 # results: [ Timeout Crash Pass Failure Slow Skip ]
 

diff --git a/third_party/blink/web_tests/MSANExpectations b/third_party/blink/web_tests/MSANExpectations
@@ -1,4 +1,4 @@
-# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10.20h2 ]
+# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10.20h2 Win11 ]
 # tags: [ Release Debug ]
 # results: [ Timeout Crash Pass Failure Slow Skip ]
 

diff --git a/third_party/blink/web_tests/NeverFixTests b/third_party/blink/web_tests/NeverFixTests
@@ -1,4 +1,4 @@
-# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Mac10.14 Mac10.15 Mac11 Mac11-arm64 Win Win7 Win10.20h2 ]
+# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Mac10.14 Mac10.15 Mac11 Mac11-arm64 Win Win7 Win10.20h2 Win11 ]
 # tags: [ Release Debug ]
 # results: [ Skip Pass ]
 

diff --git a/third_party/blink/web_tests/SlowTests b/third_party/blink/web_tests/SlowTests
@@ -1,4 +1,4 @@
-# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Mac10.14 Mac10.15 Mac11 Win Win7 Win10.20h2 ]
+# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Mac10.14 Mac10.15 Mac11 Win Win7 Win10.20h2 Win11 ]
 # tags: [ Release Debug ]
 # results: [ Slow ]
 

diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
@@ -1,4 +1,4 @@
-# tags: [ Fuchsia Linux Mac Mac10.12 Mac10.13 Mac10.14 Mac10.15 Mac11 Mac11-arm64 Win Win7 Win10.20h2 ]
+# tags: [ Fuchsia Linux Mac Mac10.12 Mac10.13 Mac10.14 Mac10.15 Mac11 Mac11-arm64 Win Win7 Win10.20h2 Win11 ]
 # tags: [ Release Debug ]
 # results: [ Timeout Crash Pass Failure Skip ]
 
@@ -6923,6 +6923,12 @@ crbug.com/1321243 accessibility/aom-reparenting-crash.html [ Skip ]
 # Sheriff 2022-05-02
 crbug.com/1321293 fast/forms/calendar-picker/week-picker-choose-default-value-after-set-value.html [ Failure Pass ]
 
+# Test expectations for Win11
+crbug.com/1295890 [ Win11 ] fast/dom/HTMLScriptElement/script-sync-load-failure.html [ Skip Timeout ]
+crbug.com/1295890 [ Win11 ] http/tests/eventsource/eventsource-cors-no-server.html [ Skip Timeout ]
+crbug.com/1295890 [ Win11 ] http/tests/eventsource/workers/eventsource-cors-no-server.html [ Skip Timeout ]
+crbug.com/1295890 [ Win11 ] http/tests/security/document-domain-canonicalizes-iframe.html [ Skip Timeout ]
+
 # Sheriff 2022-05-04
 crbug.com/1309533 [ Win ] virtual/threaded-prefer-compositing/external/wpt/css/cssom-view/idlharness.html [ Failure ]
 

diff --git a/third_party/blink/web_tests/W3CImportExpectations b/third_party/blink/web_tests/W3CImportExpectations
@@ -1,4 +1,4 @@
-# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10.20h2 ]
+# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10.20h2 Win11 ]
 # tags: [ Release Debug ]
 # results: [ Skip ]
 

diff --git a/third_party/blink/web_tests/WPTOverrideExpectations b/third_party/blink/web_tests/WPTOverrideExpectations
@@ -1,4 +1,4 @@
-# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10.20h2 ]
+# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10.20h2 Win11 ]
 # tags: [ Release Debug ]
 # results: [ Timeout Crash Pass Failure Slow Skip ]
 

diff --git a/third_party/blink/web_tests/WebDriverExpectations b/third_party/blink/web_tests/WebDriverExpectations
@@ -1,4 +1,4 @@
-# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Mac10.14 Mac10.15 Mac11 Win Win7 Win10.20h2 ]
+# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Mac10.14 Mac10.15 Mac11 Win Win7 Win10.20h2 Win11 ]
 # tags: [ Release Debug ]
 # results: [ Timeout Crash Pass Failure Slow Skip ]
 

diff --git a/third_party/blink/web_tests/WebGPUExpectations b/third_party/blink/web_tests/WebGPUExpectations
@@ -1,4 +1,4 @@
-# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Mac11 Win Win7 Win10.20h2 ]
+# tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Mac11 Win Win7 Win10.20h2 Win11 ]
 # tags: [ Release Debug ]
 # results: [ Timeout Crash Pass Failure Slow Skip RetryOnFailure ]
 

diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
@@ -819,7 +819,7 @@
       'mac11.0-blink-rel': 'release_bot_blink_minimal_symbols_no_nacl',
       'mac11.0.arm64-blink-rel': 'release_bot_blink_arm64_minimal_symbols',
       'win10.20h2-blink-rel': 'release_bot_blink_x86_minimal_symbols',
-      'win11-blink-rel': 'release_bot_blink_x86_minimal_symbols',
+      'win11-blink-rel': 'release_bot_blink_x64_minimal_symbols',
       'win7-blink-rel': 'release_bot_blink_x86_minimal_symbols',
     },
 
@@ -3177,6 +3177,10 @@
       'release_bot_blink', 'v8_enable_debugging_features',
     ],
 
+    'release_bot_blink_x64_minimal_symbols': [
+      'release_bot_blink', 'x64', 'minimal_symbols',
+    ],
+
     'release_bot_blink_x86_minimal_symbols': [
       'release_bot_blink', 'x86', 'minimal_symbols',
     ],

diff --git a/tools/mb/mb_config_expectations/tryserver.blink.json b/tools/mb/mb_config_expectations/tryserver.blink.json
@@ -113,7 +113,7 @@
       "is_debug": false,
       "proprietary_codecs": true,
       "symbol_level": 1,
-      "target_cpu": "x86",
+      "target_cpu": "x64",
       "use_goma": true
     }
   },