Skip to content

GitLab

T
tangled
Commit 622eec2f authored by Jamie Madill's avatar Jamie Madill Committed by Commit Bot
Browse files
Options

Revert "Temporarily disable angle_vulkan_deqp_tests." 

This reverts commit 5f77b73e.

Reason for revert: Roll has landed, reinstating tests.

Original change's description:
> Temporarily disable angle_vulkan_deqp_tests.
> 
> Unblocks the Vulkan roll.
> 
> Bug: angleproject:2482
> Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
> Change-Id: I9577f331977e9add28bb7875e70260d428ad0cd5
> Tbr: kbr@chromium.org
> No-try: True
> Reviewed-on: https://chromium-review.googlesource.com/1014322
> Reviewed-by: Jamie Madill <jmadill@chromium.org>
> Commit-Queue: Jamie Madill <jmadill@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#551102}

TBR=jmadill@chromium.org,kbr@chromium.org

Change-Id: Iab80706a6e74c442533d4df60c753e7dc270c380
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: angleproject:2482
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Reviewed-on: https://chromium-review.googlesource.com/1014726Reviewed-by: default avatarJamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551235}
parent 239ecfba
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 41 deletions
content/test/gpu/generate_buildbot_json.py
View file @ 622eec2f
...@@ -1257,47 +1257,45 @@ COMMON_GTESTS = { ...@@ -1257,47 +1257,45 @@ COMMON_GTESTS = {
], ],
}, },
# Temporarily disabled while we roll Vulkan. 'angle_deqp_gles2_vulkan_tests': {
# TODO(jmadill): Re-enable after roll. http://anglebug.com/2393 'tester_configs': [
# 'angle_deqp_gles2_vulkan_tests': { {
# 'tester_configs': [ 'predicate': Predicates.DEQP,
# { 'swarming_dimension_sets': [
# 'predicate': Predicates.DEQP, # NVIDIA Win 10
# 'swarming_dimension_sets': [ {
# # NVIDIA Win 10 'gpu': NVIDIA_QUADRO_P400_ALL_DRIVERS,
# { 'os': WIN10_NVIDIA_QUADRO_P400_STABLE_OS,
# 'gpu': NVIDIA_QUADRO_P400_ALL_DRIVERS, },
# 'os': WIN10_NVIDIA_QUADRO_P400_STABLE_OS, # AMD Win 7
# }, {
# # AMD Win 7 'gpu': '1002:6613',
# { 'os': 'Windows-2008ServerR2-SP1'
# 'gpu': '1002:6613', },
# 'os': 'Windows-2008ServerR2-SP1' # NVIDIA Linux Quadro P400
# }, {
# # NVIDIA Linux Quadro P400 'gpu': LINUX_QUADRO_P400_STABLE_DRIVER,
# { 'os': 'Ubuntu'
# 'gpu': LINUX_QUADRO_P400_STABLE_DRIVER, },
# 'os': 'Ubuntu' ],
# }, },
# ], ],
# }, 'disabled_tester_configs': [
# ], {
# 'disabled_tester_configs': [ 'names': [
# { 'Linux FYI Ozone (Intel)',
# 'names': [ ],
# 'Linux FYI Ozone (Intel)', },
# ], ],
# }, 'desktop_swarming': {
# ], 'shards': 4,
# 'desktop_swarming': { },
# 'shards': 4, 'test': 'angle_deqp_gles2_tests',
# }, 'args': [
# 'test': 'angle_deqp_gles2_tests', '--test-launcher-batch-limit=400',
# 'args': [ '--deqp-egl-display-type=angle-vulkan'
# '--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': [
......
testing/buildbot/chromium.gpu.fyi.json
View file @ 622eec2f
...@@ -5797,6 +5797,26 @@ ...@@ -5797,6 +5797,26 @@
"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",
...@@ -15223,6 +15243,26 @@ ...@@ -15223,6 +15243,26 @@
"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",
...@@ -18377,6 +18417,26 @@ ...@@ -18377,6 +18417,26 @@
}, },
"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