Add angle_white_box_tests to SwANGLE tests

* Added angle_white_box_tests to the following:
  * swangle_gtests
  * swangle_non_deqp_slow_gtests
  * swangle_slow_gtests

Bug: angleproject:7074
Change-Id: I703655d1901a6dc660d5e6b5c4044baf0994205d
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3499200
Commit-Queue: Amirali Abdolrashidi <abdolrashidi@google.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
This commit is contained in:
Amirali Abdolrashidi 2022-03-01 10:36:19 -08:00 коммит произвёл Angle LUCI CQ
Родитель 4a4bb07b22
Коммит 9050cd6425
3 изменённых файлов: 226 добавлений и 2 удалений

Просмотреть файл

@ -2249,6 +2249,36 @@
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://src/tests:angle_end2end_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_white_box_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*",
"--xvfb"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Ubuntu-18.04",
"pool": "chromium.tests.gpu"
}
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_white_box_tests",
"test_id_prefix": "ninja://src/tests:angle_white_box_tests/",
"use_isolated_scripts_api": true
}
],
"isolated_scripts": [
@ -2715,6 +2745,36 @@
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://src/tests:angle_end2end_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_white_box_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*",
"--xvfb"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Ubuntu-18.04",
"pool": "chromium.tests.gpu"
}
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_white_box_tests",
"test_id_prefix": "ninja://src/tests:angle_white_box_tests/",
"use_isolated_scripts_api": true
}
]
},
@ -3144,6 +3204,36 @@
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://src/tests:angle_end2end_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_white_box_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*",
"--xvfb"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Ubuntu-18.04",
"pool": "chromium.tests.gpu"
}
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_white_box_tests",
"test_id_prefix": "ninja://src/tests:angle_white_box_tests/",
"use_isolated_scripts_api": true
}
]
},
@ -3570,6 +3660,36 @@
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://src/tests:angle_end2end_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_white_box_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*",
"--xvfb"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Ubuntu-18.04",
"pool": "chromium.tests.gpu"
}
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_white_box_tests",
"test_id_prefix": "ninja://src/tests:angle_white_box_tests/",
"use_isolated_scripts_api": true
}
]
},
@ -5723,6 +5843,35 @@
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://src/tests:angle_end2end_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_white_box_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_white_box_tests",
"test_id_prefix": "ninja://src/tests:angle_white_box_tests/",
"use_isolated_scripts_api": true
}
],
"isolated_scripts": [
@ -5795,6 +5944,35 @@
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://src/tests:angle_end2end_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_white_box_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_white_box_tests",
"test_id_prefix": "ninja://src/tests:angle_white_box_tests/",
"use_isolated_scripts_api": true
}
]
},
@ -6207,6 +6385,35 @@
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://src/tests:angle_end2end_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"angle_white_box_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_white_box_tests",
"test_id_prefix": "ninja://src/tests:angle_white_box_tests/",
"use_isolated_scripts_api": true
}
]
},

Просмотреть файл

@ -1066,6 +1066,20 @@
},
},
},
'swangle_white_box_tests': {
'angle_white_box_tests': {
'args': [
'angle_white_box_tests',
'--bot-mode',
'--gtest_filter=*Vulkan_SwiftShader*',
],
'linux_args': [
'--xvfb',
],
'use_isolated_scripts_api': True,
},
}
},
'compound_suites': {
@ -1165,10 +1179,12 @@
'swangle_deqp_khr_gles31_tests',
'swangle_deqp_khr_gles3_tests',
'swangle_end2end_tests',
'swangle_white_box_tests',
],
'swangle_non_deqp_slow_gtests': [
'swangle_end2end_slow_tests',
'swangle_white_box_tests',
],
'swangle_slow_gtests': [
@ -1186,6 +1202,7 @@
'swangle_deqp_khr_gles31_tests',
'swangle_deqp_khr_gles3_tests',
'swangle_end2end_tests',
'swangle_white_box_tests',
],
'win10_intel_gtests': [

Просмотреть файл

@ -1,6 +1,6 @@
{
"infra/specs/angle.json":
"df8421426d3943abf2dcbd846d1473db",
"b5a1013f8e2fd8ab316aed5aa7da8076",
"infra/specs/generate_test_spec_json.py":
"a681867b8f71476d07e59516e851ccb4",
"infra/specs/mixins.pyl":
@ -8,7 +8,7 @@
"infra/specs/test_suite_exceptions.pyl":
"723460da84a90884a9668c07a0893390",
"infra/specs/test_suites.pyl":
"51cbdd6ef777d5bd4ed9262a3d886469",
"432839af88149cb09afad9d08093efe2",
"infra/specs/variants.pyl":
"8cfcaa99fa07ad2a2d5d14f220fd5037",
"infra/specs/waterfalls.pyl":