diff options
| -rwxr-xr-x | content/test/gpu/generate_buildbot_json.py | 25 | ||||
| -rw-r--r-- | testing/buildbot/chromium.gpu.fyi.json | 39 |
2 files changed, 41 insertions, 23 deletions
diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py index aabe0e7..f50f066 100755 --- a/content/test/gpu/generate_buildbot_json.py +++ b/content/test/gpu/generate_buildbot_json.py @@ -335,6 +335,21 @@ FYI_WATERFALL = { } 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'], + 'names': [ + 'Win7 Release (NVIDIA)', + 'Win7 Debug (NVIDIA)', + ], + } + ], + '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). @@ -438,16 +453,6 @@ NON_SWARMED_GTESTS = { } DEQP_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': [ - { - 'os_types': ['win'] - } - ], - 'swarming_shards': 4 - }, 'angle_deqp_gles3_tests': { 'tester_configs': [ { diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json index 0415a03..17e02fe 100644 --- a/testing/buildbot/chromium.gpu.fyi.json +++ b/testing/buildbot/chromium.gpu.fyi.json @@ -4310,6 +4310,19 @@ "Win7 Debug (NVIDIA)": { "gtest_tests": [ { + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "gpu": "10de:104a", + "os": "Windows-2008ServerR2-SP1" + } + ], + "shards": 4 + }, + "test": "angle_deqp_gles2_tests" + }, + { "args": [ "--use-gpu-in-tests" ], @@ -5247,6 +5260,19 @@ "Win7 Release (NVIDIA)": { "gtest_tests": [ { + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "gpu": "10de:104a", + "os": "Windows-2008ServerR2-SP1" + } + ], + "shards": 4 + }, + "test": "angle_deqp_gles2_tests" + }, + { "args": [ "--use-gpu-in-tests" ], @@ -5731,19 +5757,6 @@ "os": "Windows-2008ServerR2-SP1" } ], - "shards": 4 - }, - "test": "angle_deqp_gles2_tests" - }, - { - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:104a", - "os": "Windows-2008ServerR2-SP1" - } - ], "shards": 12 }, "test": "angle_deqp_gles3_tests" |