summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorkbr <kbr@chromium.org>2016-02-01 15:54:04 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-01 23:55:37 +0000
commit809dc5d993e19b5b3784efed496e4d50c0510c44 (patch)
tree9d90dc7f6d5b7d970a2ae922d4354f0bae5d4b82 /content
parent907140689d87d0ba3a34cef12696bfdc28db292f (diff)
downloadchromium_src-809dc5d993e19b5b3784efed496e4d50c0510c44.zip
chromium_src-809dc5d993e19b5b3784efed496e4d50c0510c44.tar.gz
chromium_src-809dc5d993e19b5b3784efed496e4d50c0510c44.tar.bz2
Run ANGLE dEQP GLES2 tests on Win7 Debug/Release GPU FYI bots.
This is needed in order to keep these tests running on the tryservers once the tryservers are picking up these tests from the JSON files rather than the GPU recipe. Currently they're only being deployed on these two bots because these tests are fairly long running and it's not clear the capacity is there to run them on all of the configurations (Win8, etc.). BUG=542370 TBR=dpranke@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/1657983002 Cr-Commit-Position: refs/heads/master@{#372824}
Diffstat (limited to 'content')
-rwxr-xr-xcontent/test/gpu/generate_buildbot_json.py25
1 files changed, 15 insertions, 10 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': [
{