diff options
| author | maruel <maruel@chromium.org> | 2015-06-30 17:21:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-01 00:21:41 +0000 |
| commit | f25c68c20a42a05981410fd9159cebe162ff7865 (patch) | |
| tree | 4c25926c3287c28bdfdccbeda64256ae7c3ef1f0 /remoting | |
| parent | f5e8ddd7a0bc17a7ff131e43706a4e10ec4eccb8 (diff) | |
| download | chromium_src-f25c68c20a42a05981410fd9159cebe162ff7865.zip chromium_src-f25c68c20a42a05981410fd9159cebe162ff7865.tar.gz chromium_src-f25c68c20a42a05981410fd9159cebe162ff7865.tar.bz2 | |
Convert remoting_unittests to run exclusively on Swarming
0 configs already ran on Swarming
28 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.fyi.json: CrWinAsan tester
- chromium.fyi.json: CrWinAsan(dll) tester
- chromium.fyi.json: Linux Trusty
- chromium.fyi.json: Linux Trusty (dbg)
- chromium.linux.json: Linux Tests
- chromium.linux.json: Linux Tests (dbg)(1)
- chromium.linux.json: Linux Tests (dbg)(1)(32)
- chromium.mac.json: Mac10.10 Tests
- chromium.mac.json: Mac10.6 Tests
- chromium.mac.json: Mac10.8 Tests
- chromium.mac.json: Mac10.9 Tests
- chromium.mac.json: Mac10.9 Tests (dbg)
- chromium.memory.fyi.json: Linux ChromeOS MSan Tests
- chromium.memory.fyi.json: Linux MSan Tests
- chromium.memory.fyi.json: Linux TSan Tests
- chromium.memory.json: Linux ASan LSan Tests (1)
- chromium.memory.json: Linux Chromium OS ASan LSan Tests (1)
- chromium.memory.json: Mac ASan 64 Tests (1)
- chromium.webkit.json: Linux ChromiumOS Tests (1)
- chromium.webkit.json: Linux ChromiumOS Tests (dbg)(1)
- chromium.win.json: Vista Tests (1)
- chromium.win.json: Win 7 Tests x64 (1)
- chromium.win.json: Win7 Tests (1)
- chromium.win.json: Win7 Tests (dbg)(1)
- chromium.win.json: XP Tests (1)
Ran:
./manage.py --convert remoting_unittests
R=lambroslambrou@chromium.org,dpranke@chromium.org
TBR=
BUG=98637
Review URL: https://codereview.chromium.org/1216033005
Cr-Commit-Position: refs/heads/master@{#336931}
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/remoting_test.gypi | 19 | ||||
| -rw-r--r-- | remoting/remoting_unittests.isolate | 30 |
2 files changed, 48 insertions, 1 deletions
diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi index 4f8fefc..cc85620 100644 --- a/remoting/remoting_test.gypi +++ b/remoting/remoting_test.gypi @@ -612,6 +612,23 @@ 'includes': [ 'remoting_webapp.gypi', ], }, # end of target 'remoting_webapp_browser_test' ] - }] + }], + ['test_isolation_mode != "noop"', { + 'targets': [ + { + 'target_name': 'remoting_unittests_run', + 'type': 'none', + 'dependencies': [ + 'remoting_unittests', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'remoting_unittests.isolate', + ], + }, + ], + }], ] # end of 'conditions' } diff --git a/remoting/remoting_unittests.isolate b/remoting/remoting_unittests.isolate new file mode 100644 index 0000000..ed6fca8 --- /dev/null +++ b/remoting/remoting_unittests.isolate @@ -0,0 +1,30 @@ +# 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. +{ + 'conditions': [ + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/remoting_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + 'files': [ + '../net/data/ssl/certificates/ok_cert.pem', + '../net/data/ssl/certificates/unittest.key.bin', + '../net/data/ssl/certificates/unittest.selfsigned.der', + '../testing/test_env.py', + '<(PRODUCT_DIR)/remoting_unittests<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ], + 'includes': [ + '../base/base.isolate', + ], +} |