diff options
| author | mostynb <mostynb@opera.com> | 2015-06-09 13:40:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-09 20:41:04 +0000 |
| commit | 1d34e9d4dbaad8558164d3b144c42d60c95b515b (patch) | |
| tree | c60fdcde6befa6d6bed20e9a26d7ea070f78288f | |
| parent | 160044a7903839b713c18d8325aa206651a45d8f (diff) | |
| download | chromium_src-1d34e9d4dbaad8558164d3b144c42d60c95b515b.zip chromium_src-1d34e9d4dbaad8558164d3b144c42d60c95b515b.tar.gz chromium_src-1d34e9d4dbaad8558164d3b144c42d60c95b515b.tar.bz2 | |
remove unneeded xdisplaycheck dep in base_unittests_run
This previous CL added an xdisplaycheck dep to base_unittests_run, but
base_unittests does not appear to depend on any X libraries as far as I
can tell:
https://codereview.chromium.org/388843004
Let's see if we can remove this dependency.
Review URL: https://codereview.chromium.org/1171073002
Cr-Commit-Position: refs/heads/master@{#333566}
| -rw-r--r-- | base/base.gyp | 7 | ||||
| -rw-r--r-- | base/base_unittests.isolate | 42 |
2 files changed, 11 insertions, 38 deletions
diff --git a/base/base.gyp b/base/base.gyp index 9aed112..fb22d19 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -1635,13 +1635,6 @@ 'sources': [ 'base_unittests.isolate', ], - 'conditions': [ - ['use_x11 == 1', { - 'dependencies': [ - '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', - ], - }], - ], }, ], }], diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate index b1c270c..57fc4d2 100644 --- a/base/base_unittests.isolate +++ b/base/base_unittests.isolate @@ -2,38 +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)/base_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)/base_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)/base_unittests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], - 'files': [ - '../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', - ], - }, - }], ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'files': [ |