[web tests] Separate expectations using more than one mutually exclusive specifier

This CL also adds the ability to remove configurations from expectations that do
not have bugs. This CL also affects the behavior of the rebaseline and try-flag tools
so that it will create expectations which do not have more than one mutually exclusive specifier.
It also adds a new presubmit check which prevents users from creating expectations that contain
more than one mutually exclusive specifier. We are doing this because the new test expectations
format does not allow expectations to have more than one mutually exclusive specifier.

Bug: 986447
Change-Id: Ic97c4f1bba1e57b71f4624ef88ad69b5c8122a9f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1970297
Commit-Queue: Rakib Hasan <rmhasan@google.com>
Reviewed-by: Robert Ma <robertma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726015}

third_party/blink/tools/blinkpy/tool/commands/rebaseline_unittest.py

@@ -406,7 +406,7 @@ class TestRebaselineUpdatesExpectationsFiles(BaseTestCase):
              'bug(z) [ Linux ] userscripts/first-test.html [ Failure ]\n'))
 
     def test_rebaseline_updates_expectations_file_all_platforms(self):
-        self._write(self.test_expectations_path, 'Bug(x) userscripts/first-test.html [ Failure ]\n')
+        self._write(self.test_expectations_path, 'userscripts/first-test.html [ Failure ]\n')
         self._setup_mock_build_data()
         test_baseline_set = TestBaselineSet(self.tool)
         test_baseline_set.add('userscripts/first-test.html', Build('MOCK Mac10.11'))
@@ -415,13 +415,15 @@ class TestRebaselineUpdatesExpectationsFiles(BaseTestCase):
 
         new_expectations = self._read(self.test_expectations_path)
         self.assertMultiLineEqual(
-            new_expectations, 'Bug(x) [ Linux Mac10.10 Win ] userscripts/first-test.html [ Failure ]\n')
+            new_expectations, ('[ Win ] userscripts/first-test.html [ Failure ]\n'
+                               '[ Linux ] userscripts/first-test.html [ Failure ]\n'
+                               '[ Mac10.10 ] userscripts/first-test.html [ Failure ]\n'))
 
     def test_rebaseline_handles_platform_skips(self):
         # This test is just like test_rebaseline_updates_expectations_file_all_platforms(),
         # except that if a particular port happens to SKIP a test in an overrides file,
         # we count that as passing, and do not think that we still need to rebaseline it.
-        self._write(self.test_expectations_path, 'Bug(x) userscripts/first-test.html [ Failure ]\n')
+        self._write(self.test_expectations_path, 'userscripts/first-test.html [ Failure ]\n')
         self._write('NeverFixTests', 'Bug(y) [ Android ] userscripts [ WontFix ]\n')
         self._setup_mock_build_data()
         test_baseline_set = TestBaselineSet(self.tool)
@@ -431,7 +433,9 @@ class TestRebaselineUpdatesExpectationsFiles(BaseTestCase):
 
         new_expectations = self._read(self.test_expectations_path)
         self.assertMultiLineEqual(
-            new_expectations, 'Bug(x) [ Linux Mac10.10 Win ] userscripts/first-test.html [ Failure ]\n')
+            new_expectations, ('[ Win ] userscripts/first-test.html [ Failure ]\n'
+                               '[ Linux ] userscripts/first-test.html [ Failure ]\n'
+                               '[ Mac10.10 ] userscripts/first-test.html [ Failure ]\n'))
 
     def test_rebaseline_handles_skips_in_file(self):
         # This test is like test_rebaseline_handles_platform_skips, except that the
@@ -451,7 +455,8 @@ class TestRebaselineUpdatesExpectationsFiles(BaseTestCase):
         new_expectations = self._read(self.test_expectations_path)
         self.assertMultiLineEqual(
             new_expectations,
-            ('Bug(x) [ Linux Mac10.10 ] userscripts/first-test.html [ Failure ]\n'
+            ('Bug(x) [ Linux ] userscripts/first-test.html [ Failure ]\n'
+             'Bug(x) [ Mac10.10 ] userscripts/first-test.html [ Failure ]\n'
              'Bug(y) [ Win ] userscripts/first-test.html [ Skip ]\n'))
 
     def test_rebaseline_handles_smoke_tests(self):
@@ -469,7 +474,9 @@ class TestRebaselineUpdatesExpectationsFiles(BaseTestCase):
 
         new_expectations = self._read(self.test_expectations_path)
         self.assertMultiLineEqual(
-            new_expectations, 'Bug(x) [ Linux Mac10.10 Win ] userscripts/first-test.html [ Failure ]\n')
+            new_expectations, ('Bug(x) [ Win ] userscripts/first-test.html [ Failure ]\n'
+                               'Bug(x) [ Linux ] userscripts/first-test.html [ Failure ]\n'
+                               'Bug(x) [ Mac10.10 ] userscripts/first-test.html [ Failure ]\n'))
 
     # In the following test cases, the tests produce no outputs (e.g. clean
     # passing reftests, skipped tests, etc.). Hence, there are no baselines to
@@ -562,7 +569,9 @@ class TestRebaselineUpdatesExpectationsFiles(BaseTestCase):
 
         new_expectations = self._read(self.test_expectations_path)
         self.assertMultiLineEqual(
-            new_expectations, 'Bug(foo) [ Linux Mac10.10 Win ] userscripts/all-pass.html [ Failure ]\n')
+            new_expectations, ('Bug(foo) [ Win ] userscripts/all-pass.html [ Failure ]\n'
+                               'Bug(foo) [ Linux ] userscripts/all-pass.html [ Failure ]\n'
+                               'Bug(foo) [ Mac10.10 ] userscripts/all-pass.html [ Failure ]\n'))
         self.assertEqual(self.tool.executive.calls, [])
 
     def test_rebaseline_test_passes_unexpectedly_everywhere(self):

third_party/blink/tools/blinkpy/web_tests/lint_test_expectations.py

@@ -36,6 +36,7 @@ from blinkpy.common.host import Host
 from blinkpy.common.system.log_utils import configure_logging
 from blinkpy.web_tests.models import test_expectations
 from blinkpy.web_tests.port.factory import platform_options
+from blinkpy.web_tests.models.test_expectations import TestExpectationLine
 
 _log = logging.getLogger(__name__)
 
@@ -57,11 +58,19 @@ def lint(host, options):
         ports_to_lint[0].web_tests_dir(), 'WebGPUExpectations')
     paths = [wpt_overrides_exps_path, web_gpu_exps_path]
     expectations_dict = {}
+    all_system_specifiers = set()
+    all_build_specifiers = set(ports_to_lint[0].ALL_BUILD_TYPES)
     for path in paths:
         if host.filesystem.exists(path):
             expectations_dict[path] = host.filesystem.read_text_file(path)
+
     for port in ports_to_lint:
         expectations_dict.update(port.all_expectations_dict())
