Updated ARM test specs

Since chromium and chromium_trybot recipes expect different test spec file
format, chromium_arm.json cannot be used by chromium isolate, so duplicating
the test spec in chromium.fyi.json. Also we might want different set of tests
in these recipes.

Test spec may have compile targets. Had to change chromium_arm.json and
chromium_trybot.json format to include them. For backward compatibility,
chromium_trybot recipe will continue accepting an array as a test spec, until
this is committed. After that the old format support will be removed.

Removed cmd line args from chromium_arm.json because at the moment they
cannot be transferred to a tester with the current infrastructure.

Removed descriptions (comments) from test specs per phajdan.jr's
request.

R=phajdan.jr@chromium.org, vadimsh@chromium.org
BUG=359338

Review URL: https://codereview.chromium.org/297303012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273746 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 137 insertions, 129 deletions

diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 99a9438..e095438 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -202,5 +202,13 @@
       "mojo_system_unittests",
       "nacl_loader_unittests"
     ]
+  },
+  "Linux ARM Cross-Compile": {
+    "compile_targets": [
+      "browser_tests_run"
+    ],
+    "gtest_tests": [
+      "browser_tests"
+    ]
   }
 }
diff --git a/testing/buildbot/chromium_arm.json b/testing/buildbot/chromium_arm.json
index 07a5c21..5eda562 100644
--- a/testing/buildbot/chromium_arm.json
+++ b/testing/buildbot/chromium_arm.json
@@ -1,10 +1,8 @@
-[
-  {
-    "description": ["These tests will be run on an ARM device, which is fairly",
-                    "slow, that's why we run a much smaller set of tests.",
-                    "We run NaCl tests specifically because NaCl contains",
-                    "a lot of architecture-specific code"],
-    "test": "browser_tests",
-    "args": "--gtest-filter='*NaCl*'"
-  }
-]
+{
+  "compile_targets": [
+    "browser_tests_run"
+  ],
+  "gtest_tests": [
+    "browser_tests"
+  ]
+}
diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json
index c0bf60e..62bda2c 100644
--- a/testing/buildbot/chromium_trybot.json
+++ b/testing/buildbot/chromium_trybot.json
@@ -1,119 +1,121 @@
-[
-  "accessibility_unittests",
-  "app_list_unittests",
-  "base_unittests",
-  {
-    "test": "browser_tests",
-    "exclude_builders": ["tryserver.chromium:win_chromium_x64_rel"]
-  },
-  "cacheinvalidation_unittests",
-  "cc_unittests",
-  "chromedriver_unittests",
-  "components_unittests",
-  "content_browsertests",
-  "content_unittests",
-  "crypto_unittests",
-  "device_unittests",
-  "events_unittests",
-  "gcm_unit_tests",
-  "gfx_unittests",
-  "google_apis_unittests",
-  "gpu_unittests",
-  {
-    "test": "interactive_ui_tests",
-    "exclude_builders": ["tryserver.chromium:win_chromium_x64_rel"]
-  },
-  "ipc_tests",
-  "jingle_unittests",
-  {
-    "test": "keyboard_unittests",
-    "platforms": ["linux", "win"]
-  },
-  "media_unittests",
-  "message_center_unittests",
-  "mojo_apps_js_unittests",
-  "mojo_common_unittests",
-  "mojo_js_unittests",
-  "mojo_public_bindings_unittests",
-  "mojo_public_environment_unittests",
-  "mojo_public_system_unittests",
-  "mojo_public_utility_unittests",
-  "mojo_service_manager_unittests",
-  "mojo_system_unittests",
-  {
-    "test": "nacl_loader_unittests",
-    "platforms": ["linux"]
-  },
-  "net_unittests",
-  "ppapi_unittests",
-  "printing_unittests",
-  "remoting_unittests",
-  "sql_unittests",
-  "sync_integration_tests",
-  "sync_unit_tests",
-  "ui_unittests",
-  "unit_tests",
-  {
-    "test": "app_shell_browsertests",
-    "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
-  },
-  {
-    "test": "ash_unittests",
-    "chromium_configs": ["chromium_chromeos"]
-  },
-  {
-    "test": "ash_unittests",
-    "platforms": ["win"]
-  },
-  {
-    "test": "aura_unittests",
-    "platforms": ["linux", "win"]
-  },
-  {
-    "test": "mojo_view_manager_unittests",
-    "platforms": ["linux"]
-  },
-  {
-    "test": "sandbox_linux_unittests",
-    "platforms": ["linux"],
-    "args": ["--test-launcher-print-test-stdio=always"]
-  },
-  {
-    "test": "sandbox_mac_unittests",
-    "platforms": ["mac"]
-  },
-  {
-    "test": "views_unittests",
-    "platforms": ["win"]
-  },
-  {
-    "test": "views_unittests",
-    "platforms": ["linux"],
-    "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
-  },
-  {
-    "test": "chromeos_unittests",
-    "platforms": ["linux"],
-    "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
-  },
-  {
-    "test": "ash_unittests",
-    "platforms": ["linux"],
-    "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
-  },
-  {
-    "test": "dbus_unittests",
-    "platforms": ["linux"],
-    "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
-  },
-  {
-    "test": "aura_unittests",
-    "platforms": ["linux"],
-    "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
-  },
-  {
-    "test": "wm_unittests",
-    "platforms": ["linux"],
-    "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
-  }
-]
+{
+  "gtest_tests": [
+    "accessibility_unittests",
+    "app_list_unittests",
+    "base_unittests",
+    {
+      "test": "browser_tests",
+      "exclude_builders": ["tryserver.chromium:win_chromium_x64_rel"]
+    },
+    "cacheinvalidation_unittests",
+    "cc_unittests",
+    "chromedriver_unittests",
+    "components_unittests",
+    "content_browsertests",
+    "content_unittests",
+    "crypto_unittests",
+    "device_unittests",
+    "events_unittests",
+    "gcm_unit_tests",
+    "gfx_unittests",
+    "google_apis_unittests",
+    "gpu_unittests",
+    {
+      "test": "interactive_ui_tests",
+      "exclude_builders": ["tryserver.chromium:win_chromium_x64_rel"]
+    },
+    "ipc_tests",
+    "jingle_unittests",
+    {
+      "test": "keyboard_unittests",
+      "platforms": ["linux", "win"]
+    },
+    "media_unittests",
+    "message_center_unittests",
+    "mojo_apps_js_unittests",
+    "mojo_common_unittests",
+    "mojo_js_unittests",
+    "mojo_public_bindings_unittests",
+    "mojo_public_environment_unittests",
+    "mojo_public_system_unittests",
+    "mojo_public_utility_unittests",
+    "mojo_service_manager_unittests",
+    "mojo_system_unittests",
+    {
+      "test": "nacl_loader_unittests",
+      "platforms": ["linux"]
+    },
+    "net_unittests",
+    "ppapi_unittests",
+    "printing_unittests",
+    "remoting_unittests",
+    "sql_unittests",
+    "sync_integration_tests",
+    "sync_unit_tests",
+    "ui_unittests",
+    "unit_tests",
+    {
+      "test": "app_shell_browsertests",
+      "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
+    },
+    {
+      "test": "ash_unittests",
+      "chromium_configs": ["chromium_chromeos"]
+    },
+    {
+      "test": "ash_unittests",
+      "platforms": ["win"]
+    },
+    {
+      "test": "aura_unittests",
+      "platforms": ["linux", "win"]
+    },
+    {
+      "test": "mojo_view_manager_unittests",
+      "platforms": ["linux"]
+    },
+    {
+      "test": "sandbox_linux_unittests",
+      "platforms": ["linux"],
+      "args": ["--test-launcher-print-test-stdio=always"]
+    },
+    {
+      "test": "sandbox_mac_unittests",
+      "platforms": ["mac"]
+    },
+    {
+      "test": "views_unittests",
+      "platforms": ["win"]
+    },
+    {
+      "test": "views_unittests",
+      "platforms": ["linux"],
+      "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
+    },
+    {
+      "test": "chromeos_unittests",
+      "platforms": ["linux"],
+      "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
+    },
+    {
+      "test": "ash_unittests",
+      "platforms": ["linux"],
+      "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
+    },
+    {
+      "test": "dbus_unittests",
+      "platforms": ["linux"],
+      "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
+    },
+    {
+      "test": "aura_unittests",
+      "platforms": ["linux"],
+      "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
+    },
+    {
+      "test": "wm_unittests",
+      "platforms": ["linux"],
+      "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
+    }
+  ]
+}