Commit 8898fe3c authored by Jamie Madill's avatar Jamie Madill Committed by Commit Bot

Run ANGLE white box and GLES1 tests standalone.

Also separates out GLES 1 tests into its own definition.

Bug: angleproject:5124
Change-Id: Id0936d7b5e835ac48f621df2ac0620b40e3e70a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2469518Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816867}
parent d40a227a
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -156,11 +156,6 @@ ...@@ -156,11 +156,6 @@
"label": "//third_party/angle/src/tests:angle_end2end_tests", "label": "//third_party/angle/src/tests:angle_end2end_tests",
"type": "windowed_test_launcher", "type": "windowed_test_launcher",
}, },
"angle_gles1_conformance_tests": {
"args": [],
"label": "//third_party/angle/src/tests:angle_gles1_conformance_tests",
"type": "windowed_test_launcher",
},
"angle_perftests": { "angle_perftests": {
"args": [ "args": [
"angle_perftests", "angle_perftests",
...@@ -182,11 +177,6 @@ ...@@ -182,11 +177,6 @@
"label": "//third_party/angle/src/tests:angle_unittests", "label": "//third_party/angle/src/tests:angle_unittests",
"type": "console_test_launcher", "type": "console_test_launcher",
}, },
"angle_white_box_tests": {
"args": [],
"label": "//third_party/angle/src/tests:angle_white_box_tests",
"type": "windowed_test_launcher",
},
"app_list_unittests": { "app_list_unittests": {
"label": "//ash/app_list:app_list_unittests", "label": "//ash/app_list:app_list_unittests",
"type": "windowed_test_launcher", "type": "windowed_test_launcher",
...@@ -1546,11 +1536,21 @@ ...@@ -1546,11 +1536,21 @@
"script": "//third_party/angle/scripts/run_gtest_angle_test.py", "script": "//third_party/angle/scripts/run_gtest_angle_test.py",
"type": "script", "type": "script",
}, },
"standalone_angle_gles1_conformance_tests": {
"label": "//third_party/angle/src/tests:standalone_angle_gles1_conformance_tests",
"script": "//third_party/angle/scripts/run_gtest_angle_test.py",
"type": "script",
},
"standalone_angle_unittests": { "standalone_angle_unittests": {
"label": "//third_party/angle/src/tests:standalone_angle_unittests", "label": "//third_party/angle/src/tests:standalone_angle_unittests",
"script": "//third_party/angle/scripts/run_gtest_angle_test.py", "script": "//third_party/angle/scripts/run_gtest_angle_test.py",
"type": "script", "type": "script",
}, },
"standalone_angle_white_box_tests": {
"label": "//third_party/angle/src/tests:standalone_angle_white_box_tests",
"script": "//third_party/angle/scripts/run_gtest_angle_test.py",
"type": "script",
},
"storage_unittests": { "storage_unittests": {
"label": "//storage:storage_unittests", "label": "//storage:storage_unittests",
"type": "console_test_launcher", "type": "console_test_launcher",
......
...@@ -82,16 +82,6 @@ ...@@ -82,16 +82,6 @@
'Linux FYI GPU TSAN Release', # crbug.com/950542 'Linux FYI GPU TSAN Release', # crbug.com/950542
], ],
}, },
'angle_white_box_tests': {
'remove_from': [
# https://crbug.com/1035178
'Win10 FYI x64 Release (AMD RX 550)',
# https://crbug.com/1035461
'Linux FYI GPU TSAN Release',
# https://crbug.com/1094629
'Linux FYI Release (AMD R7 240)',
],
},
'blink_platform_unittests': { 'blink_platform_unittests': {
'modifications': { 'modifications': {
# TODO(crbug.com/1108121): Remove this filter # TODO(crbug.com/1108121): Remove this filter
...@@ -2552,6 +2542,16 @@ ...@@ -2552,6 +2542,16 @@
}, },
}, },
}, },
'standalone_angle_white_box_tests': {
'remove_from': [
# https://crbug.com/1035178
'Win10 FYI x64 Release (AMD RX 550)',
# https://crbug.com/1035461
'Linux FYI GPU TSAN Release',
# https://crbug.com/1094629
'Linux FYI Release (AMD R7 240)',
],
},
'storage_service_content_browsertests': { 'storage_service_content_browsertests': {
'modifications': { 'modifications': {
'Linux Tests (dbg)(1)': { 'Linux Tests (dbg)(1)': {
......
...@@ -1977,6 +1977,22 @@ ...@@ -1977,6 +1977,22 @@
}, },
}, },
'gpu_angle_gles1_conformance_gtests': {
'standalone_angle_gles1_conformance_tests': {
'android_args': [
'--shard-timeout=180',
'-v',
],
'args': [
'standalone_angle_gles1_conformance_tests',
],
'desktop_args': [
'--bot-mode',
],
'use_isolated_scripts_api': True,
},
},
# Actually uploads results to the perf dashboard # Actually uploads results to the perf dashboard
'gpu_angle_perf_isolated_scripts': { 'gpu_angle_perf_isolated_scripts': {
'angle_perftests': { 'angle_perftests': {
...@@ -2054,14 +2070,18 @@ ...@@ -2054,14 +2070,18 @@
# TODO(ynovikov): the old generator script said the white box # TODO(ynovikov): the old generator script said the white box
# tests are supposed to run everywhere angle_end2end_tests do, but # tests are supposed to run everywhere angle_end2end_tests do, but
# they actually ran only on Windows and Linux. # they actually ran only on Windows and Linux.
'angle_white_box_tests': { 'standalone_angle_white_box_tests': {
'android_args': [
'--shard-timeout=180',
'-v',
],
'args': [
'standalone_angle_white_box_tests',
],
'desktop_args': [ 'desktop_args': [
# ANGLE test retries deliberately disabled to prevent flakiness. '--bot-mode',
# http://crbug.com/669196
'--test-launcher-retry-limit=0'
], ],
'linux_args': ['--no-xvfb'], 'use_isolated_scripts_api': True,
'should_retry_with_patch': False,
}, },
}, },
...@@ -2303,10 +2323,6 @@ ...@@ -2303,10 +2323,6 @@
}, },
'gpu_fyi_and_optional_win_specific_gtests': { 'gpu_fyi_and_optional_win_specific_gtests': {
'angle_gles1_conformance_tests': {
'args': ['--use-gpu-in-tests'],
'linux_args': ['--no-xvfb'],
},
'gles2_conform_d3d9_test': { 'gles2_conform_d3d9_test': {
'args': [ 'args': [
'--use-gpu-in-tests', '--use-gpu-in-tests',
...@@ -5050,6 +5066,7 @@ ...@@ -5050,6 +5066,7 @@
'gpu_angle_win_gtests': [ 'gpu_angle_win_gtests': [
'gpu_angle_end2end_gtests', 'gpu_angle_end2end_gtests',
'gpu_angle_gles1_conformance_gtests',
'gpu_angle_unit_gtests', 'gpu_angle_unit_gtests',
'gpu_angle_white_box_gtests', 'gpu_angle_white_box_gtests',
'gpu_fyi_and_optional_win_specific_gtests', 'gpu_fyi_and_optional_win_specific_gtests',
...@@ -5327,6 +5344,7 @@ ...@@ -5327,6 +5344,7 @@
'gpu_fyi_win7_gtests': [ 'gpu_fyi_win7_gtests': [
'gpu_angle_end2end_gtests', 'gpu_angle_end2end_gtests',
'gpu_angle_gles1_conformance_gtests',
'gpu_angle_unit_gtests', 'gpu_angle_unit_gtests',
'gpu_angle_white_box_gtests', 'gpu_angle_white_box_gtests',
'gpu_common_gtests_passthrough', 'gpu_common_gtests_passthrough',
...@@ -5348,6 +5366,7 @@ ...@@ -5348,6 +5366,7 @@
'gpu_fyi_win_gtests': [ 'gpu_fyi_win_gtests': [
'gpu_angle_end2end_gtests', 'gpu_angle_end2end_gtests',
'gpu_angle_gles1_conformance_gtests',
'gpu_angle_unit_gtests', 'gpu_angle_unit_gtests',
'gpu_angle_white_box_gtests', 'gpu_angle_white_box_gtests',
'gpu_common_gtests_passthrough', 'gpu_common_gtests_passthrough',
...@@ -5384,6 +5403,7 @@ ...@@ -5384,6 +5403,7 @@
'gpu_fyi_win_optional_gtests': [ 'gpu_fyi_win_optional_gtests': [
'gpu_angle_end2end_gtests', 'gpu_angle_end2end_gtests',
'gpu_angle_gles1_conformance_gtests',
'gpu_angle_white_box_gtests', 'gpu_angle_white_box_gtests',
'gpu_default_and_optional_win_specific_gtests', 'gpu_default_and_optional_win_specific_gtests',
'gpu_fyi_and_optional_non_linux_gtests', 'gpu_fyi_and_optional_non_linux_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