diff options
| -rw-r--r-- | ash/ash_unittests.isolate | 36 | ||||
| -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 | 36 | ||||
| -rw-r--r-- | chrome/interactive_ui_tests.isolate | 38 | ||||
| -rw-r--r-- | chrome/sync_integration_tests.isolate | 26 | ||||
| -rw-r--r-- | chrome/unit_tests.isolate | 62 | ||||
| -rw-r--r-- | content/content_browsertests.isolate | 58 | ||||
| -rw-r--r-- | content/content_unittests.isolate | 67 | ||||
| -rw-r--r-- | ui/app_list/app_list_unittests.isolate | 40 | ||||
| -rw-r--r-- | ui/base/ui_base_unittests.isolate | 58 | ||||
| -rw-r--r-- | ui/events/events_unittests.isolate | 36 | ||||
| -rw-r--r-- | ui/message_center/message_center_unittests.isolate | 40 | ||||
| -rw-r--r-- | ui/touch_selection/ui_touch_selection_unittests.isolate | 30 |
15 files changed, 278 insertions, 283 deletions
diff --git a/ash/ash_unittests.isolate b/ash/ash_unittests.isolate index 918a8e0..319dfc7 100644 --- a/ash/ash_unittests.isolate +++ b/ash/ash_unittests.isolate @@ -3,19 +3,16 @@ # found in the LICENSE file. { 'conditions': [ - ['OS=="win" or chromeos==1', { + ['use_x11==0', { 'variables': { - 'files': [ + 'command': [ '../testing/test_env.py', '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/chrome_100_percent.pak', - '<(PRODUCT_DIR)/chrome_200_percent.pak', - '<(PRODUCT_DIR)/locales/en-US.pak', - '<(PRODUCT_DIR)/keyboard_resources.pak', + '--test-launcher-bot-mode', ], }, }], - ['OS=="linux"', { + ['use_x11==1', { 'variables': { 'command': [ '../testing/xvfb.py', @@ -25,25 +22,32 @@ ], 'files': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], - ['OS=="linux" and use_ozone==0', { + ['OS=="win" or chromeos==1', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '../testing/test_env.py', + '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/chrome_100_percent.pak', + '<(PRODUCT_DIR)/chrome_200_percent.pak', + '<(PRODUCT_DIR)/locales/en-US.pak', + '<(PRODUCT_DIR)/keyboard_resources.pak', ], }, }], - ['OS=="win"', { + ['OS=="linux"', { 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/ash_unittests.exe', - '--test-launcher-bot-mode', + 'files': [ + '<(PRODUCT_DIR)/libffmpegsumo.so', + '<(PRODUCT_DIR)/libosmesa.so', ], + }, + }], + ['OS=="win"', { + 'variables': { 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.dll', '<(PRODUCT_DIR)/osmesa.dll', diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate index 5126fb3..e329152 100644 --- a/base/base_unittests.isolate +++ b/base/base_unittests.isolate @@ -3,14 +3,20 @@ # found in the LICENSE file. { 'conditions': [ - ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { + ['use_x11==0', { 'variables': { - 'files': [ - 'test/data/', + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', ], }, }], - ['OS=="linux"', { + ['use_x11==1', { 'variables': { 'command': [ '../testing/xvfb.py', @@ -24,13 +30,14 @@ ], 'files': [ '../testing/xvfb.py', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], - ['OS=="linux" and use_ozone==0', { + ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + 'test/data/', ], }, }], @@ -43,19 +50,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)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], - }, - }], ['OS=="mac" and asan==1 and fastbuild==0', { 'variables': { 'files': [ diff --git a/build/android/pylib/utils/isolator.py b/build/android/pylib/utils/isolator.py index 60d326e..fcbe427 100644 --- a/build/android/pylib/utils/isolator.py +++ b/build/android/pylib/utils/isolator.py @@ -41,6 +41,7 @@ def DefaultConfigVariables(): 'use_instrumented_libraries': '0', 'use_openssl': '0', 'use_ozone': '0', + 'use_x11': '0', 'v8_use_external_startup_data': '1', } diff --git a/build/isolate.gypi b/build/isolate.gypi index fbb6d3cf..5fa1e67 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -95,6 +95,7 @@ '--config-variable', 'use_instrumented_libraries=<(use_instrumented_libraries)', '--config-variable', 'use_openssl=<(use_openssl)', '--config-variable', 'use_ozone=<(use_ozone)', + '--config-variable', 'use_x11=<(use_x11)', '--config-variable', 'v8_use_external_startup_data=<(v8_use_external_startup_data)', ], 'conditions': [ diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index 75a51b7..7d97d28 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -3,7 +3,19 @@ # found in the LICENSE file. { 'conditions': [ - ['OS=="linux"', { + ['use_x11==0', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + }, + }], + ['use_x11==1', { 'variables': { 'command': [ '../testing/xvfb.py', @@ -16,16 +28,16 @@ ], 'files': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/libclearkeycdm.so', - '<(PRODUCT_DIR)/libclearkeycdmadapter.so', - '<(PRODUCT_DIR)/libppapi_tests.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], - ['OS=="linux" and use_ozone==0', { + ['OS=="linux"', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libclearkeycdm.so', + '<(PRODUCT_DIR)/libclearkeycdmadapter.so', + '<(PRODUCT_DIR)/libppapi_tests.so', ], }, }], @@ -170,18 +182,6 @@ ], }, }], - ['OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], - }, - }], ['OS=="win"', { 'variables': { 'files': [ diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate index 443409c..6ceb6c9 100644 --- a/chrome/interactive_ui_tests.isolate +++ b/chrome/interactive_ui_tests.isolate @@ -3,7 +3,19 @@ # 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)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + }, + }], + ['use_x11==1', { 'variables': { 'command': [ '../testing/xvfb.py', @@ -16,17 +28,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/', ], }, }], @@ -81,18 +93,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)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], - }, - }], ['OS=="win"', { 'variables': { 'files': [ diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate index b5ea975..abecb56 100644 --- a/chrome/sync_integration_tests.isolate +++ b/chrome/sync_integration_tests.isolate @@ -3,7 +3,15 @@ # found in the LICENSE file. { 'conditions': [ - ['OS=="linux"', { + ['use_x11==0', { + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', + '--test-launcher-bot-mode', + ], + }, + }], + ['use_x11==1', { 'variables': { 'command': [ '../testing/xvfb.py', @@ -14,15 +22,15 @@ 'files': [ '../testing/test_env.py', '../testing/xvfb.py', - '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/libosmesa.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', + '<(PRODUCT_DIR)/libosmesa.so', ], }, }], @@ -49,14 +57,6 @@ ], }, }], - ['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 08b9c62..715e1fe 100644 --- a/chrome/unit_tests.isolate +++ b/chrome/unit_tests.isolate @@ -3,6 +3,37 @@ # found in the LICENSE file. { 'conditions': [ + ['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)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + }, + }], + ['use_x11==1', { + 'variables': { + 'command': [ + '../testing/xvfb.py', + '<(PRODUCT_DIR)', + '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + 'files': [ + '../testing/xvfb.py', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + ], + }, + }], ['OS=="android" or OS=="linux" or OS=="win" or OS=="mac"', { 'variables': { 'files': [ @@ -41,31 +72,13 @@ }], ['OS=="linux"', { 'variables': { - 'command': [ - '../testing/xvfb.py', - '<(PRODUCT_DIR)', - '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], 'files': [ - '../testing/xvfb.py', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libosmesa.so', '<(PRODUCT_DIR)/locales/fr.pak', ], }, }], - ['OS=="linux" and use_ozone==0', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', - ], - }, - }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'files': [ @@ -105,19 +118,6 @@ ], }, }], - ['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)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], - }, - }], ['OS=="win"', { 'variables': { 'files': [ diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate index ae5b40f..84379d6 100644 --- a/content/content_browsertests.isolate +++ b/content/content_browsertests.isolate @@ -3,6 +3,35 @@ # found in the LICENSE file. { 'conditions': [ + ['use_x11==0', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + }, + }], + ['use_x11==1', { + 'variables': { + 'command': [ + '../testing/xvfb.py', + '<(PRODUCT_DIR)', + '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + 'files': [ + '../testing/xvfb.py', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + ], + }, + }], ['OS=="android"', { 'variables': { 'files': [ @@ -35,17 +64,7 @@ }], ['OS=="linux"', { 'variables': { - 'command': [ - '../testing/xvfb.py', - '<(PRODUCT_DIR)', - '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], 'files': [ - '../testing/xvfb.py', '<(PRODUCT_DIR)/content_shell.pak', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libosmesa.so', @@ -53,13 +72,6 @@ ], }, }], - ['OS=="linux" and use_ozone==0', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', - ], - }, - }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'files': [ @@ -99,18 +111,6 @@ ], }, }], - ['OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], - }, - }], ['OS=="win"', { 'variables': { 'files': [ diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate index 1831f4f..f61a3e1 100644 --- a/content/content_unittests.isolate +++ b/content/content_unittests.isolate @@ -3,6 +3,37 @@ # found in the LICENSE file. { 'conditions': [ + ['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)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + }, + }], + ['use_x11==1', { + 'variables': { + 'command': [ + '../testing/xvfb.py', + '<(PRODUCT_DIR)', + '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + 'files': [ + '../testing/xvfb.py', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + ], + }, + }], ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'files': [ @@ -36,41 +67,14 @@ }], ['OS=="linux"', { 'variables': { - 'command': [ - '../testing/xvfb.py', - '<(PRODUCT_DIR)', - '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], 'files': [ - '../testing/xvfb.py', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libosmesa.so', ], }, }], - ['OS=="linux" and use_ozone==0', { - 'variables': { - 'files': [ - '<(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)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.so', '<(PRODUCT_DIR)/osmesa.so', @@ -79,15 +83,6 @@ }], ['OS=="win"', { 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], '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 5ef0006..e3edaa3 100644 --- a/ui/app_list/app_list_unittests.isolate +++ b/ui/app_list/app_list_unittests.isolate @@ -3,16 +3,20 @@ # found in the LICENSE file. { 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { + ['use_x11==0', { 'variables': { - 'files': [ + 'command': [ '../../testing/test_env.py', '<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/ui_test.pak', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', ], }, }], - ['OS=="linux"', { + ['use_x11==1', { 'variables': { 'command': [ '../../testing/xvfb.py', @@ -26,41 +30,37 @@ ], 'files': [ '../../testing/xvfb.py', - '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], - ['OS=="linux" and use_ozone==0', { + ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '../../testing/test_env.py', + '<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/ui_test.pak', ], }, }], - ['OS=="mac"', { + ['OS=="linux"', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/osmesa.so', + '<(PRODUCT_DIR)/libosmesa.so', ], }, }], - ['OS=="win"', { + ['OS=="mac"', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/osmesa.dll', + '<(PRODUCT_DIR)/osmesa.so', ], }, }], - ['OS=="mac" or OS=="win"', { + ['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)', - '--msan=<(msan)', - '--tsan=<(tsan)', + 'files': [ + '<(PRODUCT_DIR)/osmesa.dll', ], }, }], diff --git a/ui/base/ui_base_unittests.isolate b/ui/base/ui_base_unittests.isolate index 5635f35..6288305 100644 --- a/ui/base/ui_base_unittests.isolate +++ b/ui/base/ui_base_unittests.isolate @@ -3,25 +3,20 @@ # found in the LICENSE file. { 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { + ['use_x11==0', { 'variables': { - 'files': [ + 'command': [ '../../testing/test_env.py', - 'test/data/data_pack_unittest/truncated-header.pak', '<(PRODUCT_DIR)/ui_base_unittests<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/ui_test.pak', - ], - }, - }], - ['OS=="linux" or OS=="win"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/ui/en-US.pak', - '<(PRODUCT_DIR)/ui/ui_resources_100_percent.pak', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', ], }, }], - ['OS=="linux"', { + ['use_x11==1', { 'variables': { 'command': [ '../../testing/xvfb.py', @@ -35,14 +30,32 @@ ], 'files': [ '../../testing/xvfb.py', - '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], - ['OS=="linux" and use_ozone==0', { + ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '../../testing/test_env.py', + 'test/data/data_pack_unittest/truncated-header.pak', + '<(PRODUCT_DIR)/ui_base_unittests<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/ui_test.pak', + ], + }, + }], + ['OS=="linux" or OS=="win"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/ui/en-US.pak', + '<(PRODUCT_DIR)/ui/ui_resources_100_percent.pak', + ], + }, + }], + ['OS=="linux"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/libosmesa.so', ], }, }], @@ -61,19 +74,6 @@ ], }, }], - ['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)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], - }, - }], ['OS=="mac" and asan==1 and fastbuild==0', { 'variables': { 'files': [ diff --git a/ui/events/events_unittests.isolate b/ui/events/events_unittests.isolate index 9f35218..220d1c2 100644 --- a/ui/events/events_unittests.isolate +++ b/ui/events/events_unittests.isolate @@ -3,15 +3,20 @@ # found in the LICENSE file. { 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { + ['use_x11==0', { 'variables': { - 'files': [ + 'command': [ '../../testing/test_env.py', '<(PRODUCT_DIR)/events_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', ], }, }], - ['OS=="linux"', { + ['use_x11==1', { 'variables': { 'command': [ '../../testing/xvfb.py', @@ -25,14 +30,22 @@ ], 'files': [ '../../testing/xvfb.py', - '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'files': [ + '../../testing/test_env.py', + '<(PRODUCT_DIR)/events_unittests<(EXECUTABLE_SUFFIX)', ], }, }], ['OS=="linux" and use_ozone==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libosmesa.so', ], }, }], @@ -50,19 +63,6 @@ ], }, }], - ['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)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], - }, - }], ['OS=="mac" and asan==1 and fastbuild==0', { 'variables': { 'files': [ diff --git a/ui/message_center/message_center_unittests.isolate b/ui/message_center/message_center_unittests.isolate index b544bee..ef9618e 100644 --- a/ui/message_center/message_center_unittests.isolate +++ b/ui/message_center/message_center_unittests.isolate @@ -3,16 +3,20 @@ # found in the LICENSE file. { 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { + ['use_x11==0', { 'variables': { - 'files': [ + 'command': [ '../../testing/test_env.py', '<(PRODUCT_DIR)/message_center_unittests<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/ui_test.pak', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', ], }, }], - ['OS=="linux"', { + ['use_x11==1', { 'variables': { 'command': [ '../../testing/xvfb.py', @@ -26,41 +30,37 @@ ], 'files': [ '../../testing/xvfb.py', - '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], - ['OS=="linux" and use_ozone==0', { + ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '../../testing/test_env.py', + '<(PRODUCT_DIR)/message_center_unittests<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/ui_test.pak', ], }, }], - ['OS=="mac"', { + ['OS=="linux"', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/osmesa.so', + '<(PRODUCT_DIR)/libosmesa.so', ], }, }], - ['OS=="win"', { + ['OS=="mac"', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/osmesa.dll', + '<(PRODUCT_DIR)/osmesa.so', ], }, }], - ['OS=="mac" or OS=="win"', { + ['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)', - '--msan=<(msan)', - '--tsan=<(tsan)', + 'files': [ + '<(PRODUCT_DIR)/osmesa.dll', ], }, }], diff --git a/ui/touch_selection/ui_touch_selection_unittests.isolate b/ui/touch_selection/ui_touch_selection_unittests.isolate index 4e8079a..3218fa4 100644 --- a/ui/touch_selection/ui_touch_selection_unittests.isolate +++ b/ui/touch_selection/ui_touch_selection_unittests.isolate @@ -3,15 +3,20 @@ # found in the LICENSE file. { 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { + ['use_x11==0', { 'variables': { - 'files': [ + 'command': [ '../../testing/test_env.py', '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', ], }, }], - ['OS=="linux"', { + ['use_x11==1', { 'variables': { 'command': [ '../../testing/xvfb.py', @@ -25,27 +30,22 @@ ], 'files': [ '../../testing/xvfb.py', - '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], - ['OS=="linux" and use_ozone==0', { + ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '../../testing/test_env.py', + '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)', ], }, }], - ['OS=="mac" or OS=="win"', { + ['OS=="linux"', { 'variables': { - 'command': [ - '../../testing/test_env.py', - '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', + 'files': [ + '<(PRODUCT_DIR)/libosmesa.so', ], }, }], |