diff options
| author | sergeyv <sergeyv@chromium.org> | 2015-01-21 05:39:41 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-21 13:40:30 +0000 |
| commit | c497f3788bc5007ee3bbe2f6aa1cc101b6d66d8b (patch) | |
| tree | fbe2d570783541d81d139bf895e639ed9d91c2eb /cc | |
| parent | 2c5518d7b7d3eb119588fea8e6c668076c8bcfed (diff) | |
| download | chromium_src-c497f3788bc5007ee3bbe2f6aa1cc101b6d66d8b.zip chromium_src-c497f3788bc5007ee3bbe2f6aa1cc101b6d66d8b.tar.gz chromium_src-c497f3788bc5007ee3bbe2f6aa1cc101b6d66d8b.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/861173002
Cr-Commit-Position: refs/heads/master@{#312322}
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/cc_tests.gyp | 19 | ||||
| -rw-r--r-- | cc/cc_unittests.isolate | 83 |
2 files changed, 1 insertions, 101 deletions
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp index 49337bc..74cb1bfd 100644 --- a/cc/cc_tests.gyp +++ b/cc/cc_tests.gyp @@ -444,23 +444,6 @@ }, ], } - ], - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'cc_unittests_run', - 'type': 'none', - 'dependencies': [ - 'cc_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'cc_unittests.isolate', - ], - }, - ], - }], + ] ], } diff --git a/cc/cc_unittests.isolate b/cc/cc_unittests.isolate deleted file mode 100644 index 4e5ac92..0000000 --- a/cc/cc_unittests.isolate +++ /dev/null @@ -1,83 +0,0 @@ -# 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', - ], -} |