diff options
| author | scottmg <scottmg@chromium.org> | 2015-02-12 19:08:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-13 03:09:24 +0000 |
| commit | fd25702a636f937d3a85970ced843bd97b072a7e (patch) | |
| tree | 3b1c891e5a3405d79ae0886dc4c8b80b1b38b6ee /crypto | |
| parent | f6377ee04a178d5b3670d7fe840ea499997531bd (diff) | |
| download | chromium_src-fd25702a636f937d3a85970ced843bd97b072a7e.zip chromium_src-fd25702a636f937d3a85970ced843bd97b072a7e.tar.gz chromium_src-fd25702a636f937d3a85970ced843bd97b072a7e.tar.bz2 | |
Isolate crypto_unittests
R=maruel@chromium.org
TBR=jam@chromium.org
BUG=98637
Review URL: https://codereview.chromium.org/875353004
Cr-Commit-Position: refs/heads/master@{#316146}
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crypto.gyp | 17 | ||||
| -rw-r--r-- | crypto/crypto_unittests.isolate | 72 |
2 files changed, 89 insertions, 0 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 6d60f48..632c498 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -297,5 +297,22 @@ 'sources': [], } ]}], + ['test_isolation_mode != "noop"', { + 'targets': [ + { + 'target_name': 'crypto_unittests_run', + 'type': 'none', + 'dependencies': [ + 'crypto_unittests', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'crypto_unittests.isolate', + ], + }, + ], + }], ], } diff --git a/crypto/crypto_unittests.isolate b/crypto/crypto_unittests.isolate new file mode 100644 index 0000000..381a1c8 --- /dev/null +++ b/crypto/crypto_unittests.isolate @@ -0,0 +1,72 @@ +# 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"', { + 'variables': { + 'command': [ + '../testing/xvfb.py', + '<(PRODUCT_DIR)', + '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + 'files': [ + '../testing/xvfb.py', + ], + }, + }], + ['OS=="linux" and use_ozone==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'files': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)', + ], + 'read_only': 1, + }, + }], + ['OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + }, + }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/crypto_unittests.dSYM/', + ], + }, + }], + ['OS=="win" and (fastbuild==0 or fastbuild==1)', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/crypto_unittests.exe.pdb', + ], + }, + }], + ], + 'includes': [ + '../base/base.isolate', + ], +} |