Improve CopyTex{Sub}Image2D format validation.

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 8cb8a90fbdc3dfcb101b0556ff63fe4f20317c04..1aa6e660d7ff552f28844dd92df3176543942888 100644
--- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
@@ -82,49 +82,48 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     # destination formats, see https://github.com/KhronosGroup/WebGL/issues/1628
     self.Fail('conformance2/textures/webgl_canvas/' +
         'tex-2d-rgb565-rgb-unsigned_byte.html',
-        ['d3d9', 'd3d11', 'opengl'], bug=483282)
+        bug=483282)
     self.Fail('conformance2/textures/webgl_canvas/' +
         'tex-2d-rgb565-rgb-unsigned_short_5_6_5.html',
-        ['d3d9', 'd3d11', 'opengl'], bug=483282)
+        bug=483282)
     self.Fail('conformance2/textures/webgl_canvas/' +
         'tex-2d-rgb5_a1-rgba-unsigned_byte.html',
-        ['d3d9', 'd3d11', 'opengl'], bug=483282)
+        bug=483282)
     self.Fail('conformance2/textures/webgl_canvas/' +
         'tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html',
-        ['d3d9', 'd3d11', 'opengl'], bug=483282)
+        bug=483282)
     self.Fail('conformance2/textures/webgl_canvas/' +
         'tex-2d-rgba4-rgba-unsigned_byte.html',
-        ['d3d9', 'd3d11', 'opengl'], bug=483282)
+        bug=483282)
     self.Fail('conformance2/textures/webgl_canvas/' +
         'tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html',
-        ['d3d9', 'd3d11', 'opengl'], bug=483282)
-
-    # Windows only.
-
-    self.Fail('deqp/functional/gles3/vertexarrays.html',
-        ['win'], bug=483282)
-
-    self.Fail('deqp/functional/gles3/texturespecification/' +
-        'basic_copyteximage2d.html',
-        ['win'], bug=483282)
-
+        bug=483282)
     self.Fail('conformance2/textures/canvas/' +
         'tex-2d-rgb565-rgb-unsigned_byte.html',
-        ['win'], bug=483282)

[Corentin Wallez, 2016/06/02 21:29:40]

likewise from Windows only to general.

[Zhenyao Mo, 2016/06/03 18:29:48]

I actually did that :)

+        bug=483282)
     self.Fail('conformance2/textures/canvas/' +
         'tex-2d-rgb565-rgb-unsigned_short_5_6_5.html',
-        ['win'], bug=483282)
+        bug=483282)
     self.Fail('conformance2/textures/canvas/' +
         'tex-2d-rgb5_a1-rgba-unsigned_byte.html',
-        ['win'], bug=483282)
+        bug=483282)
     self.Fail('conformance2/textures/canvas/' +
         'tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html',
-        ['win'], bug=483282)
+        bug=483282)
     self.Fail('conformance2/textures/canvas/' +
         'tex-2d-rgba4-rgba-unsigned_byte.html',
-        ['win'], bug=483282)
+        bug=483282)
     self.Fail('conformance2/textures/canvas/' +
         'tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html',
+        bug=483282)
+
+    # Windows only.
+
+    self.Fail('deqp/functional/gles3/vertexarrays.html',
+        ['win'], bug=483282)
+
+    self.Fail('deqp/functional/gles3/texturespecification/' +
+        'basic_copyteximage2d.html',
         ['win'], bug=483282)
 
     self.Flaky('deqp/functional/gles3/buffercopy.html', ['win'], bug=587601)