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

Remove unsupported Win7 dEQP NVIDIA testing.

ANGLE does not support D3D11 on ES 3.1, but we maintain it on Win10
in case we need it in the future or as a useful tool for external
developers. We also do not support the GL back-end on Windows in
a shipping config.

The GLES 3.1 tests on NV/Win7 D3D11 were quite flaky, so this CL
disables them. Also we remove the GL back-end testing on dEQP NVIDIA
Win7 because they were slightly flaky. Win10 testing is unchanged.

Bug: angleproject:5391
Change-Id: I278ef42993e1b945ca7b79850a99dcbdaa474e70
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2561021
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Auto-Submit: Jamie Madill <jmadill@chromium.org>
Reviewed-by: default avatarYuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#831116}
parent a52051e6
......@@ -39551,35 +39551,6 @@
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_deqp_egl_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_deqp_egl_tests",
"--use-angle=gl",
"--bot-mode",
"--max-processes=1"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "angle_deqp_egl_gl_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-24.21.14.1195",
"os": "Windows-2008ServerR2-SP1",
"pool": "chromium.tests.gpu"
}
],
"expiration": 21600,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_deqp_egl_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_deqp_egl_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_deqp_gles2_tests",
......@@ -39608,92 +39579,6 @@
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_deqp_gles2_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_deqp_gles2_tests",
"--use-angle=gl",
"--bot-mode"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "angle_deqp_gles2_gl_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-24.21.14.1195",
"os": "Windows-2008ServerR2-SP1",
"pool": "chromium.tests.gpu"
}
],
"expiration": 21600,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_deqp_gles2_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_deqp_gles2_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_deqp_gles31_tests",
"--use-angle=d3d11",
"--bot-mode"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "angle_deqp_gles31_d3d11_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-24.21.14.1195",
"os": "Windows-2008ServerR2-SP1",
"pool": "chromium.tests.gpu"
}
],
"expiration": 21600,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
},
"test": "angle_deqp_gles31_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_deqp_gles31_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_deqp_gles31_tests",
"--use-angle=gl",
"--bot-mode"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "angle_deqp_gles31_gl_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-24.21.14.1195",
"os": "Windows-2008ServerR2-SP1",
"pool": "chromium.tests.gpu"
}
],
"expiration": 21600,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
},
"test": "angle_deqp_gles31_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_deqp_gles31_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_deqp_gles3_tests",
......@@ -39722,35 +39607,6 @@
"test": "angle_deqp_gles3_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_deqp_gles3_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_deqp_gles3_tests",
"--use-angle=gl",
"--bot-mode"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "angle_deqp_gles3_gl_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-24.21.14.1195",
"os": "Windows-2008ServerR2-SP1",
"pool": "chromium.tests.gpu"
}
],
"expiration": 21600,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test": "angle_deqp_gles3_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_deqp_gles3_tests/",
"use_isolated_scripts_api": true
}
]
}
......@@ -5498,13 +5498,8 @@
'gpu_angle_deqp_win7_nvidia_gtests': [
'gpu_angle_deqp_egl_d3d11_gtests',
'gpu_angle_deqp_egl_gl_gtests',
'gpu_angle_deqp_gles2_d3d11_gtests',
'gpu_angle_deqp_gles2_gl_gtests',
'gpu_angle_deqp_gles31_d3d11_gtests',
'gpu_angle_deqp_gles31_gl_gtests',
'gpu_angle_deqp_gles3_d3d11_gtests',
'gpu_angle_deqp_gles3_gl_gtests',
],
'gpu_angle_deqp_win_amd_gtests': [
......
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