Skip to content

A
angle
Commit c71fbc16 by Jamie Madill Committed by Angle LUCI CQ
Options

infra: Add dEQP tests to the Pixel 4.

Also updates expectations. For simplicity we use SKIP everywhere and specify each skipped test individually instead of using wildcards. Bug: angleproject:5941 Change-Id: If2cb85b06ecd250222dbf1376d99392ad10b71aa Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2896172Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 6619c464
Showing with 309 additions and 3 deletions
infra/specs/angle.json
...@@ -7,6 +7,300 @@ ...@@ -7,6 +7,300 @@
"gtest_tests": [ "gtest_tests": [
{ {
"args": [ "args": [
"angle_deqp_egl_tests",
"--use-angle=vulkan",
"-v",
"--shard-timeout=500"
],
"merge": {
"script": "//scripts/angle_deqp_test_merge.py"
},
"name": "angle_deqp_egl_vulkan_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "R",
"device_os_type": "userdebug",
"device_type": "flame",
"os": "Android",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test": "angle_deqp_egl_tests",
"test_id_prefix": "ninja://src/tests:angle_deqp_egl_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_deqp_gles2_tests",
"--use-angle=vulkan",
"-v",
"--shard-timeout=500"
],
"merge": {
"script": "//scripts/angle_deqp_test_merge.py"
},
"name": "angle_deqp_gles2_vulkan_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "R",
"device_os_type": "userdebug",
"device_type": "flame",
"os": "Android",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test": "angle_deqp_gles2_tests",
"test_id_prefix": "ninja://src/tests:angle_deqp_gles2_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_deqp_gles31_tests",
"--use-angle=vulkan",
"-v",
"--shard-timeout=500"
],
"merge": {
"script": "//scripts/angle_deqp_test_merge.py"
},
"name": "angle_deqp_gles31_vulkan_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "R",
"device_os_type": "userdebug",
"device_type": "flame",
"os": "Android",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 20
},
"test": "angle_deqp_gles31_tests",
"test_id_prefix": "ninja://src/tests:angle_deqp_gles31_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_deqp_gles3_tests",
"--use-angle=vulkan",
"-v",
"--shard-timeout=500"
],
"merge": {
"script": "//scripts/angle_deqp_test_merge.py"
},
"name": "angle_deqp_gles3_vulkan_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "R",
"device_os_type": "userdebug",
"device_type": "flame",
"os": "Android",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test": "angle_deqp_gles3_tests",
"test_id_prefix": "ninja://src/tests:angle_deqp_gles3_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_deqp_khr_gles2_tests",
"--use-angle=vulkan",
"-v",
"--shard-timeout=500"
],
"merge": {
"script": "//scripts/angle_deqp_test_merge.py"
},
"name": "angle_deqp_khr_gles2_vulkan_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "R",
"device_os_type": "userdebug",
"device_type": "flame",
"os": "Android",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_deqp_khr_gles2_tests",
"test_id_prefix": "ninja://src/tests:angle_deqp_khr_gles2_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_deqp_khr_gles31_tests",
"--use-angle=vulkan",
"-v",
"--shard-timeout=500"
],
"merge": {
"script": "//scripts/angle_deqp_test_merge.py"
},
"name": "angle_deqp_khr_gles31_vulkan_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "R",
"device_os_type": "userdebug",
"device_type": "flame",
"os": "Android",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
},
"test": "angle_deqp_khr_gles31_tests",
"test_id_prefix": "ninja://src/tests:angle_deqp_khr_gles31_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_deqp_khr_gles32_tests",
"--use-angle=vulkan",
"-v",
"--shard-timeout=500"
],
"merge": {
"script": "//scripts/angle_deqp_test_merge.py"
},
"name": "angle_deqp_khr_gles32_vulkan_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "R",
"device_os_type": "userdebug",
"device_type": "flame",
"os": "Android",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_deqp_khr_gles32_tests",
"test_id_prefix": "ninja://src/tests:angle_deqp_khr_gles32_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_deqp_khr_gles3_tests",
"--use-angle=vulkan",
"-v",
"--shard-timeout=500"
],
"merge": {
"script": "//scripts/angle_deqp_test_merge.py"
},
"name": "angle_deqp_khr_gles3_vulkan_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "R",
"device_os_type": "userdebug",
"device_type": "flame",
"os": "Android",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
},
"test": "angle_deqp_khr_gles3_tests",
"test_id_prefix": "ninja://src/tests:angle_deqp_khr_gles3_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_end2end_tests", "angle_end2end_tests",
"--gtest_filter=-*Vulkan_SwiftShader*", "--gtest_filter=-*Vulkan_SwiftShader*",
"--shard-timeout=180", "--shard-timeout=180",
......
infra/specs/test_suites.pyl
...@@ -730,6 +730,14 @@ ...@@ -730,6 +730,14 @@
'compound_suites': { 'compound_suites': {
'android_gtests': [ 'android_gtests': [
'angle_deqp_egl_vulkan_gtests',
'angle_deqp_gles2_vulkan_gtests',
'angle_deqp_gles31_vulkan_gtests',
'angle_deqp_gles3_vulkan_gtests',
'angle_deqp_khr_gles2_vulkan_gtests',
'angle_deqp_khr_gles31_vulkan_gtests',
'angle_deqp_khr_gles32_vulkan_gtests',
'angle_deqp_khr_gles3_vulkan_gtests',
'angle_end2end_gtests', 'angle_end2end_gtests',
'angle_unit_gtests', 'angle_unit_gtests',
], ],
......
infra/specs/waterfalls.pyl
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'android_gtests', 'gtest_tests': 'android_gtests',
# 'isolated_scripts': 'common_isolated_scripts',
}, },
}, },
'linux-builder': {}, 'linux-builder': {},
......
scripts/code_generation_hashes/Test_spec_JSON.json
{ {
"infra/specs/angle.json": "infra/specs/angle.json":
"bde8eac706afbf81ab1cb28a6434ee69", "e5d93c670d2620f8ed0b425fdd98aa88",
"infra/specs/generate_test_spec_json.py": "infra/specs/generate_test_spec_json.py":
"e1c8a771f751adad715d7bea900fc8e1", "e1c8a771f751adad715d7bea900fc8e1",
"infra/specs/mixins.pyl": "infra/specs/mixins.pyl":
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
"infra/specs/test_suite_exceptions.pyl": "infra/specs/test_suite_exceptions.pyl":
"aad1a4aed801277cc531733deab221b5", "aad1a4aed801277cc531733deab221b5",
"infra/specs/test_suites.pyl": "infra/specs/test_suites.pyl":
"ec96a4f3a31e66f13836ea44d17e6119", "5975c48c318aacece3429cb91b04b4b6",
"infra/specs/variants.pyl": "infra/specs/variants.pyl":
"8cfcaa99fa07ad2a2d5d14f220fd5037", "8cfcaa99fa07ad2a2d5d14f220fd5037",
"infra/specs/waterfalls.pyl": "infra/specs/waterfalls.pyl":
"103b325e1d970e116a4f1ba1cf2b6b52", "566240ddb77f3418f2ea7d5c8e170026",
"testing/buildbot/generate_buildbot_json.py": "testing/buildbot/generate_buildbot_json.py":
"20cf8620f0563574bbfb80c8a22aa754", "20cf8620f0563574bbfb80c8a22aa754",
"testing/buildbot/mixins.pyl": "testing/buildbot/mixins.pyl":
......
src/tests/deqp_support/deqp_gles31_test_expectations.txt
This source diff could not be displayed because it is too large. You can view the blob instead.
src/tests/deqp_support/deqp_gles3_test_expectations.txt
This source diff could not be displayed because it is too large. You can view the blob instead.
src/tests/deqp_support/deqp_khr_gles32_test_expectations.txt
...@@ -159,3 +159,6 @@ ...@@ -159,3 +159,6 @@
5393 VULKAN ANDROID : KHR-GLES32.core.texture_cube_map_array.texture_size_compute_sh = FAIL 5393 VULKAN ANDROID : KHR-GLES32.core.texture_cube_map_array.texture_size_compute_sh = FAIL
5393 VULKAN ANDROID : KHR-GLES32.core.texture_cube_map_array.texture_size_fragment_sh = FAIL 5393 VULKAN ANDROID : KHR-GLES32.core.texture_cube_map_array.texture_size_fragment_sh = FAIL
5393 VULKAN ANDROID : KHR-GLES32.core.texture_cube_map_array.texture_size_vertex_sh = FAIL 5393 VULKAN ANDROID : KHR-GLES32.core.texture_cube_map_array.texture_size_vertex_sh = FAIL
// Pixel 4 expectations.
5990 PIXEL4ORXL VULKAN : KHR-GLES32.core.draw_buffers_indexed.color_masks = SKIP
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