+        config_macro_dict = port.configuration_specifier_macros()
+        if config_macro_dict:
+            all_system_specifiers.update({s.lower() for s in config_macro_dict.keys()})
+            all_system_specifiers.update(
+                {s.lower() for s in reduce(lambda x, y: x + y, config_macro_dict.values())})
         for path in port.extra_expectations_files():
             if host.filesystem.exists(path):
                 expectations_dict[path] = host.filesystem.read_text_file(path)
@@ -77,7 +86,8 @@ def lint(host, options):
                 _log.error(warning)
                 failures.append('%s: %s' % (path, warning))
                 _log.error('')
-        for lineno, line in enumerate(content.split('\n'), 1):
+        exp_lines = content.split('\n')
+        for lineno, line in enumerate(exp_lines, 1):
             if line.strip().startswith('Bug('):
                 error = (("%s:%d Expectation '%s' has the Bug(...) token, "
                           "The token has been removed in the new expectations format") %
@@ -86,6 +96,23 @@ def lint(host, options):
                 failures.append(error)
                 _log.error('')
 
+        for lineno, line in enumerate(exp_lines, 1):
+            if line.strip().startswith('#') or not line.strip():
+                continue
+            exp_line = TestExpectationLine.tokenize_line(
+                host.filesystem.basename(path), line, lineno, ports_to_lint[0])
+            specifiers = set(s.lower() for s in exp_line.specifiers)
+            system_intersection = specifiers & all_system_specifiers
+            build_intersection = specifiers & all_build_specifiers
+            for intersection in [system_intersection, build_intersection]:
+                if len(intersection) < 2:
+                    continue
+                error = (("%s:%d Expectation '%s' has multiple specifiers that are mutually exclusive.\n"
+                          "The mutually exclusive specifiers are %s") %
+                         (host.filesystem.basename(path), lineno, line, ', '.join(intersection)))
+                _log.error(error)
+                _log.error('')
+                failures.append(error)
     return failures
 
 

third_party/blink/tools/blinkpy/web_tests/lint_test_expectations_unittest.py

@@ -45,6 +45,8 @@ class FakePort(object):
         self.name = name
         self.path = path
 
+    ALL_BUILD_TYPES = ('debug', 'release')
+
     def test_configuration(self):
         return None
 
@@ -62,7 +64,7 @@ class FakePort(object):
         return []
 
     def configuration_specifier_macros(self):
-        return []
+        return {}
 
     def get_option(self, _, val):
         return val

third_party/blink/tools/blinkpy/web_tests/models/test_configuration.py

@@ -116,7 +116,7 @@ class TestConfigurationConverter(object):
 
     def __init__(self, all_test_configurations, configuration_macros=None):
         self._all_test_configurations = all_test_configurations
-        self._configuration_macros = configuration_macros or {}
+        self.configuration_macros = configuration_macros or {}
         self._specifier_to_configuration_set = {}
         self._specifier_sorter = SpecifierSorter()
         self._collapsing_sets_by_size = {}
@@ -148,7 +148,7 @@ class TestConfigurationConverter(object):
         return self._specifier_sorter
 
     def _expand_macros(self, specifier):
-        expanded_specifiers = self._configuration_macros.get(specifier)
+        expanded_specifiers = self.configuration_macros.get(specifier)
         return expanded_specifiers or [specifier]
 
     def to_config_set(self, specifier_set, error_list=None):
@@ -266,9 +266,9 @@ class TestConfigurationConverter(object):
 
         # 4) Substitute specifier subsets that match macros within each set:
         #   (win7, win10, release) -> (win, release)
-        self.collapse_macros(self._configuration_macros, specifiers_list)
+        self.collapse_macros(self.configuration_macros, specifiers_list)
 
-        macro_keys = set(self._configuration_macros.keys())
+        macro_keys = set(self.configuration_macros.keys())
 
         # 5) Collapsing macros may have created combinations the can now be abbreviated.
         #   (win7, release), (linux, x86, release), (linux, x86_64, release)

third_party/blink/tools/blinkpy/web_tests/models/test_expectations.py

@@ -31,6 +31,7 @@
 from collections import defaultdict
 
 import logging
+import itertools
 import re
 
 from blinkpy.common.path_finder import PathFinder
@@ -565,15 +566,33 @@ class TestExpectationLine(object):
         if self.name is None:
             return '' if self.comment is None else '#%s' % self.comment
 
-        if test_configuration_converter and self.bugs:
+        if test_configuration_converter:
             specifiers_list = test_configuration_converter.to_specifiers_list(self.matching_configurations)
+            system_specifiers = set(
+                s.upper() for s in test_configuration_converter.configuration_macros.keys())
+            if system_specifiers:
+                system_specifiers.update(
+                    [s.upper() for s in reduce(lambda x, y: x + y, test_configuration_converter.configuration_macros.values())])
+            build_specifiers = set(s.upper() for s in TestExpectations.BUILD_TYPES)
             result = []
             for specifiers in specifiers_list:
                 # FIXME: this is silly that we join the specifiers and then immediately split them.
-                specifiers = self._serialize_parsed_specifiers(test_configuration_converter, specifiers).split()
+                specifiers = set(
+                    s.upper() for s in self._serialize_parsed_specifiers(test_configuration_converter, specifiers).split())
                 expectations = self._serialize_parsed_expectations(parsed_expectation_to_string).split()
-                result.append(self._format_line(self.bugs, specifiers, self.name, expectations, self.comment))
-            return '\n'.join(result) if result else None
+                system_intersection = system_specifiers & specifiers
+                build_intersection = build_specifiers & specifiers
+                if not system_intersection and not build_intersection:
+                    result.append(self._format_line(self.bugs, [], self.name, expectations, self.comment))
+                elif not system_intersection or not build_intersection:
+                    result.extend(
+                        [self._format_line(self.bugs, [s], self.name, expectations, self.comment)
+                         for s in system_intersection or build_intersection])
+                else:
+                    result.extend(
+                        [self._format_line(self.bugs, [sys, build], self.name, expectations, self.comment)
+                         for sys, build in itertools.product(system_intersection, build_intersection)])
+            return '\n'.join(result) or None
 
         return self._format_line(self.bugs, self.specifiers, self.name, self.expectations, self.comment,
                                  include_specifiers, include_expectations, include_comment)

third_party/blink/tools/blinkpy/web_tests/models/test_expectations_unittest.py

@@ -520,7 +520,8 @@ Bug(y) [ Win Mac Debug ] failures/expected/foo.html [ Crash ]
 
         actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', test_config)])
 
-        self.assertEqual("""Bug(x) [ Linux Win10 Release ] failures/expected/foo.html [ Failure ]
+        self.assertEqual("""Bug(x) [ Win10 Release ] failures/expected/foo.html [ Failure ]
+Bug(x) [ Linux Release ] failures/expected/foo.html [ Failure ]
 Bug(y) [ Win Mac Debug ] failures/expected/foo.html [ Crash ]
 """, actual_expectations)
 
@@ -713,7 +714,6 @@ Bug(y) [ Mac ] failures/expected/foo.html [ Crash ]
         actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', test_config)])
         actual_expectations = expectations.remove_configurations(
             [('failures/expected/foo.html', host.port_factory.get('test-win-win10', None).test_configuration())])
-
         self.assertEqual("""Bug(x) [ Win Debug ] failures/expected/foo.html [ Failure Timeout ]
 Bug(y) [ Mac ] failures/expected/foo.html [ Crash ]
 """, actual_expectations)
@@ -775,24 +775,24 @@ class TestExpectationSerializationTests(unittest.TestCase):
     def test_unparsed_to_string(self):
         expectation = TestExpectationLine()
 
-        self.assertEqual(expectation.to_string(self._converter), '')
+        self.assertEqual(expectation.to_string(), '')
         expectation.comment = ' Qux.'
-        self.assertEqual(expectation.to_string(self._converter), '# Qux.')
+        self.assertEqual(expectation.to_string(), '# Qux.')
         expectation.name = 'bar'
-        self.assertEqual(expectation.to_string(self._converter), 'bar # Qux.')
+        self.assertEqual(expectation.to_string(), 'bar # Qux.')
         expectation.specifiers = ['foo']
         # FIXME: case should be preserved here but we can't until we drop the old syntax.
-        self.assertEqual(expectation.to_string(self._converter), '[ FOO ] bar # Qux.')
+        self.assertEqual(expectation.to_string(), '[ FOO ] bar # Qux.')
         expectation.expectations = ['bAz']
-        self.assertEqual(expectation.to_string(self._converter), '[ FOO ] bar [ BAZ ] # Qux.')
+        self.assertEqual(expectation.to_string(), '[ FOO ] bar [ BAZ ] # Qux.')
         expectation.expectations = ['bAz1', 'baZ2']
-        self.assertEqual(expectation.to_string(self._converter), '[ FOO ] bar [ BAZ1 BAZ2 ] # Qux.')
+        self.assertEqual(expectation.to_string(), '[ FOO ] bar [ BAZ1 BAZ2 ] # Qux.')
         expectation.specifiers = ['foo1', 'foO2']
-        self.assertEqual(expectation.to_string(self._converter), '[ FOO1 FOO2 ] bar [ BAZ1 BAZ2 ] # Qux.')
+        self.assertEqual(expectation.to_string(), '[ FOO1 FOO2 ] bar [ BAZ1 BAZ2 ] # Qux.')
         expectation.warnings.append('Oh the horror.')
-        self.assertEqual(expectation.to_string(self._converter), '')
+        self.assertEqual(expectation.to_string(), '')
         expectation.original_string = 'Yes it is!'
-        self.assertEqual(expectation.to_string(self._converter), 'Yes it is!')
+        self.assertEqual(expectation.to_string(), 'Yes it is!')
 
     def test_unparsed_list_to_string(self):
         expectation = TestExpectationLine()

third_party/blink/tools/blinkpy/web_tests/try_flag.py

@@ -42,7 +42,8 @@ class TryFlag(object):
         self._git_cl = git_cl
         self._expectations_model = TestExpectationsModel()
         self._test_configuration_converter = TestConfigurationConverter(
-            set(BUILDER_CONFIGS.values()))
+            set(BUILDER_CONFIGS.values()),
+            self._host.port_factory.get().configuration_specifier_macros())
         self._filesystem = self._host.filesystem
         self._path_finder = PathFinder(self._filesystem)
         self._git = self._host.git()

third_party/blink/tools/blinkpy/web_tests/try_flag_unittest.py

@@ -153,7 +153,8 @@ class TryFlagTest(unittest.TestCase):
             '### 2 unexpected failures:',
             '',
             'Bug(none) something/fail-everywhere.html [ Failure ]',
-            'Bug(none) [ Linux Win ] something/fail-win-and-linux.html [ Failure ]',
+            'Bug(none) [ Win ] something/fail-win-and-linux.html [ Failure ]',
+            'Bug(none) [ Linux ] something/fail-win-and-linux.html [ Failure ]',
             ''
         ]))
 

third_party/blink/web_tests/TestExpectations

@@ -1659,7 +1659,8 @@ crbug.com/891427 virtual/prefer_compositing_to_lcd_text/scrollbars/custom-scroll
 crbug.com/891427 virtual/prefer_compositing_to_lcd_text/scrollbars/custom-scrollbar-changing-style-relayout-div-body-scrollablearea.html [ Pass Failure Timeout Crash ]
 
 # This was disabled by sheriff on Dec 31. Also failing on Win7, will need more investigation.
-crbug.com/891427 [ Mac Win7 ] virtual/mouseevent_fractional/fast/events/touch/gesture/touch-gesture-scroll-listbox.html [ Pass Failure Timeout Crash ]
+crbug.com/891427 [ Mac ] virtual/mouseevent_fractional/fast/events/touch/gesture/touch-gesture-scroll-listbox.html [ Pass Failure Timeout Crash ]
+crbug.com/891427 [ Win7 ] virtual/mouseevent_fractional/fast/events/touch/gesture/touch-gesture-scroll-listbox.html [ Pass Failure Timeout Crash ]
 
 # ====== OOPIF-mode failures until here ======
 
@@ -1713,7 +1714,7 @@ crbug.com/803276 [ Win ] inspector-protocol/memory/sampling-native-snapshot.js [
 crbug.com/567837 fast/hidpi/static [ Skip ]
 
 # For win10, see crbug.com/955109
-crbug.com/538697 [ Win Win10 ] virtual/threaded/printing/webgl-oversized-printing.html [ Failure Crash ]
+crbug.com/538697 [ Win ] virtual/threaded/printing/webgl-oversized-printing.html [ Failure Crash ]
 crbug.com/538697 [ Win ] printing/webgl-oversized-printing.html [ Failure Crash ]
 
 crbug.com/904592 css3/filters/backdrop-filter-svg.html [ Failure ]
@@ -1730,7 +1731,8 @@ crbug.com/280342 [ Mac ] virtual/audio-service/http/tests/media/progress-events-
 crbug.com/280342 [ Linux ] virtual/audio-service/http/tests/media/progress-events-generated-correctly.html [ Failure Pass ]
 crbug.com/280342 [ Win ] virtual/audio-service/http/tests/media/progress-events-generated-correctly.html [ Failure Pass ]
 
-crbug.com/520736 [ Win7 Win10 ] media/W3C/video/networkState/networkState_during_progress.html [ Failure Pass ]
+crbug.com/520736 [ Win7 ] media/W3C/video/networkState/networkState_during_progress.html [ Failure Pass ]
+crbug.com/520736 [ Win10 ] media/W3C/video/networkState/networkState_during_progress.html [ Failure Pass ]
 crbug.com/520736 [ Linux ] media/W3C/video/networkState/networkState_during_progress.html [ Failure Pass ]
 crbug.com/909095 [ Mac ] media/W3C/video/networkState/networkState_during_progress.html [ Failure Pass ]
 crbug.com/909095 virtual/audio-service/media/W3C/video/networkState/networkState_during_progress.html [ Failure Pass ]
@@ -3080,7 +3082,7 @@ crbug.com/626703 [ Win10 ] external/wpt/html/infrastructure/urls/resolving-urls/
 crbug.com/626703 [ Win7 ] external/wpt/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html [ Failure Timeout Pass ]
 crbug.com/626703 external/wpt/html/infrastructure/urls/resolving-urls/query-encoding/navigation.sub.html?encoding=windows-1252 [ Timeout ]
 crbug.com/626703 external/wpt/css/css-values/ch-unit-011.html [ Failure ]
-crbug.com/626703 [ Retina Mac ] external/wpt/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-tokenization-width-height.html [ Crash Timeout ]
+crbug.com/626703 [ Mac ] external/wpt/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-tokenization-width-height.html [ Crash Timeout ]
 crbug.com/626703 external/wpt/css/css-values/ic-unit-010.html [ Failure ]
 crbug.com/626703 external/wpt/css/css-values/ic-unit-011.html [ Failure ]
 crbug.com/626703 external/wpt/css/css-values/ic-unit-009.html [ Failure ]
@@ -4374,8 +4376,10 @@ crbug.com/747751 [ Win ] http/tests/devtools/application-panel/resources-panel-r
 crbug.com/747751 http/tests/devtools/application-panel/storage-view-reports-quota.js [ Pass Timeout ]
 
 crbug.com/689781 external/wpt/media-source/mediasource-duration.html [ Failure Pass ]
-crbug.com/689781 [ Win Mac ] http/tests/media/media-source/mediasource-duration.html [ Failure Pass ]
-crbug.com/689781 [ Win Mac ] virtual/audio-service/http/tests/media/media-source/mediasource-duration.html [ Failure Pass ]
+crbug.com/689781 [ Win ] http/tests/media/media-source/mediasource-duration.html [ Failure Pass ]
+crbug.com/689781 [ Mac ] http/tests/media/media-source/mediasource-duration.html [ Failure Pass ]
+crbug.com/689781 [ Win ] virtual/audio-service/http/tests/media/media-source/mediasource-duration.html [ Failure Pass ]
+crbug.com/689781 [ Mac ] virtual/audio-service/http/tests/media/media-source/mediasource-duration.html [ Failure Pass ]
 
 crbug.com/681468 fast/forms/suggestion-picker/date-suggestion-picker-appearance-zoom125.html [ Failure Pass ]
 crbug.com/681468 fast/forms/suggestion-picker/date-suggestion-picker-appearance-zoom200.html [ Failure Pass ]
@@ -4796,7 +4800,8 @@ crbug.com/779087 external/wpt/html/semantics/embedded-content/media-elements/aut
 
 # Does not work on Mac
 crbug.com/793771 [ Mac ] media/controls/scrubbing.html [ Skip ]
-crbug.com/793771 [ Mac Win ] virtual/audio-service/media/controls/scrubbing.html [ Skip ]
+crbug.com/793771 [ Mac ] virtual/audio-service/media/controls/scrubbing.html [ Skip ]
+crbug.com/793771 [ Win ] virtual/audio-service/media/controls/scrubbing.html [ Skip ]
 
 # Different paths may have different anti-aliasing pixels 2018-02-21
 skbug.com/7641 external/wpt/css/css-paint-api/paint2d-paths.https.html [ Failure Pass ]
@@ -5360,8 +5365,10 @@ crbug.com/936827 external/wpt/fullscreen/api/element-request-fullscreen-and-remo
 # Enable WPT animation-worklet test to run with threaded-compositing
 crbug.com/915352 virtual/threaded/external/wpt/animation-worklet/worklet-animation-pause-resume.https.html [ Pass Failure ]
 
-crbug.com/915352 [ Mac10.10 Mac10.11 ] virtual/threaded/external/wpt/animation-worklet/worklet-animation-with-scroll-timeline.https.html [ Pass Failure ]
-crbug.com/915352 [ Mac10.10 Mac10.11 ] virtual/threaded/external/wpt/animation-worklet/worklet-animation-with-scroll-timeline-and-display-none.https.html [ Pass Failure ]
+crbug.com/915352 [ Mac10.10 ] virtual/threaded/external/wpt/animation-worklet/worklet-animation-with-scroll-timeline.https.html [ Pass Failure ]
+crbug.com/915352 [ Mac10.11 ] virtual/threaded/external/wpt/animation-worklet/worklet-animation-with-scroll-timeline.https.html [ Pass Failure ]
+crbug.com/915352 [ Mac10.10 ] virtual/threaded/external/wpt/animation-worklet/worklet-animation-with-scroll-timeline-and-display-none.https.html [ Pass Failure ]
+crbug.com/915352 [ Mac10.11 ] virtual/threaded/external/wpt/animation-worklet/worklet-animation-with-scroll-timeline-and-display-none.https.html [ Pass Failure ]
 
 # Sheriff 2019-03-01
 crbug.com/937416 http/tests/devtools/resource-tree/resource-tree-htmlimports.js [ Pass Failure ]
@@ -5375,7 +5382,8 @@ crbug.com/935689 external/wpt/css/vendor-imports/mozilla/mozilla-central-reftest
 
 # Sheriff 2019-03-05
 crbug.com/938200 http/tests/devtools/network/network-blocked-reason.js [ Timeout Pass ]
-crbug.com/938780 [ Mac10.10 Mac10.11 ] virtual/threaded/external/wpt/animation-worklet/worklet-animation-with-scroll-timeline-root-scroller.https.html [ Pass Failure ]
+crbug.com/938780 [ Mac10.10 ] virtual/threaded/external/wpt/animation-worklet/worklet-animation-with-scroll-timeline-root-scroller.https.html [ Pass Failure ]
+crbug.com/938780 [ Mac10.11 ] virtual/threaded/external/wpt/animation-worklet/worklet-animation-with-scroll-timeline-root-scroller.https.html [ Pass Failure ]
 
 # Caused a revert of a good change.
 crbug.com/931533 media/video-played-collapse.html [ Pass Failure ]
@@ -5389,7 +5397,8 @@ crbug.com/836242 [ Linux ] fast/loader/reload-zero-byte-plugin.html [ Pass Failu
 crbug.com/836242 [ Mac ] fast/loader/reload-zero-byte-plugin.html [ Pass Failure ]
 crbug.com/836242 [ Win ] fast/loader/reload-zero-byte-plugin.html [ Pass Failure ]
 crbug.com/806357 virtual/threaded/fast/events/pointerevents/pinch/pointerevent_touch-action-pinch_zoom_touch.html [ Pass Failure Crash ]
-crbug.com/941931 [ Linux Win ] http/tests/security/contentSecurityPolicy/1.1/plugintypes-affects-cross-site-child-disallowed.html [ Pass Failure ]
+crbug.com/941931 [ Linux ] http/tests/security/contentSecurityPolicy/1.1/plugintypes-affects-cross-site-child-disallowed.html [ Pass Failure ]
+crbug.com/941931 [ Win ] http/tests/security/contentSecurityPolicy/1.1/plugintypes-affects-cross-site-child-disallowed.html [ Pass Failure ]
 crbug.com/942134 [ Win ] virtual/exotic-color-space/images/feature-policy-oversized-images.html [ Pass Failure ]
 
 # Sheriff 2019-03-15
@@ -5400,7 +5409,8 @@ crbug.com/943388 [ Win ] http/tests/devtools/network/network-recording-after-rel
 # Sheriff 2019-03-20
 crbug.com/732103 [ Mac10.11 ] http/tests/shapedetection/shapedetection-cross-origin.html [ Timeout Pass ]
 crbug.com/943969 [ Win ] inspector-protocol/css/css-get-media-queries.js [ Pass Failure ]
-crbug.com/943969 [ Mac10.10 Mac10.11 ] inspector-protocol/css/css-get-media-queries.js [ Pass Failure ]
+crbug.com/943969 [ Mac10.10 ] inspector-protocol/css/css-get-media-queries.js [ Pass Failure ]
+crbug.com/943969 [ Mac10.11 ] inspector-protocol/css/css-get-media-queries.js [ Pass Failure ]
 
 crbug.com/945085 [ Mac10.13 ] printing/composited-thead-tfoot-repeat.html [ Failure Pass ]
 
@@ -5436,7 +5446,8 @@ crbug.com/919789 images/image-zoom-to-25.html [ Pass Timeout ]
 crbug.com/919789 images/image-zoom-to-500.html [ Pass Timeout ]
 crbug.com/919789 media/controls/overflow-menu-hide-on-resize.html [ Pass Timeout ]
 crbug.com/919789 virtual/audio-service/media/controls/overflow-menu-hide-on-resize.html [ Pass Timeout ]
-crbug.com/919789 [ Linux Mac10.13 ] paint/invalidation/resize-iframe-text.html [ Pass Timeout ]
+crbug.com/919789 [ Linux ] paint/invalidation/resize-iframe-text.html [ Pass Timeout ]
+crbug.com/919789 [ Mac10.13 ] paint/invalidation/resize-iframe-text.html [ Pass Timeout ]
 crbug.com/919789 paint/invalidation/scroll/scrollbar-damage-and-full-viewport-repaint.html [ Pass Timeout ]
 crbug.com/919789 paint/invalidation/window-resize/ [ Pass Timeout ]
 
@@ -5466,7 +5477,8 @@ crbug.com/949167 external/wpt/html/semantics/links/links-created-by-a-and-area-e
 crbug.com/949207 external/wpt/html/semantics/links/links-created-by-a-and-area-elements/target_blank_implicit_noopener_base.html [ Pass Timeout ]
 
 # Sheriff 2019-04-09
-crbug.com/946335 [ Linux Mac ] fast/filesystem/file-writer-abort-depth.html [ Pass Crash ]
+crbug.com/946335 [ Linux ] fast/filesystem/file-writer-abort-depth.html [ Pass Crash ]
+crbug.com/946335 [ Mac ] fast/filesystem/file-writer-abort-depth.html [ Pass Crash ]
 
 # Sheriff 2019-04-11
 crbug.com/802029 [ Mac10.13 Debug ] fast/dom/shadow/focus-controller-recursion-crash.html [ Pass Timeout ]
@@ -5493,7 +5505,8 @@ crbug.com/953591 [ Win ] transforms/matrix-02.html [ Pass Failure ]
 crbug.com/938884 http/tests/devtools/elements/styles-3/styles-add-blank-property.js [ Timeout Pass ]
 
 # Sheriff 2019-04-18
-crbug.com/954297 [ Linux Win ] http/tests/devtools/oopif/oopif-presentation-console-messages.js [ Pass Crash Timeout ]
+crbug.com/954297 [ Linux ] http/tests/devtools/oopif/oopif-presentation-console-messages.js [ Pass Crash Timeout ]
+crbug.com/954297 [ Win ] http/tests/devtools/oopif/oopif-presentation-console-messages.js [ Pass Crash Timeout ]
 
 # Sheriff 2019-04-22
 crbug.com/954319 [ Linux ] http/tests/devtools/sources/debugger-breakpoints/breakpoints-ui-in-multiple-workers.js [ Pass Timeout ]
@@ -5503,7 +5516,8 @@ crbug.com/954998 [ Mac ] http/tests/devtools/tracing/timeline-js/timeline-js-lin
 crbug.com/956736 virtual/gpu-rasterization/images/imagemap-focus-ring-outline-color-not-inherited-from-map.html [ Pass Failure ]
 
 # Sheriff 2019-04-30
-crbug.com/946534 [ Mac10.10 Mac10.11 ] external/wpt/animation-worklet/worklet-animation-with-scroll-timeline-root-scroller.https.html [ Pass Failure ]
+crbug.com/946534 [ Mac10.10 ] external/wpt/animation-worklet/worklet-animation-with-scroll-timeline-root-scroller.https.html [ Pass Failure ]
+crbug.com/946534 [ Mac10.11 ] external/wpt/animation-worklet/worklet-animation-with-scroll-timeline-root-scroller.https.html [ Pass Failure ]
 crbug.com/948785 [ Debug ] fast/events/pointerevents/pointer-event-consumed-touchstart-in-slop-region.html [ Pass Failure ]
 crbug.com/948785 [ Debug ] virtual/mouseevent_fractional/fast/events/pointerevents/pointer-event-consumed-touchstart-in-slop-region.html [ Pass Failure ]
 
@@ -5520,7 +5534,8 @@ crbug.com/959002 crbug.com/959042 http/tests/devtools/elements/styles-4/styles-k
 crbug.com/959002 crbug.com/959042 http/tests/devtools/elements/styles-4/undo-add-new-rule.js [ Pass Timeout ]
 
 # Sheriff 2019-05-07
-crbug.com/960443 [ Mac10.10 Mac10.11 ] external/wpt/animation-worklet/worklet-animation-with-scroll-timeline.https.html [ Failure Pass ]
+crbug.com/960443 [ Mac10.10 ] external/wpt/animation-worklet/worklet-animation-with-scroll-timeline.https.html [ Failure Pass ]
+crbug.com/960443 [ Mac10.11 ] external/wpt/animation-worklet/worklet-animation-with-scroll-timeline.https.html [ Failure Pass ]
 
 # Sheriff 2019-05-10
 crbug.com/960623 [ Win ] http/tests/misc/resource-timing-sizes-multipart.html [ Pass Failure ]
@@ -5543,13 +5558,17 @@ crbug.com/937170 external/wpt/IndexedDB/interleaved-cursors-large.html [ Pass Ti
 crbug.com/937991 [ Win7 Release ] http/tests/devtools/cache-storage/cache-data.js [ Pass Timeout ]
 
 # These video tests seem to take a screenshot too early.
-crbug.com/963141 [ Mac Win ] media/video-object-fit.html [ Pass Failure ]
+crbug.com/963141 [ Mac ] media/video-object-fit.html [ Pass Failure ]
+crbug.com/963141 [ Win ] media/video-object-fit.html [ Pass Failure ]
 crbug.com/963141 media/video-object-fit-change.html [ Pass Failure ]
-crbug.com/963141 [ Mac Win ] media/controls/video-overlay-cast-light-rendering.html [ Pass Failure ]
+crbug.com/963141 [ Mac ] media/controls/video-overlay-cast-light-rendering.html [ Pass Failure ]
+crbug.com/963141 [ Win ] media/controls/video-overlay-cast-light-rendering.html [ Pass Failure ]
 crbug.com/963141 [ Mac ] media/video-aspect-ratio.html [ Pass Failure ]
-crbug.com/963141 [ Mac Win ] virtual/audio-service/media/video-object-fit.html [ Pass Failure ]
+crbug.com/963141 [ Mac ] virtual/audio-service/media/video-object-fit.html [ Pass Failure ]
+crbug.com/963141 [ Win ] virtual/audio-service/media/video-object-fit.html [ Pass Failure ]
 crbug.com/963141 virtual/audio-service/media/video-object-fit-change.html [ Pass Failure ]
-crbug.com/963141 [ Mac Win ] virtual/audio-service/media/controls/video-overlay-cast-light-rendering.html [ Pass Failure ]
+crbug.com/963141 [ Mac ] virtual/audio-service/media/controls/video-overlay-cast-light-rendering.html [ Pass Failure ]
+crbug.com/963141 [ Win ] virtual/audio-service/media/controls/video-overlay-cast-light-rendering.html [ Pass Failure ]
 crbug.com/963141 [ Mac ] virtual/audio-service/media/video-aspect-ratio.html [ Pass Failure ]
 
 # Sheriff 2019-05-16
@@ -5633,11 +5652,14 @@ crbug.com/979323 [ Mac ] media/track/track-cue-rendering-position-auto-rtl.html
 crbug.com/979336 [ Mac ] fast/dynamic/anonymous-block-orphaned-lines.html [ Pass Failure ]
 
 # Sheriff 2019-06-28
-crbug.com/979593 [ Linux Win ] external/wpt/service-workers/service-worker/registration-schedule-job.https.html [ Pass Failure ]
-crbug.com/979593 [ Linux Win ] virtual/omt-worker-fetch/external/wpt/service-workers/service-worker/registration-schedule-job.https.html [ Pass Failure ]
+crbug.com/979593 [ Linux ] external/wpt/service-workers/service-worker/registration-schedule-job.https.html [ Pass Failure ]
+crbug.com/979593 [ Win ] external/wpt/service-workers/service-worker/registration-schedule-job.https.html [ Pass Failure ]
+crbug.com/979593 [ Linux ] virtual/omt-worker-fetch/external/wpt/service-workers/service-worker/registration-schedule-job.https.html [ Pass Failure ]
+crbug.com/979593 [ Win ] virtual/omt-worker-fetch/external/wpt/service-workers/service-worker/registration-schedule-job.https.html [ Pass Failure ]
 
 # Sheriff 2019-07-03
-crbug.com/979490 [ Linux Win ] virtual/omt-worker-fetch/external/wpt/workers/modules/dedicated-worker-import-referrer.html [ Pass Timeout ]
+crbug.com/979490 [ Linux ] virtual/omt-worker-fetch/external/wpt/workers/modules/dedicated-worker-import-referrer.html [ Pass Timeout ]
+crbug.com/979490 [ Win ] virtual/omt-worker-fetch/external/wpt/workers/modules/dedicated-worker-import-referrer.html [ Pass Timeout ]
 
 # Sheriff 2019-07-04
 crbug.com/981267 [ Linux ] http/tests/devtools/persistence/persistence-move-breakpoints-on-reload.js [ Pass Failure ]
@@ -5660,7 +5682,8 @@ crbug.com/985232 [ Win7 ] virtual/streaming-preload/external/wpt/html/semantics/
 # Sheriff 2019-07-19
 crbug.com/985811 [ Win ] http/tests/devtools/elements/edit/edit-dom-actions-1.js [ Pass Timeout ]
 crbug.com/985811 [ Win ] http/tests/devtools/elements/edit/edit-dom-actions-2.js [ Pass Timeout ]
-crbug.com/985869 [ Linux Win7 ] http/tests/security/contentSecurityPolicy/object-src-no-url-allowed.html [ Pass Failure ]
+crbug.com/985869 [ Linux ] http/tests/security/contentSecurityPolicy/object-src-no-url-allowed.html [ Pass Failure ]
+crbug.com/985869 [ Win7 ] http/tests/security/contentSecurityPolicy/object-src-no-url-allowed.html [ Pass Failure ]
 
 # ecosystem-infra sheriff 2019-07-22
 crbug.com/986477 [ Win ] external/wpt/cookies/path/match.html [ Pass Timeout ]
@@ -5669,8 +5692,10 @@ crbug.com/987269 [ Linux ] virtual/audio-service/http/tests/media/autoplay/docum
 crbug.com/987269 [ Linux ] virtual/audio-service/http/tests/media/autoplay/document-user-activation-cross-origin-feature-policy-header.html [ Pass Failure ]
 # Sheriff 2019-07-24
 crbug.com/986282 external/wpt/client-hints/accept-ch-lifetime.tentative.https.html [ Pass Failure ]
-crbug.com/987138 [ Linux Win ] media/controls/doubletap-to-jump-forwards.html [ Pass Timeout ]
-crbug.com/987138 [ Linux Win ] virtual/audio-service/media/controls/doubletap-to-jump-forwards.html [ Pass Timeout ]
+crbug.com/987138 [ Linux ] media/controls/doubletap-to-jump-forwards.html [ Pass Timeout ]
+crbug.com/987138 [ Win ] media/controls/doubletap-to-jump-forwards.html [ Pass Timeout ]
+crbug.com/987138 [ Linux ] virtual/audio-service/media/controls/doubletap-to-jump-forwards.html [ Pass Timeout ]
+crbug.com/987138 [ Win ] virtual/audio-service/media/controls/doubletap-to-jump-forwards.html [ Pass Timeout ]
 
 # Sheriff 2019-07-26
 crbug.com/835943 [ Debug ] http/tests/appcache/non-html.xhtml [ Crash Pass ]
@@ -5699,7 +5724,8 @@ crbug.com/705583 external/wpt/html/semantics/embedded-content/the-iframe-element
 crbug.com/705583 external/wpt/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_history_go_forward.html [ Skip ]
 
 # Sheriff 2019-07-30
-crbug.com/987115 [ Win Linux ] virtual/threaded-prefer-compositing/fast/scrolling/scrollbars/scrollbar-button-gesture-target.html [ Crash Pass Failure ]
+crbug.com/987115 [ Win ] virtual/threaded-prefer-compositing/fast/scrolling/scrollbars/scrollbar-button-gesture-target.html [ Crash Pass Failure ]
+crbug.com/987115 [ Linux ] virtual/threaded-prefer-compositing/fast/scrolling/scrollbars/scrollbar-button-gesture-target.html [ Crash Pass Failure ]
 
 # Sheriff 2019-07-31
 crbug.com/979422 [ Mac ] fast/borders/border-radius-mask-canvas-with-shadow.html [ Failure ]
@@ -5709,7 +5735,8 @@ crbug.com/979422 [ Mac ] fast/borders/border-radius-mask-canvas.html [ Failure ]
 crbug.com/979422 [ Mac ] fast/borders/border-radius-mask-canvas-with-mask.html [ Failure ]
 crbug.com/979422 [ Mac ] fast/borders/border-radius-mask-canvas-border.html [ Failure ]
 crbug.com/989014 [ Linux Debug ] external/wpt/cookie-store/serviceworker_cookiechange_eventhandler_single_subscription.tentative.https.any.serviceworker.html [ Pass Timeout ]
-crbug.com/989665 [ Win Linux ] virtual/omt-worker-fetch/external/wpt/resource-timing/resource_timing_buffer_full_eventually.html [ Pass Timeout ]
+crbug.com/989665 [ Win ] virtual/omt-worker-fetch/external/wpt/resource-timing/resource_timing_buffer_full_eventually.html [ Pass Timeout ]
+crbug.com/989665 [ Linux ] virtual/omt-worker-fetch/external/wpt/resource-timing/resource_timing_buffer_full_eventually.html [ Pass Timeout ]
 
 # Sheriff 2019-08-01
 crbug.com/989860 [ Mac10.13 ] http/tests/devtools/indexeddb/live-update-indexeddb-list.js [ Pass Failure ]
@@ -5733,7 +5760,8 @@ crbug.com/993671 [ Win ] virtual/audio-service/http/tests/media/video-frame-size
 crbug.com/783154 [ Linux Debug ] virtual/audio-service/media/controls/doubletap-to-jump-backwards.html [ Failure ]
 
 #Sherrif 2019-08-16
-crbug.com/994692 [ Linux Win ] compositing/reflections/nested-reflection-anchor-point.html [ Pass Failure ]
+crbug.com/994692 [ Linux ] compositing/reflections/nested-reflection-anchor-point.html [ Pass Failure ]
+crbug.com/994692 [ Win ] compositing/reflections/nested-reflection-anchor-point.html [ Pass Failure ]
 
 crbug.com/1003943 external/wpt/element-timing/multi-redirect-image.html [ Failure ]
 crbug.com/1003943 virtual/scalefactor200/external/wpt/element-timing/multi-redirect-image.html [ Failure ]
@@ -5743,12 +5771,14 @@ crbug.com/1003943 virtual/scalefactor200withoutzoom/external/wpt/element-timing/
 crbug.com/979298 [ Mac ] media/controls/captions-menu-always-visible.html [ Pass Failure ]
 crbug.com/979298 [ Mac ] media/controls/overflow-menu-always-visible.html [ Pass Failure ]
 crbug.com/979298 [ Mac ] media/controls/volumechange-muted-attribute.html [ Pass Failure ]
-crbug.com/988248 [ Mac Linux ] media/video-persistence.html [ Pass Failure ]
+crbug.com/988248 [ Mac ] media/video-persistence.html [ Pass Failure ]
+crbug.com/988248 [ Linux ] media/video-persistence.html [ Pass Failure ]
 crbug.com/979298 [ Mac ] media/video-zoom.html [ Pass Failure ]
 crbug.com/979298 [ Mac ] virtual/audio-service/media/controls/captions-menu-always-visible.html [ Pass Failure ]
 crbug.com/979298 [ Mac ] virtual/audio-service/media/controls/overflow-menu-always-visible.html [ Pass Failure ]
 crbug.com/979298 [ Mac ] virtual/audio-service/media/controls/volumechange-muted-attribute.html [ Pass Failure ]
-crbug.com/988248 [ Mac Linux ] virtual/audio-service/media/video-persistence.html [ Pass Failure ]
+crbug.com/988248 [ Mac ] virtual/audio-service/media/video-persistence.html [ Pass Failure ]
+crbug.com/988248 [ Linux ] virtual/audio-service/media/video-persistence.html [ Pass Failure ]
 crbug.com/979298 [ Mac ] virtual/audio-service/media/video-zoom.html [ Pass Failure ]
 
 crbug.com/996219 [ Win ] virtual/text-antialias/emoji-vertical-origin-visual.html [ Failure ]
@@ -5756,9 +5786,12 @@ crbug.com/996219 [ Win ] virtual/text-antialias/emoji-vertical-origin-visual.htm
 crbug.com/996597 [ Win ] css2.1/t0905-c5525-flthw-00-c-g.html [ Failure ]
 
 # Sheriff 2019-08-22
-crbug.com/994008 [ Linux Win ] http/tests/devtools/elements/styles-3/styles-computed-trace.js [ Pass Failure ]
-crbug.com/994034 [ Linux Win ] http/tests/devtools/elements/styles-3/styles-add-new-rule-colon.js [ Pass Failure ]
-crbug.com/994027 [ Linux Win ] http/tests/devtools/elements/styles-2/force-pseudo-state.js [ Pass Failure ]
+crbug.com/994008 [ Linux ] http/tests/devtools/elements/styles-3/styles-computed-trace.js [ Pass Failure ]
+crbug.com/994008 [ Win ] http/tests/devtools/elements/styles-3/styles-computed-trace.js [ Pass Failure ]
+crbug.com/994034 [ Linux ] http/tests/devtools/elements/styles-3/styles-add-new-rule-colon.js [ Pass Failure ]
+crbug.com/994034 [ Win ] http/tests/devtools/elements/styles-3/styles-add-new-rule-colon.js [ Pass Failure ]
+crbug.com/994027 [ Linux ] http/tests/devtools/elements/styles-2/force-pseudo-state.js [ Pass Failure ]
+crbug.com/994027 [ Win ] http/tests/devtools/elements/styles-2/force-pseudo-state.js [ Pass Failure ]
 crbug.com/995142 crbug.com/900706 [ Mac ] virtual/gpu/fast/canvas/pixelated-canvas.html [ Pass Failure ]
 crbug.com/995142 crbug.com/900706 [ Mac ] virtual/gpu/fast/canvas/pixelated-resize.html [ Pass Failure ]
 crbug.com/995142 crbug.com/900706 [ Mac ] virtual/gpu/fast/canvas/pixelated.html [ Pass Failure ]
@@ -5799,7 +5832,8 @@ crbug.com/1000051 media/controls/volume-slider.html [ Failure Timeout Pass ]
 crbug.com/1000051 virtual/audio-service/media/controls/volume-slider.html [ Failure Timeout Pass ]
 
 # Sheriff 2019-09-03
-crbug.com/999799 [ Mac Linux ] external/wpt/html/rendering/dimension-attributes.html [ Pass Timeout ]
+crbug.com/999799 [ Mac ] external/wpt/html/rendering/dimension-attributes.html [ Pass Timeout ]
+crbug.com/999799 [ Linux ] external/wpt/html/rendering/dimension-attributes.html [ Pass Timeout ]
 
 # Sheriff 2019-09-04
 crbug.com/1000336 [ Linux ] http/tests/devtools/a11y-axe-core/audits-start-view-a11y-test.js [ Pass Failure ]
@@ -5865,7 +5899,8 @@ crbug.com/1010032 [ Win7 ] fast/writing-mode/Kusa-Makura-background-canvas.html
 crbug.com/1010170 [ Mac ] media/video-played-reset.html [ Failure ]
 
 # Sheriff 2019-10-02
-crbug.com/1010472 [ Linux Mac Debug ] fast/canvas/color-space/canvas-drawImage-offscreenCanvas.html [ Timeout Pass ]
+crbug.com/1010472 [ Linux Debug ] fast/canvas/color-space/canvas-drawImage-offscreenCanvas.html [ Timeout Pass ]
+crbug.com/1010472 [ Mac Debug ] fast/canvas/color-space/canvas-drawImage-offscreenCanvas.html [ Timeout Pass ]
 crbug.com/1010483 [ Win ] fast/parser/residual-style-dom.html [ Crash Pass ]
 crbug.com/1010483 [ Win ] fast/parser/residual-style-hang.html [ Crash Pass ]
 crbug.com/1010483 [ Win ] fast/selectors/specificity-overflow.html [ Crash Pass ]
@@ -5874,7 +5909,8 @@ crbug.com/1010483 [ Win ] fast/selectors/specificity-overflow.html [ Crash Pass
 crbug.com/1012599 external/wpt/fetch/cross-origin-resource-policy/fetch.https.any.sharedworker.html [ Pass Timeout ]
 crbug.com/1013391 http/tests/devtools/a11y-axe-core/settings/shortcuts-a11y-test.js [ Pass Timeout ]
 crbug.com/1013523 [ Release ] virtual/cross-origin-isolation/external/wpt/html/cross-origin-embedder-policy/require-corp.https.html [ Failure Pass ]
-crbug.com/1013523 [ Release Linux Mac ] external/wpt/html/cross-origin-embedder-policy/require-corp.https.html [ Failure Pass ]
+crbug.com/1013523 [ Release Linux ] external/wpt/html/cross-origin-embedder-policy/require-corp.https.html [ Failure Pass ]
+crbug.com/1013523 [ Release Mac ] external/wpt/html/cross-origin-embedder-policy/require-corp.https.html [ Failure Pass ]
 crbug.com/1013779 virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance.html [ Failure Pass ]
 crbug.com/1013779 [ Mac ] virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance.html [ Failure Pass ]
 crbug.com/1013779 virtual/scalefactor200/fast/hidpi/static/pointerevents/pointerevent_touch-adjustment_click_target.html [ Failure Pass ]
@@ -5897,8 +5933,10 @@ crbug.com/1015975 media/video-currentTime.html [ Pass Failure ]
 crbug.com/1015975 virtual/audio-service/media/video-currentTime.html [ Pass Failure ]
 
 # Sheriff 2019-10-21
-crbug.com/1016364 [ Linux Mac Debug ] http/tests/devtools/console/console-search.js [ Pass Timeout ]
-crbug.com/1016457 [ Linux Mac Debug ] external/wpt/dom/ranges/Range-mutations-dataChange.html [ Pass Timeout ]
+crbug.com/1016364 [ Linux Debug ] http/tests/devtools/console/console-search.js [ Pass Timeout ]
+crbug.com/1016364 [ Mac Debug ] http/tests/devtools/console/console-search.js [ Pass Timeout ]
+crbug.com/1016457 [ Linux Debug ] external/wpt/dom/ranges/Range-mutations-dataChange.html [ Pass Timeout ]
+crbug.com/1016457 [ Mac Debug ] external/wpt/dom/ranges/Range-mutations-dataChange.html [ Pass Timeout ]
 
 # ecosystem-infra sheriff 2019-10-22
 crbug.com/1016762 external/wpt/html/cross-origin-opener-policy/popup-redirect-cache.https.html [ Pass Failure ]
@@ -5975,7 +6013,8 @@ crbug.com/1027287 css3/filters/effect-reference-image-lazy-attach.html [ Pass Fa
 crbug.com/1028482 http/tests/devtools/sources/debugger/navigator-view.js [ Pass Crash ]
 crbug.com/1028684 inspector-protocol/animation/animation-release.js [ Pass Failure ]
 crbug.com/1015187 virtual/cross-origin-isolation/external/wpt/html/cross-origin-embedder-policy/none.https.html [ Pass Failure ]
-crbug.com/1015187 [ Linux Mac ] external/wpt/html/cross-origin-embedder-policy/none.https.html [ Pass Failure Timeout ]
+crbug.com/1015187 [ Linux ] external/wpt/html/cross-origin-embedder-policy/none.https.html [ Pass Failure Timeout ]
+crbug.com/1015187 [ Mac ] external/wpt/html/cross-origin-embedder-policy/none.https.html [ Pass Failure Timeout ]
 
 # Sheriff 2019-11-29
 crbug.com/1019079 virtual/gpu/fast/canvas/OffscreenCanvas-placeholder-createImageBitmap.html [ Pass Failure ]
@@ -5987,7 +6026,8 @@ crbug.com/1027434 virtual/not-site-per-process/external/wpt/html/browsers/origin
 # Sheriff 2019-12-02
 crbug.com/1029713 external/wpt/cookie-store/cookieStoreManager_getSubscriptions_multiple.tentative.https.any.html [ Pass Failure ]
 crbug.com/1029528 [ Linux ] http/tests/devtools/network/oopif-content.js [ Pass Failure ]
-crbug.com/1028477 [ Mac Win ] http/tests/devtools/appcache/appcache-manifest-with-non-existing-file.js [ Pass Timeout ]
+crbug.com/1028477 [ Mac ] http/tests/devtools/appcache/appcache-manifest-with-non-existing-file.js [ Pass Timeout ]
+crbug.com/1028477 [ Win ] http/tests/devtools/appcache/appcache-manifest-with-non-existing-file.js [ Pass Timeout ]
 
 crbug.com/833100 [ Mac ] external/wpt/battery-status/battery-full-manual.https.html [ Pass Failure ]