Add DevTools browser_tests

Bug: chromium:1086891 Change-Id: Ieaccbe5ba6a7d7d59e547696ba936803ad009016 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2216654 Commit-Queue: Liviu Rau <liviurau@chromium.org> Reviewed-by: Michael Achenbach <machenbach@chromium.org> Cr-Commit-Position: refs/heads/master@{#774602}
qweri0p · Jun 3, 2020 · ef743dd · ef743dd
1 parent 5a5853a
commit ef743dd
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 1 deletion.
diff --git a/testing/buildbot/client.devtools-frontend.integration.json b/testing/buildbot/client.devtools-frontend.integration.json
@@ -23,6 +23,27 @@
         },
         "test": "blink_unittests",
         "test_id_prefix": "ninja://third_party/blink/renderer/controller:blink_unittests/"
+      },
+      {
+        "args": [
+          "--gtest_filter=*DevTools*"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "name": "devtools_browser_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Ubuntu-16.04"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "browser_tests",
+        "test_id_prefix": "ninja://chrome/test:browser_tests/"
       }
     ],
     "isolated_scripts": [

diff --git a/testing/buildbot/devtools-frontend.ci.json b/testing/buildbot/devtools-frontend.ci.json
@@ -23,6 +23,27 @@
         },
         "test": "blink_unittests",
         "test_id_prefix": "ninja://third_party/blink/renderer/controller:blink_unittests/"
+      },
+      {
+        "args": [
+          "--gtest_filter=*DevTools*"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "name": "devtools_browser_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Ubuntu-16.04"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "browser_tests",
+        "test_id_prefix": "ninja://chrome/test:browser_tests/"
       }
     ],
     "isolated_scripts": [

diff --git a/testing/buildbot/devtools-frontend.try.json b/testing/buildbot/devtools-frontend.try.json
@@ -2,6 +2,29 @@
   "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
   "AAAAA2 See generate_buildbot_json.py to make changes": {},
   "devtools_frontend_linux_blink_light_rel": {
+    "gtest_tests": [
+      {
+        "args": [
+          "--gtest_filter=*DevTools*"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "name": "devtools_browser_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Ubuntu-16.04"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "browser_tests",
+        "test_id_prefix": "ninja://chrome/test:browser_tests/"
+      }
+    ],
     "isolated_scripts": [
       {
         "args": [

diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
@@ -1167,6 +1167,18 @@
       },
     },
 
+    'devtools_browser_tests' : {
+      'devtools_browser_tests': {
+        'args': [
+          '--gtest_filter=*DevTools*',
+        ],
+        'swarming': {
+          'shards': 1,
+        },
+        'test': 'browser_tests',
+      }
+    },
+
     'devtools_webkit_isolated_scripts': {
       'blink_web_tests': {
         # layout test failures are retried 3 times when '--test-list' is not
@@ -4372,6 +4384,11 @@
       'cronet_sizes',
     ],
 
+    'devtools_gtests': [
+      'devtools_browser_tests',
+      'layout_ng_gtests',
+    ],
+
     # BEGIN composition test suites used by the GPU bots
 
     'gpu_angle_and_desktop_representative_perf_fyi_isolated_scripts': [

diff --git a/testing/buildbot/tryserver.devtools-frontend.json b/testing/buildbot/tryserver.devtools-frontend.json
@@ -2,6 +2,29 @@
   "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
   "AAAAA2 See generate_buildbot_json.py to make changes": {},
   "devtools_frontend_linux_blink_light_rel": {
+    "gtest_tests": [
+      {
+        "args": [
+          "--gtest_filter=*DevTools*"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "name": "devtools_browser_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Ubuntu-16.04"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "browser_tests",
+        "test_id_prefix": "ninja://chrome/test:browser_tests/"
+      }
+    ],
     "isolated_scripts": [
       {
         "args": [

diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
@@ -4807,7 +4807,7 @@
           'linux-xenial',
         ],
         'test_suites': {
-          'gtest_tests': 'layout_ng_gtests',
+          'gtest_tests': 'devtools_gtests',
           'isolated_scripts': 'devtools_webkit_isolated_scripts',
         },
       },
@@ -5106,6 +5106,7 @@
           'linux-xenial',
         ],
         'test_suites': {
+          'gtest_tests': 'devtools_browser_tests',
           'isolated_scripts': 'devtools_webkit_isolated_scripts',
         },
       },