diff options
author | reillyg <reillyg@chromium.org> | 2015-06-30 17:00:06 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-01 00:00:52 +0000 |
commit | b740ceb41acd9e8279638743a9e7d09a0e7ae7d3 (patch) | |
tree | 9a424be2195a6acb16bddbe9c158eeac2f0dffcb | |
parent | 25614a51c26a6e5da0956c86772f4302f298b793 (diff) | |
download | chromium_src-b740ceb41acd9e8279638743a9e7d09a0e7ae7d3.zip chromium_src-b740ceb41acd9e8279638743a9e7d09a0e7ae7d3.tar.gz chromium_src-b740ceb41acd9e8279638743a9e7d09a0e7ae7d3.tar.bz2 |
Convert chromeos_unittests to run exclusively on Swarming
0 configs already ran on Swarming
6 used to run locally and were converted:
- chromium.chromiumos.json: Linux ChromiumOS Ozone Tests (1)
- chromium.chromiumos.json: Linux ChromiumOS Tests (1)
- chromium.chromiumos.json: Linux ChromiumOS Tests (dbg)(1)
- chromium.memory.json: Linux Chromium OS ASan LSan Tests (1)
- chromium.webkit.json: Linux ChromiumOS Tests (1)
- chromium.webkit.json: Linux ChromiumOS Tests (dbg)(1)
Ran:
./manage.py --convert chromeos_unittests
BUG=98637
Review URL: https://codereview.chromium.org/1219123002
Cr-Commit-Position: refs/heads/master@{#336926}
-rw-r--r-- | chromeos/chromeos.gyp | 19 | ||||
-rw-r--r-- | chromeos/chromeos_unittests.isolate | 25 | ||||
-rw-r--r-- | testing/buildbot/chromium.chromiumos.json | 9 | ||||
-rw-r--r-- | testing/buildbot/chromium.memory.json | 3 | ||||
-rw-r--r-- | testing/buildbot/chromium.webkit.json | 6 |
5 files changed, 62 insertions, 0 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp index 9a4ad3c..f5b3db0 100644 --- a/chromeos/chromeos.gyp +++ b/chromeos/chromeos.gyp @@ -742,4 +742,23 @@ 'includes': ['../build/protoc.gypi'], }, ], + 'conditions': [ + ['test_isolation_mode != "noop"', { + 'targets': [ + { + 'target_name': 'chromeos_unittests_run', + 'type': 'none', + 'dependencies': [ + 'chromeos_unittests', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'chromeos_unittests.isolate', + ], + }, + ], + }], + ], } diff --git a/chromeos/chromeos_unittests.isolate b/chromeos/chromeos_unittests.isolate new file mode 100644 index 0000000..11648bf --- /dev/null +++ b/chromeos/chromeos_unittests.isolate @@ -0,0 +1,25 @@ +# Copyright 2015 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/chromeos_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + 'files': [ + '../net/data/', + '../testing/test_env.py', + '<(PRODUCT_DIR)/chromeos_unittests<(EXECUTABLE_SUFFIX)', + 'test/data/', + ], + }, + 'includes': [ + '../base/base.isolate', + ], +} diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json index 030b9ad..017479d6 100644 --- a/testing/buildbot/chromium.chromiumos.json +++ b/testing/buildbot/chromium.chromiumos.json @@ -158,6 +158,9 @@ "test": "cacheinvalidation_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "chromeos_unittests" }, { @@ -414,6 +417,9 @@ "test": "cacheinvalidation_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "chromeos_unittests" }, { @@ -668,6 +674,9 @@ "test": "cacheinvalidation_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "chromeos_unittests" }, { diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json index 8a22fee..fbe4dcc 100644 --- a/testing/buildbot/chromium.memory.json +++ b/testing/buildbot/chromium.memory.json @@ -274,6 +274,9 @@ "test": "cast_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "chromeos_unittests" }, { diff --git a/testing/buildbot/chromium.webkit.json b/testing/buildbot/chromium.webkit.json index 6f95559..a8315c3 100644 --- a/testing/buildbot/chromium.webkit.json +++ b/testing/buildbot/chromium.webkit.json @@ -48,6 +48,9 @@ "test": "cacheinvalidation_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "chromeos_unittests" }, { @@ -293,6 +296,9 @@ "test": "cacheinvalidation_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "chromeos_unittests" }, { |