Adding another test expectations for Android.

content/test/gpu/gpu_tests/webgl_conformance_expectations.py

Index: content/test/gpu/gpu_tests/webgl_conformance_expectations.py
diff --git a/content/test/gpu/gpu_tests/webgl_conformance_expectations.py b/content/test/gpu/gpu_tests/webgl_conformance_expectations.py
index 9d4d572db32bb4159aa9d77ca6f11670a7daf068..762d0bc5233cba0fdc59027619a0aeab38abab2e 100644
--- a/content/test/gpu/gpu_tests/webgl_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl_conformance_expectations.py
@@ -326,21 +326,28 @@ class WebGLConformanceExpectations(GpuTestExpectations):
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
     self.Fail('conformance/glsl/bugs/sampler-struct-function-arg.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
-    self.Fail('conformance/glsl/misc/shader-struct-scope.html',
+    self.Skip('conformance/glsl/misc/shader-struct-scope.html',

[Ken Russell (switch to Gerrit), 2016/05/24 23:12:16]

I think this one in particular should be highlighted as causing problems for all
subsequent tests. Perhaps file a different bug and block Issue 611945 on it, and
reference the other bug ID here instead.

[cblume, 2016/05/25 00:24:49]

Done.

               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
-    self.Fail('conformance/glsl/misc/shader-uniform-packing-restrictions.html',
+    self.Fail('conformance/glsl/misc/shaders-with-invariance.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
-    self.Fail('conformance/glsl/misc/shader-varying-packing-restrictions.html',
+    self.Fail('conformance/rendering/gl-viewport-test.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
-    self.Fail('conformance/glsl/misc/shader-with-256-character-define.html',
+    self.Fail('conformance/textures/svg_image/' +
+              'tex-2d-rgb-rgb-unsigned_byte.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
-    self.Fail('conformance/glsl/misc/' +
-              'shader-with-256-character-identifier.frag.html',
+    self.Fail('conformance/textures/svg_image/' +
+              'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
+              ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
+    self.Fail('conformance/textures/svg_image/' +
+              'tex-2d-rgba-rgba-unsigned_byte.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
-    self.Fail('conformance/glsl/misc/shader-with-257-character-define.html',
+    self.Fail('conformance/textures/svg_image/' +
+              'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
-    self.Fail('conformance/glsl/misc/' +
-              'shader-with-257-character-identifier.frag.html',
+    self.Fail('conformance/textures/svg_image/' +
+              'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
+              ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
+    self.Fail('deqp/data/gles2/shaders/preprocessor.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
 
     # Nexus 9