Re-enable the ANGLE dEQP tests on Linux on the GPU FYI waterfall

content/test/gpu/generate_buildbot_json.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 """Script to generate chromium.gpu.json and chromium.gpu.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 351 matching lines @@
       # TODO(kbr): switch this to use Swarming, and put the physical
       # machine into the Swarming pool, once we're convinced it's
       # working well.
       'swarming': False,
       'os_type': 'linux',
     },
   }
 }
 
 COMMON_GTESTS = {
-  # TODO(kbr): re-enable angle_deqp_gles2_tests on Linux. Currently
-  # the target is disabled in the ANGLE workspace for the GN builds.
   'angle_deqp_gles2_tests': {
     'tester_configs': [
       {
         'fyi_only': True,
-        'os_types': ['win'],
-        # Run only on the Win7 Release NVIDIA 32- and 64-bit bots (and
-        # trybots) for the time being, at least until more capacity is
+        'os_types': ['win', 'linux'],

[Ken Russell (switch to Gerrit), 2016/02/03 00:50:29]

We can get rid of the os_types specifier now. It's redundant now that the
swarming_dimension_sets are being specified. Please do this cleanup in a
follow-on CL. Thanks.

+        # Run only on the Win7 and Linux Release NVIDIA 32- and 64-bit bots
+        # (and trybots) for the time being, at least until more capacity is
         # added.
         'build_configs': ['Release', 'Release_x64'],
         'swarming_dimension_sets': [
           {
             'gpu': '10de:104a',
             'os': 'Windows-2008ServerR2-SP1'
           },
+          {
+            'gpu': '10de:104a',
+            'os': 'Linux'
+          }
         ],
       }
     ],
     'swarming_shards': 4
   },
   # Until we have more capacity, run angle_end2end_tests only on the
   # FYI waterfall and the ANGLE trybots (which mirror the FYI
   # waterfall).
   'angle_end2end_tests': {
     'tester_configs': [
@@ skipping 91 matching lines @@
        '--gtest_filter=CastStreamingApiTestWithPixelOutput.EndToEnd*:' + \
            'TabCaptureApiPixelTest.EndToEnd*'
      ]
   }
 }
 
 DEQP_GTESTS = {
   'angle_deqp_gles3_tests': {
     'tester_configs': [
       {
-        'os_types': ['win']
+        'os_types': ['win', 'linux']
       }
     ],
     'swarming_shards': 12
   },
 }
 
 TELEMETRY_TESTS = {
   'context_lost': {},
   'gpu_process_launch_tests': {'target_name': 'gpu_process'},
   'gpu_rasterization': {},
@@ skipping 237 matching lines @@
     json.dump(tests, fp, indent=2, separators=(',', ': '), sort_keys=True)
     fp.write('\n')
 
 def main():
   generate_all_tests(FYI_WATERFALL, True)
   generate_all_tests(WATERFALL, False)
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())