Suppress Linux AMD and Intel WebGL2 CTS failures

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

Index: content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
diff --git a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
index 3351d308921236a65909504bf05272370caa6166..3111fbd0b60ea049f689b24ac51d250c71394b61 100644
--- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
@@ -828,26 +828,15 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         'vector-dynamic-indexing-swizzled-lvalue.html',
         ['linux', 'intel'], bug=709874)
 
-    self.Fail('deqp/functional/gles3/texturefiltering/3d_formats_04.html',
-        ['linux', 'intel'], bug=715881)
-    self.Fail('deqp/functional/gles3/texturefiltering/3d_formats_05.html',
-        ['linux', 'intel'], bug=715881)
-    self.Fail('deqp/functional/gles3/texturefiltering/3d_formats_08.html',
-        ['linux', 'intel'], bug=715881)
-    self.Fail('deqp/functional/gles3/texturefiltering/3d_formats_09.html',
-        ['linux', 'intel'], bug=715881)
-
     # Intermittently running out of memory.
-    self.Flaky('deqp/functional/gles3/texturefiltering/3d_sizes_00.html',
-        ['linux', 'intel'], bug=717023)
-    self.Flaky('deqp/functional/gles3/texturefiltering/3d_sizes_01.html',
-        ['linux', 'intel'], bug=717023)
-    self.Flaky('deqp/functional/gles3/texturefiltering/3d_sizes_02.html',
-        ['linux', 'intel'], bug=717023)
-    self.Flaky('deqp/functional/gles3/texturefiltering/3d_sizes_03.html',
-        ['linux', 'intel'], bug=717023)
-    self.Flaky('deqp/functional/gles3/texturefiltering/3d_sizes_04.html',
-        ['linux', 'intel'], bug=717023)
+    self.Flaky('deqp/functional/gles3/texturefiltering/*',
+        ['linux', 'intel'], bug=725664)
+    self.Flaky('deqp/functional/gles3/textureformat/*',
+        ['linux', 'intel'], bug=725664)
+    self.Flaky('deqp/functional/gles3/textureshadow/*',
+        ['linux', 'intel'], bug=725664)
+    self.Flaky('deqp/functional/gles3/texturespecification/*',
+        ['linux', 'intel'], bug=725664)
 
     # Linux AMD only.
     # It looks like AMD shader compiler rejects many valid ES3 semantics.
@@ -1105,8 +1094,14 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         'tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html',
         ['linux', ('amd', 0x6613)], bug=701138)
     self.Fail('conformance2/textures/image_data/' +
+        'tex-3d-rgb565-rgb-unsigned_byte.html',
+        ['linux', ('amd', 0x6613)], bug=701138)
+    self.Fail('conformance2/textures/image_data/' +
         'tex-3d-rgb565-rgb-unsigned_short_5_6_5.html',
-        ['linux', ('amd', 0x6613)], bug=725556)
+        ['linux', ('amd', 0x6613)], bug=701138)
+    self.Fail('conformance2/textures/image_data/' +
+        'tex-3d-rgb5_a1-rgba-unsigned_byte.html',
+        ['linux', ('amd', 0x6613)], bug=701138)
 
     # Conflicting expectations to test that the
     # "Expectations have no collisions" unittest works.