Run WebGL 1.0 tests as part of the WebGL 2.0 conformance suite.

content/test/gpu/gpu_tests/webgl_conformance_expectations.py

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 import os
 
 from gpu_tests.gpu_test_expectations import GpuTestExpectations
 
 # See the GpuTestExpectations class for documentation.
 
 class WebGLConformanceExpectations(GpuTestExpectations):
@@ skipping 384 matching lines @@
     self.Fail('conformance/textures/svg_image/' +
               'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
               ['android',
               ('qualcomm', 'Adreno (TM) 420'),
               ('qualcomm', 'Adreno (TM) 430')], bug=611945)
     # The following tests mentions android-content-shell and android-chrome,
     # but not webview.
     # This is because webview already has this expectation below
     self.Fail('conformance/textures/video/' +
               'tex-2d-rgb-rgb-unsigned_byte.html',
-              ['android-content-shell', 'android-chromium',
+              ['android', 'android-content-shell', 'android-chromium',
               ('qualcomm', 'Adreno (TM) 430')], bug=611945)
     self.Fail('conformance/textures/video/' +
               'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
               ['android', 'android-content-shell', 'android-chromium',
               ('qualcomm', 'Adreno (TM) 430')], bug=611945)
     self.Fail('conformance/textures/video/' +
               'tex-2d-rgba-rgba-unsigned_byte.html',
-              ['android-content-shell', 'android-chromium',
+              ['android', 'android-content-shell', 'android-chromium',
               ('qualcomm', 'Adreno (TM) 430')], bug=611945)
     self.Fail('conformance/textures/video/' +
               'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
-              ['android-content-shell', 'android-chromium',
+              ['android', 'android-content-shell', 'android-chromium',
               ('qualcomm', 'Adreno (TM) 430')], bug=611945)
     self.Fail('conformance/textures/video/' +
               'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
-              ['android-content-shell', 'android-chromium',
+              ['android', 'android-content-shell', 'android-chromium',
               ('qualcomm', 'Adreno (TM) 430')], bug=611945)
     self.Fail('conformance/textures/webgl_canvas/' +
               'tex-2d-rgb-rgb-unsigned_byte.html',
               ['android', ('qualcomm', 'Adreno (TM) 430')], bug=611945)
     self.Fail('conformance/textures/webgl_canvas/' +
               'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
               ['android', ('qualcomm', 'Adreno (TM) 430')], bug=611945)
     self.Fail('conformance/textures/webgl_canvas/' +
               'tex-2d-rgba-rgba-unsigned_byte.html',
               ['android', ('qualcomm', 'Adreno (TM) 430')], bug=611945)
@@ skipping 199 matching lines @@
     # Mac Retina NVIDIA failures
     self.Fail(
         'conformance/glsl/bugs/array-of-struct-with-int-first-position.html',
         ['mac', ('nvidia', 0xfd5), ('nvidia', 0xfe9)], bug=368912)
 
     # Mac Retina AMD failures
     self.Flaky('conformance/extensions/oes-texture-float-with-video.html',
         ['mac', ('amd', 0x6821)], bug=599272)
 
     # Linux failures
+    self.Flaky('conformance/textures/video/' +
+               'tex-2d-rgba-rgba-unsigned_byte.html',
+               ['linux'], bug=627525)
+    self.Flaky('conformance/textures/video/' +
+               'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
+               ['linux'], bug=627525)
+    self.Flaky('conformance/textures/video/' +
+               'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
+               ['linux'], bug=627525)
+    self.Flaky('conformance/textures/video/' +
+               'tex-2d-rgb-rgb-unsigned_byte.html',
+               ['linux'], bug=627525)
+    self.Flaky('conformance/textures/video/' +
+               'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
+               ['linux'], bug=627525)
+
     # OpenGL
     self.Fail('conformance/extensions/oes-texture-half-float.html',
         ['linux', 'opengl'], bug=607283)
 
     # NVIDIA
     self.Fail('conformance/extensions/angle-instanced-arrays.html',
               ['linux', 'nvidia'], bug=544989) # Too flaky to retry
     self.Flaky('conformance/extensions/oes-element-index-uint.html',
                ['linux', 'nvidia'], bug=524144)
     self.Flaky('conformance/textures/image/' +
@@ skipping 274 matching lines @@
     self.Fail('conformance/textures/misc/texture-npot.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/textures/misc/texture-npot-video.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/textures/misc/texture-size.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/uniforms/gl-uniform-arrays.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Skip('conformance/uniforms/uniform-default-values.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)