Add WebGL test suppressions for the new Intel Linux bot

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

 # Copyright (c) 2015 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.
 from gpu_tests.webgl_conformance_expectations import WebGLConformanceExpectations
 
 # See the GpuTestExpectations class for documentation.
 
 class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
   def __init__(self, conformance_path):
     super(WebGL2ConformanceExpectations, self).__init__(conformance_path)
@@ skipping 576 matching lines @@
     self.Fail('deqp/functional/gles3/clipping.html',
         ['mac', 'amd'], bug=483282)
 
     # Mac Intel
     self.Fail('conformance2/textures/misc/tex-unpack-params.html',
         ['mac', 'intel'], bug=483282)
 
     # Linux only.
     self.Fail('deqp/functional/gles3/fbostatequery.html',
         ['linux'], bug=483282)
-    self.Flaky('deqp/functional/gles3/negativeshaderapi.html',
-        ['linux'], bug=483282)
     self.Skip('deqp/functional/gles3/shaderswitch.html',
         ['linux'], bug=483282)
     self.Fail('conformance2/glsl3/vector-dynamic-indexing.html',
         ['linux'], bug=483282)
     self.Fail('conformance2/rendering/draw-buffers.html',
         ['linux'], bug=483282)
     self.Fail('conformance2/textures/misc/tex-unpack-params.html',
         ['linux'], bug=483282)
+    # We want to mark this Flaky for all of Linux however we currently skip
+    # all the tests on Intel. Tag this with AMD and Nvidia to avoid an
+    # expectation conflict that would make this test run on Intel.
+    self.Flaky('deqp/functional/gles3/negativeshaderapi.html',
+        ['linux', 'amd', 'nvidia'], bug=483282)
 
     # Linux AMD only.
     # It looks like AMD shader compiler rejects many valid ES3 semantics.
     self.Skip('deqp/data/gles3/shaders/arrays.html',
         ['linux', 'amd'], bug=483282)
     self.Skip('deqp/data/gles3/shaders/qualification_order.html',
         ['linux', 'amd'], bug=483282)
     self.Skip('deqp/functional/gles3/texturestatequery.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('conformance2/buffers/buffer-type-restrictions.html',
@@ skipping 82 matching lines @@
     # self.Fail(page_name,
     #     ['linux', ('nvidia', 0x1), 'debug', 'opengl'])
     # self.Fail(page_name,
     #     ['win', ('nvidia', 0x1), 'debug', 'opengl'])
 
     # Conflicts if between a generic os condition and a specific version
     # self.Fail(page_name,
     #     ['xp', ('nvidia', 0x1), 'debug', 'opengl'])
     # self.Fail(page_name,
     #     ['win', ('nvidia', 0x1), 'debug', 'opengl'])