Commit d52a1146 authored by Jamie Madill's avatar Jamie Madill Committed by Commit Bot

Temporarily disable angle_vulkan_deqp_tests.

Unblocks the Vulkan roll (issues with http://crbug.com/643346).

Bug: angleproject:2393
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;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
Tbr: kbr@chromium.org
No-Try: True
Change-Id: Icd41d0ba9abbbdd5a8d52e9f391716dbef674a34
Reviewed-on: https://chromium-review.googlesource.com/951648Reviewed-by: default avatarJamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541458}
parent b68ee71b
...@@ -1260,45 +1260,47 @@ COMMON_GTESTS = { ...@@ -1260,45 +1260,47 @@ COMMON_GTESTS = {
], ],
}, },
'angle_deqp_gles2_vulkan_tests': { # Temporarily disabled while we roll Vulkan.
'tester_configs': [ # TODO(jmadill): Re-enable after roll. http://anglebug.com/2393
{ # 'angle_deqp_gles2_vulkan_tests': {
'predicate': Predicates.DEQP, # 'tester_configs': [
'swarming_dimension_sets': [ # {
# NVIDIA Win 10 # 'predicate': Predicates.DEQP,
{ # 'swarming_dimension_sets': [
'gpu': NVIDIA_QUADRO_P400_ALL_DRIVERS, # # NVIDIA Win 10
'os': WIN10_NVIDIA_QUADRO_P400_STABLE_OS, # {
}, # 'gpu': NVIDIA_QUADRO_P400_ALL_DRIVERS,
# AMD Win 7 # 'os': WIN10_NVIDIA_QUADRO_P400_STABLE_OS,
{ # },
'gpu': '1002:6613', # # AMD Win 7
'os': 'Windows-2008ServerR2-SP1' # {
}, # 'gpu': '1002:6613',
# NVIDIA Linux Quadro P400 # 'os': 'Windows-2008ServerR2-SP1'
{ # },
'gpu': LINUX_QUADRO_P400_STABLE_DRIVER, # # NVIDIA Linux Quadro P400
'os': 'Ubuntu' # {
}, # 'gpu': LINUX_QUADRO_P400_STABLE_DRIVER,
], # 'os': 'Ubuntu'
}, # },
], # ],
'disabled_tester_configs': [ # },
{ # ],
'names': [ # 'disabled_tester_configs': [
'Linux FYI Ozone (Intel)', # {
], # 'names': [
}, # 'Linux FYI Ozone (Intel)',
], # ],
'desktop_swarming': { # },
'shards': 4, # ],
}, # 'desktop_swarming': {
'test': 'angle_deqp_gles2_tests', # 'shards': 4,
'args': [ # },
'--test-launcher-batch-limit=400', # 'test': 'angle_deqp_gles2_tests',
'--deqp-egl-display-type=angle-vulkan' # 'args': [
] # '--test-launcher-batch-limit=400',
}, # '--deqp-egl-display-type=angle-vulkan'
# ]
# },
'angle_deqp_gles3_gles_tests': { 'angle_deqp_gles3_gles_tests': {
'tester_configs': [ 'tester_configs': [
......
...@@ -5672,26 +5672,6 @@ ...@@ -5672,26 +5672,6 @@
"test": "angle_deqp_gles2_tests", "test": "angle_deqp_gles2_tests",
"use_xvfb": false "use_xvfb": false
}, },
{
"args": [
"--test-launcher-batch-limit=400",
"--deqp-egl-display-type=angle-vulkan"
],
"name": "angle_deqp_gles2_vulkan_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-384.90",
"os": "Ubuntu",
"pool": "Chrome-GPU"
}
],
"shards": 4
},
"test": "angle_deqp_gles2_tests",
"use_xvfb": false
},
{ {
"args": [ "args": [
"--test-launcher-batch-limit=400", "--test-launcher-batch-limit=400",
...@@ -15113,26 +15093,6 @@ ...@@ -15113,26 +15093,6 @@
"test": "angle_deqp_gles2_tests", "test": "angle_deqp_gles2_tests",
"use_xvfb": false "use_xvfb": false
}, },
{
"args": [
"--test-launcher-batch-limit=400",
"--deqp-egl-display-type=angle-vulkan"
],
"name": "angle_deqp_gles2_vulkan_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"shards": 4
},
"test": "angle_deqp_gles2_tests",
"use_xvfb": false
},
{ {
"args": [ "args": [
"--test-launcher-batch-limit=400", "--test-launcher-batch-limit=400",
...@@ -18287,26 +18247,6 @@ ...@@ -18287,26 +18247,6 @@
}, },
"test": "angle_deqp_gles2_tests", "test": "angle_deqp_gles2_tests",
"use_xvfb": false "use_xvfb": false
},
{
"args": [
"--test-launcher-batch-limit=400",
"--deqp-egl-display-type=angle-vulkan"
],
"name": "angle_deqp_gles2_vulkan_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6613",
"os": "Windows-2008ServerR2-SP1",
"pool": "Chrome-GPU"
}
],
"shards": 4
},
"test": "angle_deqp_gles2_tests",
"use_xvfb": false
} }
], ],
"isolated_scripts": [] "isolated_scripts": []
......
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