diff options
| author | jam <jam@chromium.org> | 2015-01-27 09:22:35 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-27 17:24:12 +0000 |
| commit | 75a28f07d5c54d2c0ea5ad59718038599b4b7287 (patch) | |
| tree | 7000a1c861a54a860c57ac403e146305b47721b1 /cc/cc_unittests.isolate | |
| parent | 3dc33bd5214a94b2f206950980b09bf6218eec7e (diff) | |
| download | chromium_src-75a28f07d5c54d2c0ea5ad59718038599b4b7287.zip chromium_src-75a28f07d5c54d2c0ea5ad59718038599b4b7287.tar.gz chromium_src-75a28f07d5c54d2c0ea5ad59718038599b4b7287.tar.bz2 | |
Revert of Revert of Swarm cc_unittests. (patchset #1 id:1 of https://codereview.chromium.org/861173002/)
Reason for revert:
just saw this revert. can't find sergeyv online, and don't see information on what broke. so reverting the revert and watching the tree.
Original issue's description:
> Revert of Swarm cc_unittests. (patchset #6 id:100001 of https://codereview.chromium.org/854743002/)
>
> Reason for revert:
> Failures on chrome.mac
>
> Original issue's description:
> > Swarm cc_unittests.
> >
> > BUG=448877
> >
> > Committed: https://crrev.com/9086ff0072268267bacf28e6098a7b5bd8478982
> > Cr-Commit-Position: refs/heads/master@{#312252}
>
> TBR=maruel@chromium.org,alexst@chromium.org,jam@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=448877
>
> Committed: https://crrev.com/c497f3788bc5007ee3bbe2f6aa1cc101b6d66d8b
> Cr-Commit-Position: refs/heads/master@{#312322}
TBR=maruel@chromium.org,alexst@chromium.org,sergeyv@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=448877
Review URL: https://codereview.chromium.org/880803004
Cr-Commit-Position: refs/heads/master@{#313294}
Diffstat (limited to 'cc/cc_unittests.isolate')
| -rw-r--r-- | cc/cc_unittests.isolate | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/cc/cc_unittests.isolate b/cc/cc_unittests.isolate new file mode 100644 index 0000000..4e5ac92 --- /dev/null +++ b/cc/cc_unittests.isolate @@ -0,0 +1,83 @@ +# 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': { + 'files': [ + 'test/data/', + '../testing/test_env.py', + '<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ['OS=="linux"', { + 'variables': { + 'command': [ + '../testing/xvfb.py', + '<(PRODUCT_DIR)', + '<(PRODUCT_DIR)/cc_unittests', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + ], + 'files': [ + '../testing/xvfb.py', + '<(PRODUCT_DIR)/libffmpegsumo.so', + '<(PRODUCT_DIR)/libosmesa.so', + ], + }, + }], + ['OS=="linux" and use_ozone==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/xdisplaycheck', + ], + }, + }], + ['OS=="mac"', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/cc_unittests', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + ], + 'files': [ + '<(PRODUCT_DIR)/ffmpegsumo.so', + '<(PRODUCT_DIR)/osmesa.so', + ], + }, + }], + ['OS=="win"', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/cc_unittests.exe', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + ], + 'files': [ + '<(PRODUCT_DIR)/ffmpegsumo.dll', + '<(PRODUCT_DIR)/osmesa.dll', + ], + }, + }], + ['OS=="win" and (fastbuild==0 or fastbuild==1)', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/cc_unittests.exe.pdb', + ], + }, + }], + ], + 'includes': [ + '../base/base.isolate', + ], +} |