diff options
| author | mostynb <mostynb@opera.com> | 2015-06-09 12:17:22 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-09 19:17:55 +0000 |
| commit | 360543640c8e73c0fb4952f6000b895dc69f1cc2 (patch) | |
| tree | ea3b045ced5555aec4b8a148d7db65ea01163826 /crypto | |
| parent | 971ecb9a7180e599fa97b5c475f72d5e3f4a713a (diff) | |
| download | chromium_src-360543640c8e73c0fb4952f6000b895dc69f1cc2.zip chromium_src-360543640c8e73c0fb4952f6000b895dc69f1cc2.tar.gz chromium_src-360543640c8e73c0fb4952f6000b895dc69f1cc2.tar.bz2 | |
remove crypto_unittests_run's uneeded xdisplaycheck dep
The crypto_unittests_run target has an incomplete and
unnecessary dependency on xdisplaycheck- let's remove
this dependency.
Review URL: https://codereview.chromium.org/1168393007
Cr-Commit-Position: refs/heads/master@{#333546}
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crypto_unittests.isolate | 48 |
1 files changed, 11 insertions, 37 deletions
diff --git a/crypto/crypto_unittests.isolate b/crypto/crypto_unittests.isolate index 93272b4..e09095c 100644 --- a/crypto/crypto_unittests.isolate +++ b/crypto/crypto_unittests.isolate @@ -2,44 +2,18 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. { + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + }, 'conditions': [ - ['use_x11==0', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], - }, - }], - ['use_x11==1', { - 'variables': { - 'command': [ - '../testing/xvfb.py', - '<(PRODUCT_DIR)', - '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--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': [ |