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 /chrome/interactive_ui_tests.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 'chrome/interactive_ui_tests.isolate')
| -rw-r--r-- | chrome/interactive_ui_tests.isolate | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate index bef0495..b008bb42 100644 --- a/chrome/interactive_ui_tests.isolate +++ b/chrome/interactive_ui_tests.isolate @@ -3,7 +3,18 @@ # found in the LICENSE file. { 'conditions': [ - ['OS=="linux"', { + ['use_x11==0', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + ], + }, + }], + ['use_x11==1', { 'variables': { 'command': [ '../testing/xvfb.py', @@ -15,17 +26,17 @@ ], 'files': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/libosmesa.so', - '<(PRODUCT_DIR)/libppapi_tests.so', - '<(PRODUCT_DIR)/pyproto/google/', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], - ['OS=="linux" and use_ozone==0', { + ['OS=="linux"', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libffmpegsumo.so', + '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/libppapi_tests.so', + '<(PRODUCT_DIR)/pyproto/google/', ], }, }], @@ -68,17 +79,6 @@ ], }, }], - ['OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--lsan=<(lsan)', - ], - }, - }], ['OS=="win"', { 'variables': { 'files': [ |