aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar borenet <borenet@chromium.org>2016-04-05 12:14:59 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-05 12:14:59 -0700
commitd32eac278e94ef92f6edd8c541fb57892b7b62ff (patch)
treedac9901e8594fb81e30df3875271d3a1cf546699 /tools
parentbe243d4737bb5601984e1d1c4e72e2a6c0788edf (diff)
Set 'device_cfg' parameter for iOS bots
Diffstat (limited to 'tools')
-rw-r--r--tools/buildbot_spec.json21
-rwxr-xr-xtools/buildbot_spec.py6
2 files changed, 7 insertions, 20 deletions
diff --git a/tools/buildbot_spec.json b/tools/buildbot_spec.json
index 1341b5ab96..fe68aaf651 100644
--- a/tools/buildbot_spec.json
+++ b/tools/buildbot_spec.json
@@ -1165,7 +1165,6 @@
"gpusrgb",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -1444,7 +1443,6 @@
"gpusrgb",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -1724,7 +1722,6 @@
"gpusrgb",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -2004,7 +2001,6 @@
"gpusrgb",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -2329,7 +2325,6 @@
"gpusrgb",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -2654,7 +2649,6 @@
"gpusrgb",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -2973,7 +2967,6 @@
"gpusrgb",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -3620,7 +3613,6 @@
"nvprdit16",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -3996,7 +3988,6 @@
"gpusrgb",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -5179,7 +5170,6 @@
"gpusrgb",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -5460,7 +5450,6 @@
"gpusrgb",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -5878,7 +5867,6 @@
"2ndpic-8888",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -6166,7 +6154,6 @@
"2ndpic-8888",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -6452,7 +6439,6 @@
"2ndpic-8888",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -6739,7 +6725,6 @@
"2ndpic-8888",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -7026,7 +7011,6 @@
"2ndpic-8888",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -7310,7 +7294,6 @@
"nvprdit16",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -7714,7 +7697,6 @@
"gpusrgb",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -8042,7 +8024,6 @@
"gpusrgb",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -8455,6 +8436,7 @@
"role": "Test"
},
"configuration": "Debug",
+ "device_cfg": "iPad4,1",
"dm_flags": [
"--config",
"565",
@@ -8462,7 +8444,6 @@
"gpu",
"gpusrgb",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
diff --git a/tools/buildbot_spec.py b/tools/buildbot_spec.py
index 551907038e..b549a1b08b 100755
--- a/tools/buildbot_spec.py
+++ b/tools/buildbot_spec.py
@@ -244,6 +244,12 @@ def device_cfg(builder_dict):
'Daisy': 'daisy',
}[builder_dict['model']]
+ # iOS.
+ if 'iOS' in builder_dict.get('os', ''):
+ return {
+ 'iPad4': 'iPad4,1',
+ }[builder_dict['model']]
+
return None