| Index: content/test/gpu/generate_buildbot_json.py | 
| diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py | 
| index ca7fbe18ec69ca8964e0d1339b6f3984289dfd41..24e98220954dd00d6e0d73cb2687d65bc93195ae 100755 | 
| --- a/content/test/gpu/generate_buildbot_json.py | 
| +++ b/content/test/gpu/generate_buildbot_json.py | 
| @@ -369,13 +369,15 @@ | 
| } | 
|  | 
| 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', 'linux'], | 
| -        # 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 | 
| +        '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 | 
| # added. | 
| 'build_configs': ['Release', 'Release_x64'], | 
| 'swarming_dimension_sets': [ | 
| @@ -383,10 +385,6 @@ | 
| 'gpu': '10de:104a', | 
| 'os': 'Windows-2008ServerR2-SP1' | 
| }, | 
| -          { | 
| -            'gpu': '10de:104a', | 
| -            'os': 'Linux' | 
| -          } | 
| ], | 
| } | 
| ], | 
| @@ -498,7 +496,7 @@ | 
| 'angle_deqp_gles3_tests': { | 
| 'tester_configs': [ | 
| { | 
| -        'os_types': ['win', 'linux'] | 
| +        'os_types': ['win'] | 
| } | 
| ], | 
| 'swarming_shards': 12 | 
|  |