Add GPU CrOS gtests

Adds most of the standard GPU gtests to the GPU CrOS builders. Several
test suites are left omitted for now due to widespread failures in them.

Bug: 1080424, 1087590, 1087567, 1087563, 1087558, 1087552
Change-Id: I5055d870d445f13fafa626f2d2d8a40afae8b654
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2219227Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Austin Tankiang <austinct@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#775255}

chrome/browser/chromeos/file_manager/file_tasks_browsertest.cc

@@ -86,7 +86,7 @@ void VerifyTasks(int* remaining,
       << " for extension: " << expectation.file_extensions;
 
   // Verify no other task is set as default.
-  EXPECT_EQ(1u,
+  EXPECT_EQ(1,
             std::count_if(result->begin(), result->end(),
                           [](const auto& task) { return task.is_default(); }))
       << expectation.file_extensions;

testing/buildbot/chromium.ci.json

@@ -16511,6 +16511,33 @@
     "additional_compile_targets": [
       "chromiumos_preflight"
     ],
+    "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.template"
+            }
+          ],
+          "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": [
       {
         "args": [
@@ -16873,6 +16900,37 @@
     "additional_compile_targets": [
       "chromiumos_preflight"
     ],
+    "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": "chrome-cros-dut.template"
+            }
+          ],
+          "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": [
       {
         "args": [

testing/buildbot/chromium.gpu.fyi.json

@@ -7382,6 +7382,33 @@
     "additional_compile_targets": [
       "chromiumos_preflight"
     ],
+    "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.template"
+            }
+          ],
+          "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": [
       {
         "args": [
@@ -7744,6 +7771,37 @@
     "additional_compile_targets": [
       "chromiumos_preflight"
     ],
+    "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": "chrome-cros-dut.template"
+            }
+          ],
+          "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": [
       {
         "args": [

testing/buildbot/test_suites.pyl

@@ -4617,6 +4617,27 @@
       'gpu_webgl2_conformance_validating_telemetry_tests',
     ],
 
+    # TODO(crbug.com/1080424): Merge with an existing set of tests such as
+    # gpu_fyi_linux_release_gtests once all CrOS tests have been enabled.
+    'gpu_fyi_chromeos_release_gtests': [
+      # TODO(crbug.com/1087552): Enable once these stop crashing.
+      # 'gpu_angle_end2end_gtests',
+      'gpu_angle_unit_gtests',
+      # TODO(crbug.com/1087558): Decide if we want to actually fix/enable these
+      # tests on CrOS.
+      # 'gpu_angle_white_box_gtests',
+      # TODO(crbug.com/1087567, crbug.com/1087590): Enable once there are tests
+      # that actually pass.
+      # 'gpu_common_gtests',
+      # TODO(crbug.com/1087563): Enable once tab_capture_end2end_tests passes
+      # on CrOS.
+      # 'gpu_desktop_specific_gtests',
+      # CrOS should always have GL, and thus not fall back to SwiftShader. It's
+      # currently unclear if we want to bother running any SwiftShader tests on
+      # CrOS since it should never actually get used.
+      # 'gpu_swiftshader_gtests',
+    ],
+
     # TODO(crbug.com/1080424): Merge with an existing set of tests such as
     # gpu_fyi_linux_intel_and_nvidia_release_telemetry_tests once all CrOS tests
     # have been enabled.

testing/buildbot/waterfalls.pyl

@@ -3211,6 +3211,7 @@
           'chromeos-amd64-generic',
         ],
         'test_suites': {
+          'gtest_tests': 'gpu_fyi_chromeos_release_gtests',
           'gpu_telemetry_tests': 'gpu_fyi_chromeos_release_telemetry_tests',
         },
       },
@@ -3226,6 +3227,7 @@
           'limited_capacity_bot',
         ],
         'test_suites': {
+          'gtest_tests': 'gpu_fyi_chromeos_release_gtests',
           'gpu_telemetry_tests': 'gpu_fyi_chromeos_release_telemetry_tests',
         },
       },