diff options
| author | spang <spang@chromium.org> | 2015-01-07 17:42:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-08 01:42:58 +0000 |
| commit | 8a7be0714892c0c6360c45d0d602c119873b468e (patch) | |
| tree | af22464953710702a55fd99549c7d9cd8d36564a /base/base_unittests.isolate | |
| parent | 3e81e58f707ef74a0fca1e00acfb9d0de8c91308 (diff) | |
| download | chromium_src-8a7be0714892c0c6360c45d0d602c119873b468e.zip chromium_src-8a7be0714892c0c6360c45d0d602c119873b468e.tar.gz chromium_src-8a7be0714892c0c6360c45d0d602c119873b468e.tar.bz2 | |
Use Xvfb in isolated testing only if use_x11 is set
We don't need a virtual X server for ozone testing, and it is causing
problems running the tests with swarming. This changes all isolate files
to only run Xvfb if use_x11==1 is set in GYP_DEFINES, and merges ozone
with Windows & Mac (none of which need to run their own display server).
BUG=440882
TEST=isolate.py run -s out_ozone/Debug/<various>
TBR=maruel@chromium.org
Review URL: https://codereview.chromium.org/813363003
Cr-Commit-Position: refs/heads/master@{#310434}
Diffstat (limited to 'base/base_unittests.isolate')
| -rw-r--r-- | base/base_unittests.isolate | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate index f561d20..26f4c2b 100644 --- a/base/base_unittests.isolate +++ b/base/base_unittests.isolate @@ -10,25 +10,31 @@ ], }, }], - ['OS=="linux"', { + ['use_x11==0', { 'variables': { 'command': [ - '../testing/xvfb.py', - '<(PRODUCT_DIR)', + '../testing/test_env.py', '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', '--brave-new-test-launcher', '--test-launcher-bot-mode', '--asan=<(asan)', '--lsan=<(lsan)', ], - 'files': [ - '../testing/xvfb.py', - ], }, }], - ['OS=="linux" and use_ozone==0', { + ['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)', + '--lsan=<(lsan)', + ], 'files': [ + '../testing/xvfb.py', '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, @@ -42,18 +48,6 @@ 'read_only': 1, }, }], - ['OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--lsan=<(lsan)', - ], - }, - }], ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 'variables': { 'files': [ |