Update rgb-565-no-depth-no-stencil test suite names
Replace the "-" with "_" in the test suite names
to be consistent with other test suite name formats.
Bug: b/297901032
Change-Id: Idbfc1bc7aa7cef4382e3cdd3e223db28f414f15e
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4968792
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
diff --git a/infra/specs/angle.json b/infra/specs/angle.json
index d6a8009..6a675d0 100644
--- a/infra/specs/angle.json
+++ b/infra/specs/angle.json
@@ -66,7 +66,7 @@
"merge": {
"script": "//scripts/angle_deqp_test_merge.py"
},
- "name": "angle_deqp_gles31_565-no-depth-no-stencil_vulkan_tests",
+ "name": "angle_deqp_gles31_565_no_depth_no_stencil_vulkan_tests",
"swarming": {
"containment_type": "AUTO",
"dimensions": {
@@ -79,8 +79,8 @@
"expiration": 21600,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
- "test": "angle_deqp_gles31_565-no-depth-no-stencil_tests",
- "test_id_prefix": "ninja://src/tests:angle_deqp_gles31_565-no-depth-no-stencil_tests/",
+ "test": "angle_deqp_gles31_565_no_depth_no_stencil_tests",
+ "test_id_prefix": "ninja://src/tests:angle_deqp_gles31_565_no_depth_no_stencil_tests/",
"use_isolated_scripts_api": true
},
{
@@ -145,7 +145,7 @@
"merge": {
"script": "//scripts/angle_deqp_test_merge.py"
},
- "name": "angle_deqp_gles3_565-no-depth-no-stencil_vulkan_tests",
+ "name": "angle_deqp_gles3_565_no_depth_no_stencil_vulkan_tests",
"swarming": {
"containment_type": "AUTO",
"dimensions": {
@@ -158,8 +158,8 @@
"expiration": 21600,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
- "test": "angle_deqp_gles3_565-no-depth-no-stencil_tests",
- "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_565-no-depth-no-stencil_tests/",
+ "test": "angle_deqp_gles3_565_no_depth_no_stencil_tests",
+ "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_565_no_depth_no_stencil_tests/",
"use_isolated_scripts_api": true
},
{
@@ -733,7 +733,7 @@
"merge": {
"script": "//scripts/angle_deqp_test_merge.py"
},
- "name": "angle_deqp_gles31_565-no-depth-no-stencil_vulkan_tests",
+ "name": "angle_deqp_gles31_565_no_depth_no_stencil_vulkan_tests",
"swarming": {
"containment_type": "AUTO",
"dimensions": {
@@ -745,8 +745,8 @@
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
- "test": "angle_deqp_gles31_565-no-depth-no-stencil_tests",
- "test_id_prefix": "ninja://src/tests:angle_deqp_gles31_565-no-depth-no-stencil_tests/",
+ "test": "angle_deqp_gles31_565_no_depth_no_stencil_tests",
+ "test_id_prefix": "ninja://src/tests:angle_deqp_gles31_565_no_depth_no_stencil_tests/",
"use_isolated_scripts_api": true
},
{
@@ -809,7 +809,7 @@
"merge": {
"script": "//scripts/angle_deqp_test_merge.py"
},
- "name": "angle_deqp_gles3_565-no-depth-no-stencil_vulkan_tests",
+ "name": "angle_deqp_gles3_565_no_depth_no_stencil_vulkan_tests",
"swarming": {
"containment_type": "AUTO",
"dimensions": {
@@ -821,8 +821,8 @@
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
- "test": "angle_deqp_gles3_565-no-depth-no-stencil_tests",
- "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_565-no-depth-no-stencil_tests/",
+ "test": "angle_deqp_gles3_565_no_depth_no_stencil_tests",
+ "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_565_no_depth_no_stencil_tests/",
"use_isolated_scripts_api": true
},
{
@@ -1595,7 +1595,7 @@
"merge": {
"script": "//scripts/angle_deqp_test_merge.py"
},
- "name": "angle_deqp_gles31_565-no-depth-no-stencil_vulkan_tests",
+ "name": "angle_deqp_gles31_565_no_depth_no_stencil_vulkan_tests",
"swarming": {
"containment_type": "AUTO",
"dimensions": {
@@ -1607,8 +1607,8 @@
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
- "test": "angle_deqp_gles31_565-no-depth-no-stencil_tests",
- "test_id_prefix": "ninja://src/tests:angle_deqp_gles31_565-no-depth-no-stencil_tests/",
+ "test": "angle_deqp_gles31_565_no_depth_no_stencil_tests",
+ "test_id_prefix": "ninja://src/tests:angle_deqp_gles31_565_no_depth_no_stencil_tests/",
"use_isolated_scripts_api": true
},
{
@@ -1671,7 +1671,7 @@
"merge": {
"script": "//scripts/angle_deqp_test_merge.py"
},
- "name": "angle_deqp_gles3_565-no-depth-no-stencil_vulkan_tests",
+ "name": "angle_deqp_gles3_565_no_depth_no_stencil_vulkan_tests",
"swarming": {
"containment_type": "AUTO",
"dimensions": {
@@ -1683,8 +1683,8 @@
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
- "test": "angle_deqp_gles3_565-no-depth-no-stencil_tests",
- "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_565-no-depth-no-stencil_tests/",
+ "test": "angle_deqp_gles3_565_no_depth_no_stencil_tests",
+ "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_565_no_depth_no_stencil_tests/",
"use_isolated_scripts_api": true
},
{
diff --git a/infra/specs/gn_isolate_map.pyl b/infra/specs/gn_isolate_map.pyl
index f7bc107..77a7d10 100644
--- a/infra/specs/gn_isolate_map.pyl
+++ b/infra/specs/gn_isolate_map.pyl
@@ -51,8 +51,8 @@
"label": "//src/tests:angle_deqp_gles31_multisample_tests",
"type": "windowed_test_launcher",
},
- "angle_deqp_gles31_565-no-depth-no-stencil_tests": {
- "label": "//src/tests:angle_deqp_gles31_565-no-depth-no-stencil_tests",
+ "angle_deqp_gles31_565_no_depth_no_stencil_tests": {
+ "label": "//src/tests:angle_deqp_gles31_565_no_depth_no_stencil_tests",
"type": "windowed_test_launcher",
},
"angle_deqp_gles3_tests": {
@@ -63,8 +63,8 @@
"label": "//src/tests:angle_deqp_gles3_multisample_tests",
"type": "windowed_test_launcher",
},
- "angle_deqp_gles3_565-no-depth-no-stencil_tests": {
- "label": "//src/tests:angle_deqp_gles3_565-no-depth-no-stencil_tests",
+ "angle_deqp_gles3_565_no_depth_no_stencil_tests": {
+ "label": "//src/tests:angle_deqp_gles3_565_no_depth_no_stencil_tests",
"type": "windowed_test_launcher",
},
"angle_deqp_khr_gles2_tests": {
diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl
index d737a1f..c07dc83 100644
--- a/infra/specs/test_suites.pyl
+++ b/infra/specs/test_suites.pyl
@@ -218,8 +218,8 @@
},
},
- 'angle_deqp_gles31_565-no-depth-no-stencil_vulkan_gtests': {
- 'angle_deqp_gles31_565-no-depth-no-stencil_vulkan_tests':{
+ 'angle_deqp_gles31_565_no_depth_no_stencil_vulkan_gtests': {
+ 'angle_deqp_gles31_565_no_depth_no_stencil_vulkan_tests':{
'args': [
'--use-angle=vulkan',
],
@@ -233,7 +233,7 @@
'merge': {
'script': '//scripts/angle_deqp_test_merge.py',
},
- 'test': 'angle_deqp_gles31_565-no-depth-no-stencil_tests',
+ 'test': 'angle_deqp_gles31_565_no_depth_no_stencil_tests',
'use_isolated_scripts_api': True,
},
},
@@ -376,8 +376,8 @@
},
},
- 'angle_deqp_gles3_565-no-depth-no-stencil_vulkan_gtests': {
- 'angle_deqp_gles3_565-no-depth-no-stencil_vulkan_tests':{
+ 'angle_deqp_gles3_565_no_depth_no_stencil_vulkan_gtests': {
+ 'angle_deqp_gles3_565_no_depth_no_stencil_vulkan_tests':{
'args': [
'--use-angle=vulkan',
],
@@ -391,7 +391,7 @@
'merge': {
'script': '//scripts/angle_deqp_test_merge.py',
},
- 'test': 'angle_deqp_gles3_565-no-depth-no-stencil_tests',
+ 'test': 'angle_deqp_gles3_565_no_depth_no_stencil_tests',
'use_isolated_scripts_api': True,
},
},
@@ -1425,11 +1425,11 @@
'angle_deqp_gles2_vulkan_gtests',
'angle_deqp_gles31_multisample_vulkan_gtests',
'angle_deqp_gles31_vulkan_gtests',
- 'angle_deqp_gles31_565-no-depth-no-stencil_vulkan_gtests',
+ 'angle_deqp_gles31_565_no_depth_no_stencil_vulkan_gtests',
'angle_deqp_gles3_gles_gtests',
'angle_deqp_gles3_multisample_vulkan_gtests',
'angle_deqp_gles3_vulkan_gtests',
- 'angle_deqp_gles3_565-no-depth-no-stencil_vulkan_gtests',
+ 'angle_deqp_gles3_565_no_depth_no_stencil_vulkan_gtests',
'angle_deqp_khr_gles2_vulkan_gtests',
'angle_deqp_khr_gles31_vulkan_gtests',
'angle_deqp_khr_gles32_vulkan_gtests',
@@ -1447,10 +1447,10 @@
'angle_deqp_gles2_vulkan_gtests',
'angle_deqp_gles31_multisample_vulkan_gtests',
'angle_deqp_gles31_vulkan_gtests',
- 'angle_deqp_gles31_565-no-depth-no-stencil_vulkan_gtests',
+ 'angle_deqp_gles31_565_no_depth_no_stencil_vulkan_gtests',
'angle_deqp_gles3_multisample_vulkan_gtests',
'angle_deqp_gles3_vulkan_gtests',
- 'angle_deqp_gles3_565-no-depth-no-stencil_vulkan_gtests',
+ 'angle_deqp_gles3_565_no_depth_no_stencil_vulkan_gtests',
'angle_deqp_khr_gles2_vulkan_gtests',
'angle_deqp_khr_gles31_vulkan_gtests',
'angle_deqp_khr_gles32_vulkan_gtests',
diff --git a/src/tests/BUILD.gn b/src/tests/BUILD.gn
index d685256..9337dce 100644
--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -1530,6 +1530,7 @@
forward_variables_from(invoker, [ "mustpass_suffix" ])
if (mustpass_suffix != "master") {
target_name = "${_api}_${mustpass_suffix}"
+ target_name = string_replace(target_name, "-", "_")
}
angle_deqp_gtest(target_name) {
forward_variables_from(invoker, "*")
@@ -1573,13 +1574,6 @@
mustpass_suffix = "multisample"
}
- angle_deqp_core_gtest("gles3") {
- defines = [ "ANGLE_DEQP_GLES3_565_NO_DEPTH_NO_STENCIL_TESTS" ]
- deps = [ ":angle_deqp_gles3_common" ]
- mustpass_dir = _aosp_gles_mustpass
- mustpass_suffix = "565-no-depth-no-stencil"
- }
-
angle_deqp_core_gtest("gles31") {
defines = [ "ANGLE_DEQP_GLES31_TESTS" ]
deps = [ ":angle_deqp_gles31_common" ]
@@ -1594,13 +1588,6 @@
mustpass_suffix = "multisample"
}
- angle_deqp_core_gtest("gles31") {
- defines = [ "ANGLE_DEQP_GLES31_565_NO_DEPTH_NO_STENCIL_TESTS" ]
- deps = [ ":angle_deqp_gles31_common" ]
- mustpass_dir = _aosp_gles_mustpass
- mustpass_suffix = "565-no-depth-no-stencil"
- }
-
angle_deqp_core_gtest("egl") {
defines = [ "ANGLE_DEQP_EGL_TESTS" ]
sources = deqp_egl_sources
@@ -1608,6 +1595,22 @@
mustpass_suffix = "master"
}
+ if (is_android) {
+ angle_deqp_core_gtest("gles3") {
+ defines = [ "ANGLE_DEQP_GLES3_565_NO_DEPTH_NO_STENCIL_TESTS" ]
+ deps = [ ":angle_deqp_gles3_common" ]
+ mustpass_dir = _aosp_gles_mustpass
+ mustpass_suffix = "565-no-depth-no-stencil"
+ }
+
+ angle_deqp_core_gtest("gles31") {
+ defines = [ "ANGLE_DEQP_GLES31_565_NO_DEPTH_NO_STENCIL_TESTS" ]
+ deps = [ ":angle_deqp_gles31_common" ]
+ mustpass_dir = _aosp_gles_mustpass
+ mustpass_suffix = "565-no-depth-no-stencil"
+ }
+ }
+
# The CTS also includes a set of "KHR" tests that are separate from the main body of dEQP tests.
config("angle_deqp_khr_common_config") {
@@ -1877,8 +1880,8 @@
if (is_android) {
deps += [
- ":angle_deqp_gles31_565-no-depth-no-stencil_tests",
- ":angle_deqp_gles3_565-no-depth-no-stencil_tests",
+ ":angle_deqp_gles31_565_no_depth_no_stencil_tests",
+ ":angle_deqp_gles3_565_no_depth_no_stencil_tests",
]
}
}
diff --git a/src/tests/deqp_support/angle_deqp_gtest.cpp b/src/tests/deqp_support/angle_deqp_gtest.cpp
index f1a1b45..fc96df4 100644
--- a/src/tests/deqp_support/angle_deqp_gtest.cpp
+++ b/src/tests/deqp_support/angle_deqp_gtest.cpp
@@ -93,23 +93,23 @@
{"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles2
{"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles3
{"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles31
- {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles2-khr
- {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles3-khr
- {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles31-khr
- {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles32-khr
- {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles2-khr-noctx
- {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles32-khr-noctx
- {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles32-khr-single
- {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles3-rotate90
- {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles3-rotate180
- {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles3-rotate270
- {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles31-rotate90
- {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles31-rotate180
- {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles31-rotate270
- {"--deqp-gl-config-name=rgba8888d24s8ms4"}, // gles3-multisample
- {"--deqp-gl-config-name=rgb565d0s0ms0"}, // gles3-rgb565-no-depth-no-stencil
- {"--deqp-gl-config-name=rgba8888d24s8ms4"}, // gles31-multisample
- {"--deqp-gl-config-name=rgb565d0s0ms0"}, // gles31-rgb565-no-depth-no-stencil
+ {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles2_khr
+ {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles3_khr
+ {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles31_khr
+ {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles32_khr
+ {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles2_khr_noctx
+ {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles32_khr_noctx
+ {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles32_khr_single
+ {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles3_rotate90
+ {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles3_rotate180
+ {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles3_rotate270
+ {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles31_rotate90
+ {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles31_rotate180
+ {"--deqp-gl-config-name=rgba8888d24s8ms0"}, // gles31_rotate270
+ {"--deqp-gl-config-name=rgba8888d24s8ms4"}, // gles3_multisample
+ {"--deqp-gl-config-name=rgb565d0s0ms0"}, // gles3_rgb565_no_depth_no_stencil
+ {"--deqp-gl-config-name=rgba8888d24s8ms4"}, // gles31_multisample
+ {"--deqp-gl-config-name=rgb565d0s0ms0"}, // gles31_rgb565_no_depth_no_stencil
{"--deqp-gl-config-name=rgba8888d24s8ms4"}, // gl46
};
@@ -135,9 +135,9 @@
"deqp_gles31_rotate_test_expectations.txt",
"deqp_gles31_rotate_test_expectations.txt",
"deqp_gles3_multisample_test_expectations.txt",
- "deqp_gles3_565-no-depth-no-stencil_test_expectations.txt",
+ "deqp_gles3_565_no_depth_no_stencil_test_expectations.txt",
"deqp_gles31_multisample_test_expectations.txt",
- "deqp_gles31_565-no-depth-no-stencil_test_expectations.txt",
+ "deqp_gles31_565_no_depth_no_stencil_test_expectations.txt",
"deqp_gl46_test_expectations.txt",
};
diff --git a/src/tests/deqp_support/deqp_gles31_565-no-depth-no-stencil_test_expectations.txt b/src/tests/deqp_support/deqp_gles31_565_no_depth_no_stencil_test_expectations.txt
similarity index 100%
rename from src/tests/deqp_support/deqp_gles31_565-no-depth-no-stencil_test_expectations.txt
rename to src/tests/deqp_support/deqp_gles31_565_no_depth_no_stencil_test_expectations.txt
diff --git a/src/tests/deqp_support/deqp_gles3_565-no-depth-no-stencil_test_expectations.txt b/src/tests/deqp_support/deqp_gles3_565-no-depth-no-stencil_test_expectations.txt
deleted file mode 100644
index e69de29..0000000
--- a/src/tests/deqp_support/deqp_gles3_565-no-depth-no-stencil_test_expectations.txt
+++ /dev/null
diff --git a/src/tests/deqp_support/deqp_gles31_565-no-depth-no-stencil_test_expectations.txt b/src/tests/deqp_support/deqp_gles3_565_no_depth_no_stencil_test_expectations.txt
similarity index 100%
copy from src/tests/deqp_support/deqp_gles31_565-no-depth-no-stencil_test_expectations.txt
copy to src/tests/deqp_support/deqp_gles3_565_no_depth_no_stencil_test_expectations.txt
