From ec2948c5ed1ed5c9248ed379491482bcf91df36e Mon Sep 17 00:00:00 2001 From: Brian Sheedy Date: Thu, 13 Jul 2023 13:38:52 -0700 Subject: [PATCH] Start Mac Intel 13.4.1 experiment Bug: chromium:1464635 Change-Id: Ie7cf5d68fff54b0b58ca1a4c102ab8c8368bd3ea Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4684014 Commit-Queue: Brian Sheedy Reviewed-by: Yuly Novikov --- infra/specs/angle.json | 201 ++++++++++++++++++++++++++++++++++++- infra/specs/waterfalls.pyl | 1 + 2 files changed, 201 insertions(+), 1 deletion(-) diff --git a/infra/specs/angle.json b/infra/specs/angle.json index 551a5189c..13c16764a 100644 --- a/infra/specs/angle.json +++ b/infra/specs/angle.json @@ -4575,7 +4575,206 @@ } ] }, - "mac-exp-intel": {}, + "mac-exp-intel": { + "gtest_tests": [ + { + "args": [ + "--use-angle=gl", + "--max-processes=1" + ], + "merge": { + "script": "//scripts/angle_deqp_test_merge.py" + }, + "name": "angle_deqp_egl_gl_tests", + "swarming": { + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", + "os": "Mac-13.4.1" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_egl_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_egl_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "--use-angle=metal" + ], + "merge": { + "script": "//scripts/angle_deqp_test_merge.py" + }, + "name": "angle_deqp_egl_metal_tests", + "swarming": { + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", + "os": "Mac-13.4.1" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_egl_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_egl_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "--use-angle=gl", + "--flaky-retries=2" + ], + "merge": { + "script": "//scripts/angle_deqp_test_merge.py" + }, + "name": "angle_deqp_gles2_gl_tests", + "swarming": { + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", + "os": "Mac-13.4.1" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_gles2_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles2_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "--use-angle=metal", + "--flaky-retries=2" + ], + "merge": { + "script": "//scripts/angle_deqp_test_merge.py" + }, + "name": "angle_deqp_gles2_metal_tests", + "swarming": { + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", + "os": "Mac-13.4.1" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_gles2_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles2_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "--use-angle=gl", + "--flaky-retries=2" + ], + "merge": { + "script": "//scripts/angle_deqp_test_merge.py" + }, + "name": "angle_deqp_gles3_gl_tests", + "swarming": { + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", + "os": "Mac-13.4.1" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "angle_deqp_gles3_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "--use-angle=metal", + "--flaky-retries=2" + ], + "merge": { + "script": "//scripts/angle_deqp_test_merge.py" + }, + "name": "angle_deqp_gles3_metal_tests", + "swarming": { + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", + "os": "Mac-13.4.1" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "angle_deqp_gles3_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "--gtest_filter=-*Vulkan_SwiftShader*", + "--flaky-retries=2" + ], + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", + "os": "Mac-13.4.1" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "angle_end2end_tests", + "test_id_prefix": "ninja://src/tests:angle_end2end_tests/", + "use_isolated_scripts_api": true + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", + "os": "Mac-13.4.1" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_unittests", + "test_id_prefix": "ninja://src/tests:angle_unittests/", + "use_isolated_scripts_api": true + } + ] + }, "mac-intel": { "gtest_tests": [ { diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index d36476455..e349df9a7 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -236,6 +236,7 @@ 'mac_mini_intel_gpu_experimental', ], 'test_suites': { + 'gtest_tests': 'mac_amd_and_intel_gtests', }, }, 'mac-intel': {