summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Abd-El-Malek <jam@chromium.org>2014-09-24 17:53:33 -0700
committerJohn Abd-El-Malek <jam@chromium.org>2014-09-25 00:54:19 +0000
commitaae4fd5130bb5dfeb47ba33b82cdd6c8cfa4ef71 (patch)
tree0b2b8b107b02ee7ec89cae183202e8707729cd04
parentf1c60439c4f0eecf559eec4324f9ddeaee039f99 (diff)
downloadchromium_src-aae4fd5130bb5dfeb47ba33b82cdd6c8cfa4ef71.zip
chromium_src-aae4fd5130bb5dfeb47ba33b82cdd6c8cfa4ef71.tar.gz
chromium_src-aae4fd5130bb5dfeb47ba33b82cdd6c8cfa4ef71.tar.bz2
Don't swarm Ozone builds. Apparently they need specific graphics drivers and hardware.
Output: Failed to load ../out/Release/xdisplaycheck with cwd=/tmp/run_tha_testSvCWuD/chrome Xvfb exited, code 1 Xvfb output: > > Fatal server error: > Server is already active for display 9 > If this server is no longer running, remove /tmp/.X9-lock > and start again. > BUG=414808 TBR=phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/600283002 Cr-Commit-Position: refs/heads/master@{#296598}
-rw-r--r--testing/buildbot/chromium.chromiumos.json55
1 files changed, 9 insertions, 46 deletions
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index d648370..2ffaf16 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -90,34 +90,10 @@
"gtest_tests": [
"accessibility_unittests",
"ash_unittests",
- {
- "test": "base_unittests",
- "swarming": {
- "can_use_on_swarming_builders": true
- }
- },
- {
- "test": "browser_tests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "shards": 5
- }
- },
+ "base_unittests",
"cacheinvalidation_unittests",
"chromeos_unittests",
"components_unittests",
- {
- "test": "content_browsertests",
- "swarming": {
- "can_use_on_swarming_builders": true
- }
- },
- {
- "test": "content_unittests",
- "swarming": {
- "can_use_on_swarming_builders": true
- }
- },
"crypto_unittests",
"dbus_unittests",
"display_unittests",
@@ -125,23 +101,12 @@
"gcm_unit_tests",
"google_apis_unittests",
"gpu_unittests",
- {
- "test": "interactive_ui_tests",
- "swarming": {
- "can_use_on_swarming_builders": true
- }
- },
"url_unittests",
"jingle_unittests",
"content_unittests",
"device_unittests",
"media_unittests",
- {
- "test": "net_unittests",
- "swarming": {
- "can_use_on_swarming_builders": true
- }
- },
+ "net_unittests",
"ozone_unittests",
"ppapi_unittests",
"printing_unittests",
@@ -157,21 +122,19 @@
"events_unittests",
"ipc_tests",
"sync_unit_tests",
- {
- "test": "unit_tests",
- "swarming": {
- "can_use_on_swarming_builders": true
- }
- },
+ "unit_tests",
"sql_unittests",
"nacl_loader_unittests",
- "athena_unittests",
- "app_shell_browsertests",
- "chromevox_tests"
+ "athena_unittests"
]
},
"Linux ChromiumOS Ozone Tests (2)": {
"gtest_tests": [
+ "interactive_ui_tests",
+ "browser_tests",
+ "content_browsertests",
+ "app_shell_browsertests",
+ "chromevox_tests"
]
},
"Linux ChromiumOS Tests (dbg)(1)": {