Fix transformfeedback suppressions on Sierra.

It turns out "mac" and "sierra" in the same expectation means all
macOS, not just Sierra.

Tbr: kainino@chromium.org
Bug: 526748
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I26b9849ba342fd058b5568739034c754ab75c842
Reviewed-on: https://chromium-review.googlesource.com/1012518Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550752}

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

@@ -688,75 +688,75 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     #     ['mac', 'amd'], bug=735483)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'array_interleaved_lines.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'array_interleaved_points.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'array_interleaved_triangles.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'array_separate_lines.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'array_separate_points.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'array_separate_triangles.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'basic_types_interleaved_lines.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'basic_types_interleaved_points.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'basic_types_interleaved_triangles.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'basic_types_separate_lines.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'basic_types_separate_points.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'basic_types_separate_triangles.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'interpolation_centroid.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'interpolation_flat.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'interpolation_smooth.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'point_size.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'position.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'random_interleaved_lines.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'random_interleaved_points.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'random_interleaved_triangles.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'random_separate_lines.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'random_separate_points.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/' +
         'random_separate_triangles.html',
-        ['mac', 'amd', 'sierra'], bug=483282)
+        ['sierra', 'amd'], bug=483282)
     self.Fail('conformance2/transform_feedback/too-small-buffers.html',
-        ['mac', 'amd', 'sierra', 'no_angle'], bug=818383)
+        ['sierra', 'amd', 'no_angle'], bug=818383)
 
     self.Flaky('deqp/functional/gles3/shaderindexing/mat_00.html',
         ['mac', 'amd'], bug=751254)