diff options
author | maruel <maruel@chromium.org> | 2015-07-20 17:58:20 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-21 00:58:53 +0000 |
commit | 71e75d8043292d014a344ed2453dcb821aaaf6aa (patch) | |
tree | ab2c4c68dd4552e95890a2a3fcbecd7f725d5765 /google_apis | |
parent | 18d1ebf28394e716684e549beda493492c7ded83 (diff) | |
download | chromium_src-71e75d8043292d014a344ed2453dcb821aaaf6aa.zip chromium_src-71e75d8043292d014a344ed2453dcb821aaaf6aa.tar.gz chromium_src-71e75d8043292d014a344ed2453dcb821aaaf6aa.tar.bz2 |
Convert google_apis_unittests to run exclusively on Swarming
0 configs already ran on Swarming
45 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: CFI Linux
- chromium.fyi.json: Chromium Win 10
- chromium.fyi.json: ClangToTLinux tester
- chromium.fyi.json: ClangToTLinuxASan tester
- chromium.fyi.json: ClangToTMac tester
- chromium.fyi.json: ClangToTMacASan tester
- chromium.fyi.json: ClangToTWin tester
- chromium.fyi.json: ClangToTWin(dbg) tester
- chromium.fyi.json: ClangToTWin(dll) tester
- chromium.fyi.json: ClangToTWin64 tester
- chromium.fyi.json: ClangToTWin64(dbg) tester
- chromium.fyi.json: ClangToTWin64(dll) tester
- chromium.fyi.json: CrWinAsan tester
- chromium.fyi.json: CrWinAsan(dll) tester
- chromium.fyi.json: CrWinClang tester
- chromium.fyi.json: CrWinClang(dbg) tester
- chromium.fyi.json: CrWinClang(shared) tester
- chromium.fyi.json: CrWinClang64 tester
- chromium.fyi.json: CrWinClang64(dbg) tester
- chromium.fyi.json: CrWinClang64(dll) tester
- chromium.fyi.json: CrWinClangLLD 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.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: XP Tests (1)
Ran:
./manage.py --convert google_apis_unittests
R=jam@chromium.org
BUG=98637,512284
Review URL: https://codereview.chromium.org/1240333002
Cr-Commit-Position: refs/heads/master@{#339583}
Diffstat (limited to 'google_apis')
-rw-r--r-- | google_apis/google_apis.gyp | 19 | ||||
-rw-r--r-- | google_apis/google_apis_unittests.isolate | 27 |
2 files changed, 46 insertions, 0 deletions
diff --git a/google_apis/google_apis.gyp b/google_apis/google_apis.gyp index 4d40926..659d9835 100644 --- a/google_apis/google_apis.gyp +++ b/google_apis/google_apis.gyp @@ -207,4 +207,23 @@ ], }, ], + 'conditions': [ + ['test_isolation_mode != "noop"', { + 'targets': [ + { + 'target_name': 'google_apis_unittests_run', + 'type': 'none', + 'dependencies': [ + 'google_apis_unittests', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'google_apis_unittests.isolate', + ], + }, + ], + }], + ], } diff --git a/google_apis/google_apis_unittests.isolate b/google_apis/google_apis_unittests.isolate new file mode 100644 index 0000000..f622185 --- /dev/null +++ b/google_apis/google_apis_unittests.isolate @@ -0,0 +1,27 @@ +# 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. +{ + 'includes': [ + '../base/base.isolate', + ], + 'conditions': [ + ['OS=="win" or OS=="mac" or OS=="linux"', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/google_apis_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + ], + 'files': [ + '../chrome/test/data/drive/', + '../chrome/test/data/chromeos/file_manager/text.txt', + '../testing/test_env.py', + '<(PRODUCT_DIR)/google_apis_unittests<(EXECUTABLE_SUFFIX)', + 'test/', + ], + }, + }], + ], +} |