diff options
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 b008bb42..bef0495 100644 --- a/chrome/interactive_ui_tests.isolate +++ b/chrome/interactive_ui_tests.isolate @@ -3,18 +3,7 @@ # found in the LICENSE file. { 'conditions': [ - ['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', { + ['OS=="linux"', { 'variables': { 'command': [ '../testing/xvfb.py', @@ -26,17 +15,17 @@ ], 'files': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libffmpegsumo.so', + '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/libppapi_tests.so', + '<(PRODUCT_DIR)/pyproto/google/', ], }, }], - ['OS=="linux"', { + ['OS=="linux" and use_ozone==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/libosmesa.so', - '<(PRODUCT_DIR)/libppapi_tests.so', - '<(PRODUCT_DIR)/pyproto/google/', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], @@ -79,6 +68,17 @@ ], }, }], + ['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': [ |