Skip to content

GitLab

T
tangled
Commit 441e2bf9 authored by kbr's avatar kbr Committed by Commit bot
Browse files
Options

Switch Mac Intel GPU jobs to target 10.12 bots instead of 10.10. 

BUG=679607, 663188
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
TBR=zmo@chromium.org
NOTRY=true

Review-Url: https://codereview.chromium.org/2627553002
Cr-Commit-Position: refs/heads/master@{#442828}
parent a427ba06
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 86 deletions
content/test/gpu/generate_buildbot_json.py
View file @ 441e2bf9
......@@ -54,7 +54,7 @@ WATERFALL = {
'swarming_dimensions': [
{
'gpu': '8086:0a2e',
'os': 'Mac-10.10'
'os': 'Mac-10.12'
},
],
'build_config': 'Release',
......@@ -65,7 +65,7 @@ WATERFALL = {
'swarming_dimensions': [
{
'gpu': '8086:0a2e',
'os': 'Mac-10.10'
'os': 'Mac-10.12'
},
],
'build_config': 'Debug',
......@@ -323,7 +323,7 @@ FYI_WATERFALL = {
'swarming_dimensions': [
{
'gpu': '8086:0a2e',
'os': 'Mac-10.10'
'os': 'Mac-10.12'
},
],
'build_config': 'Release',
......@@ -334,7 +334,7 @@ FYI_WATERFALL = {
'swarming_dimensions': [
{
'gpu': '8086:0a2e',
'os': 'Mac-10.10'
'os': 'Mac-10.12'
},
],
'build_config': 'Debug',
......@@ -433,7 +433,7 @@ FYI_WATERFALL = {
'swarming_dimensions': [
{
'gpu': '8086:0a2e',
'os': 'Mac-10.10'
'os': 'Mac-10.12'
},
{
'gpu': '1002:6821',
......@@ -690,7 +690,7 @@ FYI_WATERFALL = {
'swarming_dimensions': [
{
'gpu': '8086:0a2e',
'os': 'Mac-10.10'
'os': 'Mac-10.12'
},
],
'build_config': 'Release',
......
content/test/gpu/gpu_tests/test_expectations.py
View file @ 441e2bf9
......@@ -9,7 +9,7 @@ import urlparse
#
# Operating systems:
# win, xp, vista, win7, win8, win10, mac, leopard, snowleopard,
# lion, mountainlion, mavericks, yosemite, linux, chromeos,
# lion, mountainlion, mavericks, yosemite, sierra, linux, chromeos,
# android
#
# Browser types:
......@@ -21,7 +21,7 @@ import urlparse
WIN_CONDITIONS = ['xp', 'vista', 'win7', 'win8', 'win10']
MAC_CONDITIONS = ['leopard', 'snowleopard', 'lion', 'mountainlion',
'mavericks', 'yosemite']
'mavericks', 'yosemite', 'sierra']
OS_CONDITIONS = ['win', 'mac', 'linux', 'chromeos', 'android'] + \
WIN_CONDITIONS + MAC_CONDITIONS
......@@ -74,7 +74,8 @@ class Expectation(object):
Operating systems:
win, xp, vista, win7, mac, leopard, snowleopard, lion,
mountainlion, mavericks, yosemite, linux, chromeos, android
mountainlion, mavericks, yosemite, sierra, linux, chromeos,
android
Browser types:
android-webview-shell, android-content-shell, android-chromium,
......@@ -83,6 +84,7 @@ class Expectation(object):
Sample usage in SetExpectations in subclasses:
self.Fail('gl-enable-vertex-attrib.html',
['mac', 'release'], bug=123)
"""
cl = condition.lower()
if cl in OS_CONDITIONS:
......
content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
View file @ 441e2bf9
......@@ -430,6 +430,32 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
['mac', ('amd', 0x679e)], bug=483282)
# Mac Intel
self.Fail(
'conformance2/textures/canvas/tex-2d-rgb9_e5-rgb-float.html',
['sierra', 'intel'], bug=663188)
self.Fail(
'conformance2/textures/canvas/tex-2d-rgb9_e5-rgb-half_float.html',
['sierra', 'intel'], bug=663188)
self.Fail(
'conformance2/textures/canvas/tex-3d-rgb9_e5-rgb-float.html',
['sierra', 'intel'], bug=663188)
self.Fail(
'conformance2/textures/canvas/tex-3d-rgb9_e5-rgb-half_float.html',
['sierra', 'intel'], bug=663188)
self.Fail(
'conformance2/textures/webgl_canvas/tex-2d-rgb9_e5-rgb-float.html',
['sierra', 'intel'], bug=663188)
self.Fail(
'conformance2/textures/webgl_canvas/tex-2d-rgb9_e5-rgb-half_float.html',
['sierra', 'intel'], bug=663188)
self.Fail(
'conformance2/textures/webgl_canvas/tex-3d-rgb9_e5-rgb-float.html',
['sierra', 'intel'], bug=663188)
self.Fail(
'conformance2/textures/webgl_canvas/tex-3d-rgb9_e5-rgb-half_float.html',
['sierra', 'intel'], bug=663188)
self.Fail('deqp/functional/gles3/fbomultisample*',
['mac', 'intel'], bug=641209)
self.Fail('deqp/functional/gles3/texturefiltering/2d_combinations_01.html',
......
testing/buildbot/chromium.gpu.fyi.json
View file @ 441e2bf9
This diff is collapsed.
testing/buildbot/chromium.gpu.json
View file @ 441e2bf9
......@@ -599,7 +599,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
},
......@@ -615,7 +615,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
},
......@@ -631,7 +631,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
},
......@@ -658,7 +658,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -681,7 +681,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -704,7 +704,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -727,7 +727,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -756,7 +756,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -793,7 +793,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -816,7 +816,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -839,7 +839,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -862,7 +862,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -881,7 +881,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
},
......@@ -897,7 +897,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
},
......@@ -913,7 +913,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
},
......@@ -929,7 +929,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
},
......@@ -956,7 +956,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -979,7 +979,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -1002,7 +1002,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -1025,7 +1025,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -1054,7 +1054,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -1091,7 +1091,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -1114,7 +1114,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -1137,7 +1137,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......@@ -1160,7 +1160,7 @@
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.10"
"os": "Mac-10.12"
}
]
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment