Commit 1bc548ce authored by Jamie Madill's avatar Jamie Madill Committed by Commit Bot

Disable angle_unittests on CrOS device tests.

We don't have the CrOS run wrapper in place to be running these
tests. Diasable them for now.

Bug: 1135720
Bug: angleproject:5124
Change-Id: Iec032e0e5f0364fd9cc70caaac8e7ff726092032
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2454293Reviewed-by: default avatarDirk Pranke <dpranke@google.com>
Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814410}
parent 607b2ea5
...@@ -7810,33 +7810,7 @@ ...@@ -7810,33 +7810,7 @@
"additional_compile_targets": [ "additional_compile_targets": [
"chromiumos_preflight" "chromiumos_preflight"
], ],
"gtest_tests": [ "gtest_tests": [],
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_unittests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_unittests/"
}
],
"isolated_scripts": [ "isolated_scripts": [
{ {
"args": [ "args": [
...@@ -8199,37 +8173,7 @@ ...@@ -8199,37 +8173,7 @@
"additional_compile_targets": [ "additional_compile_targets": [
"chromiumos_preflight" "chromiumos_preflight"
], ],
"gtest_tests": [ "gtest_tests": [],
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"device_type": "kevin",
"os": "ChromeOS",
"pool": "chromium.tests"
}
],
"expiration": 21600,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_unittests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_unittests/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
}
],
"isolated_scripts": [ "isolated_scripts": [
{ {
"args": [ "args": [
...@@ -5127,7 +5127,8 @@ ...@@ -5127,7 +5127,8 @@
'gpu_fyi_chromeos_release_gtests': [ 'gpu_fyi_chromeos_release_gtests': [
# TODO(crbug.com/1087552): Enable once these stop crashing. # TODO(crbug.com/1087552): Enable once these stop crashing.
# 'gpu_angle_end2end_gtests', # 'gpu_angle_end2end_gtests',
'gpu_angle_unit_gtests', # TODO(crbug.com/1135720): Missing cros wrapper script.
# 'gpu_angle_unit_gtests',
# TODO(crbug.com/1087558): Decide if we want to actually fix/enable these # TODO(crbug.com/1087558): Decide if we want to actually fix/enable these
# tests on CrOS. # tests on CrOS.
# 'gpu_angle_white_box_gtests', # 'gpu_angle_white_box_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