diff options
| author | spang <spang@chromium.org> | 2015-03-11 13:51:53 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-11 20:53:05 +0000 |
| commit | c88a0abfe3d8ce136bdcef4b6f7f537df89bf72d (patch) | |
| tree | 6fe367486910a82c5cef2fe9216c24f7bcf07922 /media/cast/cast_unittests.isolate | |
| parent | 8235d84d7493f31b23f54c67d92a7115edaf4c8d (diff) | |
| download | chromium_src-c88a0abfe3d8ce136bdcef4b6f7f537df89bf72d.zip chromium_src-c88a0abfe3d8ce136bdcef4b6f7f537df89bf72d.tar.gz chromium_src-c88a0abfe3d8ce136bdcef4b6f7f537df89bf72d.tar.bz2 | |
Convert more isolate files to respect use_x11 for Xvfb usage
This is a followup to the update to disable Xvfb for OS=="linux"
use_x11==0 that converts additional targets.
BUG=440882
TEST=isolate.py run -s out_ozone/Debug/<various>
TBR=maruel
Review URL: https://codereview.chromium.org/996173004
Cr-Commit-Position: refs/heads/master@{#320143}
Diffstat (limited to 'media/cast/cast_unittests.isolate')
| -rw-r--r-- | media/cast/cast_unittests.isolate | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/media/cast/cast_unittests.isolate b/media/cast/cast_unittests.isolate index bdbca13b..26b9395 100644 --- a/media/cast/cast_unittests.isolate +++ b/media/cast/cast_unittests.isolate @@ -3,7 +3,20 @@ # found in the LICENSE file. { 'conditions': [ - ['OS=="linux"', { + ['use_x11==0', { + 'variables': { + 'command': [ + '../../testing/test_env.py', + '<(PRODUCT_DIR)/cast_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', @@ -17,14 +30,14 @@ ], 'files': [ '../../testing/xvfb.py', - '<(PRODUCT_DIR)/libffmpegsumo.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], - ['OS=="linux" and use_ozone==0', { + ['OS=="linux"', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libffmpegsumo.so', ], }, }], @@ -43,19 +56,6 @@ ], }, }], - ['OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '../../testing/test_env.py', - '<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], - }, - }], ['OS=="mac" and asan==1 and fastbuild==0', { 'variables': { 'files': [ |