diff options
| -rw-r--r-- | ash/ash_unittests.isolate | 24 | ||||
| -rw-r--r-- | base/base_unittests.isolate | 32 | ||||
| -rw-r--r-- | build/android/pylib/utils/isolator.py | 1 | ||||
| -rw-r--r-- | build/isolate.gypi | 1 | ||||
| -rw-r--r-- | chrome/browser_tests.isolate | 34 | ||||
| -rw-r--r-- | chrome/interactive_ui_tests.isolate | 36 | ||||
| -rw-r--r-- | chrome/sync_integration_tests.isolate | 26 | ||||
| -rw-r--r-- | chrome/unit_tests.isolate | 36 | ||||
| -rw-r--r-- | content/content_browsertests.isolate | 36 | ||||
| -rw-r--r-- | content/content_unittests.isolate | 38 | ||||
| -rw-r--r-- | ui/app_list/app_list_unittests.isolate | 32 | ||||
| -rw-r--r-- | ui/base/ui_base_unittests.isolate | 32 | ||||
| -rw-r--r-- | ui/events/events_unittests.isolate | 30 | ||||
| -rw-r--r-- | ui/message_center/message_center_unittests.isolate | 32 | ||||
| -rw-r--r-- | ui/touch_selection/ui_touch_selection_unittests.isolate | 32 |
15 files changed, 213 insertions, 209 deletions
diff --git a/ash/ash_unittests.isolate b/ash/ash_unittests.isolate index b30a5d5..918a8e0 100644 --- a/ash/ash_unittests.isolate +++ b/ash/ash_unittests.isolate @@ -15,16 +15,7 @@ ], }, }], - ['use_x11==0', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)', - '--test-launcher-bot-mode', - ], - }, - }], - ['use_x11==1', { + ['OS=="linux"', { 'variables': { 'command': [ '../testing/xvfb.py', @@ -34,20 +25,25 @@ ], 'files': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libffmpegsumo.so', + '<(PRODUCT_DIR)/libosmesa.so', ], }, }], - ['OS=="linux"', { + ['OS=="linux" and use_ozone==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], ['OS=="win"', { 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/ash_unittests.exe', + '--test-launcher-bot-mode', + ], 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.dll', '<(PRODUCT_DIR)/osmesa.dll', diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate index 26f4c2b..f561d20 100644 --- a/base/base_unittests.isolate +++ b/base/base_unittests.isolate @@ -10,19 +10,7 @@ ], }, }], - ['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)', - '--lsan=<(lsan)', - ], - }, - }], - ['use_x11==1', { + ['OS=="linux"', { 'variables': { 'command': [ '../testing/xvfb.py', @@ -35,6 +23,12 @@ ], 'files': [ '../testing/xvfb.py', + ], + }, + }], + ['OS=="linux" and use_ozone==0', { + 'variables': { + 'files': [ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, @@ -48,6 +42,18 @@ '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': [ diff --git a/build/android/pylib/utils/isolator.py b/build/android/pylib/utils/isolator.py index 0149df8..afbee2a 100644 --- a/build/android/pylib/utils/isolator.py +++ b/build/android/pylib/utils/isolator.py @@ -37,7 +37,6 @@ def DefaultConfigVariables(): 'target_arch': 'arm', 'use_openssl': '0', 'use_ozone': '0', - 'use_x11': '0', 'v8_use_external_startup_data': '0', } diff --git a/build/isolate.gypi b/build/isolate.gypi index 118dac1..e6d2f98 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -91,7 +91,6 @@ '--config-variable', 'use_openssl=<(use_openssl)', '--config-variable', 'target_arch=<(target_arch)', '--config-variable', 'use_ozone=<(use_ozone)', - '--config-variable', 'use_x11=<(use_x11)', '--config-variable', 'disable_nacl=<(disable_nacl)', ], 'conditions': [ diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index b451d75..4956977 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -3,18 +3,7 @@ # found in the LICENSE file. { 'conditions': [ - ['use_x11==0', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--lsan=<(lsan)', - ], - }, - }], - ['use_x11==1', { + ['OS=="linux"', { 'variables': { 'command': [ '../testing/xvfb.py', @@ -26,16 +15,16 @@ ], 'files': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libclearkeycdm.so', + '<(PRODUCT_DIR)/libclearkeycdmadapter.so', + '<(PRODUCT_DIR)/libppapi_tests.so', ], }, }], - ['OS=="linux"', { + ['OS=="linux" and use_ozone==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/libclearkeycdm.so', - '<(PRODUCT_DIR)/libclearkeycdmadapter.so', - '<(PRODUCT_DIR)/libppapi_tests.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], @@ -169,6 +158,17 @@ ], }, }], + ['OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + ], + }, + }], ['OS=="win"', { 'variables': { 'files': [ 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': [ diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate index 20640c7..3c5e0e1 100644 --- a/chrome/sync_integration_tests.isolate +++ b/chrome/sync_integration_tests.isolate @@ -3,15 +3,7 @@ # found in the LICENSE file. { 'conditions': [ - ['use_x11==0', { - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', - '--test-launcher-bot-mode', - ], - }, - }], - ['use_x11==1', { + ['OS=="linux"', { 'variables': { 'command': [ '../testing/xvfb.py', @@ -22,15 +14,15 @@ 'files': [ '../testing/test_env.py', '../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libffmpegsumo.so', + '<(PRODUCT_DIR)/libosmesa.so', ], }, }], - ['OS=="linux"', { + ['OS=="linux" and use_ozone==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], @@ -57,6 +49,14 @@ ], }, }], + ['OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', + '--test-launcher-bot-mode', + ], + }, + }], ['OS=="mac"', { 'variables': { 'files': [ diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate index c9391dc..446550b 100644 --- a/chrome/unit_tests.isolate +++ b/chrome/unit_tests.isolate @@ -39,19 +39,7 @@ ], }, }], - ['use_x11==0', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--lsan=<(lsan)', - ], - }, - }], - ['use_x11==1', { + ['OS=="linux"', { 'variables': { 'command': [ '../testing/xvfb.py', @@ -64,16 +52,16 @@ ], 'files': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libffmpegsumo.so', + '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/locales/fr.pak', ], }, }], - ['OS=="linux"', { + ['OS=="linux" and use_ozone==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/libosmesa.so', - '<(PRODUCT_DIR)/locales/fr.pak', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], @@ -105,6 +93,18 @@ ], }, }], + ['OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + ], + }, + }], ['OS=="win"', { 'variables': { 'files': [ diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate index 9970f13..53a53fc 100644 --- a/content/content_browsertests.isolate +++ b/content/content_browsertests.isolate @@ -33,18 +33,7 @@ ], }, }], - ['use_x11==0', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--lsan=<(lsan)', - ], - }, - }], - ['use_x11==1', { + ['OS=="linux"', { 'variables': { 'command': [ '../testing/xvfb.py', @@ -56,17 +45,17 @@ ], 'files': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/content_shell.pak', + '<(PRODUCT_DIR)/libffmpegsumo.so', + '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/libppapi_tests.so', ], }, }], - ['OS=="linux"', { + ['OS=="linux" and use_ozone==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/content_shell.pak', - '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/libosmesa.so', - '<(PRODUCT_DIR)/libppapi_tests.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], @@ -95,6 +84,17 @@ ], }, }], + ['OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + ], + }, + }], ['OS=="win"', { 'variables': { 'files': [ diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate index ff40dc7..bc982e2 100644 --- a/content/content_unittests.isolate +++ b/content/content_unittests.isolate @@ -33,19 +33,7 @@ ], }, }], - ['use_x11==0', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--lsan=<(lsan)', - ], - }, - }], - ['use_x11==1', { + ['OS=="linux"', { 'variables': { 'command': [ '../testing/xvfb.py', @@ -58,20 +46,28 @@ ], 'files': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libffmpegsumo.so', + '<(PRODUCT_DIR)/libosmesa.so', ], }, }], - ['OS=="linux"', { + ['OS=="linux" and use_ozone==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], ['OS=="mac"', { 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + ], 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.so', '<(PRODUCT_DIR)/osmesa.so', @@ -80,6 +76,14 @@ }], ['OS=="win"', { 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + ], 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.dll', '<(PRODUCT_DIR)/osmesa.dll', diff --git a/ui/app_list/app_list_unittests.isolate b/ui/app_list/app_list_unittests.isolate index e6f1f5f..4ceb64d 100644 --- a/ui/app_list/app_list_unittests.isolate +++ b/ui/app_list/app_list_unittests.isolate @@ -12,19 +12,7 @@ ], }, }], - ['use_x11==0', { - 'variables': { - 'command': [ - '../../testing/test_env.py', - '<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--lsan=<(lsan)', - ], - }, - }], - ['use_x11==1', { + ['OS=="linux"', { 'variables': { 'command': [ '../../testing/xvfb.py', @@ -37,14 +25,14 @@ ], 'files': [ '../../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libosmesa.so', ], }, }], - ['OS=="linux"', { + ['OS=="linux" and use_ozone==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], @@ -62,6 +50,18 @@ ], }, }], + ['OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '../../testing/test_env.py', + '<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + ], + }, + }], ], 'includes': [ '../../base/base.isolate', diff --git a/ui/base/ui_base_unittests.isolate b/ui/base/ui_base_unittests.isolate index cc220b6..16f6dd5 100644 --- a/ui/base/ui_base_unittests.isolate +++ b/ui/base/ui_base_unittests.isolate @@ -21,19 +21,7 @@ ], }, }], - ['use_x11==0', { - 'variables': { - 'command': [ - '../../testing/test_env.py', - '<(PRODUCT_DIR)/ui_base_unittests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--lsan=<(lsan)', - ], - }, - }], - ['use_x11==1', { + ['OS=="linux"', { 'variables': { 'command': [ '../../testing/xvfb.py', @@ -46,14 +34,14 @@ ], 'files': [ '../../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libosmesa.so', ], }, }], - ['OS=="linux"', { + ['OS=="linux" and use_ozone==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], @@ -72,6 +60,18 @@ ], }, }], + ['OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '../../testing/test_env.py', + '<(PRODUCT_DIR)/ui_base_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + ], + }, + }], ], 'includes': [ '../../base/base.isolate', diff --git a/ui/events/events_unittests.isolate b/ui/events/events_unittests.isolate index 0becad3..024de78 100644 --- a/ui/events/events_unittests.isolate +++ b/ui/events/events_unittests.isolate @@ -11,19 +11,7 @@ ], }, }], - ['use_x11==0', { - 'variables': { - 'command': [ - '../../testing/test_env.py', - '<(PRODUCT_DIR)/events_unittests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--lsan=<(lsan)', - ], - }, - }], - ['use_x11==1', { + ['OS=="linux"', { 'variables': { 'command': [ '../../testing/xvfb.py', @@ -36,14 +24,14 @@ ], 'files': [ '../../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libosmesa.so', ], }, }], ['OS=="linux" and use_ozone==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], @@ -61,6 +49,18 @@ ], }, }], + ['OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '../../testing/test_env.py', + '<(PRODUCT_DIR)/events_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + ], + }, + }], ], 'includes': [ '../../base/base.isolate', diff --git a/ui/message_center/message_center_unittests.isolate b/ui/message_center/message_center_unittests.isolate index 18ad716..7ad8cc3c 100644 --- a/ui/message_center/message_center_unittests.isolate +++ b/ui/message_center/message_center_unittests.isolate @@ -12,19 +12,7 @@ ], }, }], - ['use_x11==0', { - 'variables': { - 'command': [ - '../../testing/test_env.py', - '<(PRODUCT_DIR)/message_center_unittests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--lsan=<(lsan)', - ], - }, - }], - ['use_x11==1', { + ['OS=="linux"', { 'variables': { 'command': [ '../../testing/xvfb.py', @@ -37,14 +25,14 @@ ], 'files': [ '../../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libosmesa.so', ], }, }], - ['OS=="linux"', { + ['OS=="linux" and use_ozone==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], @@ -62,6 +50,18 @@ ], }, }], + ['OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '../../testing/test_env.py', + '<(PRODUCT_DIR)/message_center_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + ], + }, + }], ], 'includes': [ '../../base/base.isolate', diff --git a/ui/touch_selection/ui_touch_selection_unittests.isolate b/ui/touch_selection/ui_touch_selection_unittests.isolate index 13a34fd..68e1e01 100644 --- a/ui/touch_selection/ui_touch_selection_unittests.isolate +++ b/ui/touch_selection/ui_touch_selection_unittests.isolate @@ -11,19 +11,7 @@ ], }, }], - ['use_x11==0', { - 'variables': { - 'command': [ - '../../testing/test_env.py', - '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--lsan=<(lsan)', - ], - }, - }], - ['use_x11==1', { + ['OS=="linux"', { 'variables': { 'command': [ '../../testing/xvfb.py', @@ -36,14 +24,14 @@ ], 'files': [ '../../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libosmesa.so', ], }, }], - ['OS=="linux"', { + ['OS=="linux" and use_ozone==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], @@ -61,6 +49,18 @@ ], }, }], + ['OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '../../testing/test_env.py', + '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + ], + }, + }], ], 'includes': [ '../../base/base.isolate', |