diff options
| -rw-r--r-- | cc/cc_unittests.isolate | 47 | ||||
| -rw-r--r-- | components/components_browsertests.isolate | 36 | ||||
| -rw-r--r-- | components/components_unittests.isolate | 61 | ||||
| -rw-r--r-- | crypto/crypto_unittests.isolate | 28 | ||||
| -rw-r--r-- | extensions/extensions_browsertests.isolate | 50 | ||||
| -rw-r--r-- | gpu/gpu_unittests.isolate | 35 | ||||
| -rw-r--r-- | media/cast/cast_unittests.isolate | 34 | ||||
| -rw-r--r-- | media/media_unittests.isolate | 57 |
8 files changed, 169 insertions, 179 deletions
diff --git a/cc/cc_unittests.isolate b/cc/cc_unittests.isolate index eab3396..dc6c449 100644 --- a/cc/cc_unittests.isolate +++ b/cc/cc_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': [ - 'test/data/', + 'command': [ '../testing/test_env.py', '<(PRODUCT_DIR)/cc_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', @@ -26,29 +30,29 @@ ], 'files': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/xdisplaycheck', ], }, }], - ['OS=="linux" and use_ozone==0', { + ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/xdisplaycheck', + 'test/data/', + '../testing/test_env.py', + '<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)', ], }, }], - ['OS=="mac"', { + ['OS=="linux"', { 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/cc_unittests', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', + 'files': [ + '<(PRODUCT_DIR)/libffmpegsumo.so', + '<(PRODUCT_DIR)/libosmesa.so', ], + }, + }], + ['OS=="mac"', { + 'variables': { 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.so', '<(PRODUCT_DIR)/osmesa.so', @@ -57,15 +61,6 @@ }], ['OS=="win"', { 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/cc_unittests.exe', - '--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/components/components_browsertests.isolate b/components/components_browsertests.isolate index 6a6d4dc..c18c7cf 100644 --- a/components/components_browsertests.isolate +++ b/components/components_browsertests.isolate @@ -7,18 +7,20 @@ '../gin/v8.isolate', ], 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { + ['use_x11==0', { 'variables': { - 'files': [ - 'test/data/', + 'command': [ '../testing/test_env.py', '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/components_tests_resources.pak', - '<(PRODUCT_DIR)/content_shell.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', @@ -32,27 +34,25 @@ ], '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)', + 'test/data/', + '../testing/test_env.py', + '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/components_tests_resources.pak', + '<(PRODUCT_DIR)/content_shell.pak', ], }, }], - ['OS=="mac" or OS=="win"', { + ['OS=="linux"', { 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', + 'files': [ + '<(PRODUCT_DIR)/libosmesa.so', ], }, }], diff --git a/components/components_unittests.isolate b/components/components_unittests.isolate index fc3491d..e240ea7 100644 --- a/components/components_unittests.isolate +++ b/components/components_unittests.isolate @@ -3,23 +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/', - '<(PRODUCT_DIR)/components_tests_resources.pak', - ], - }, - }], - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'files': [ + 'command': [ '../testing/test_env.py', '<(PRODUCT_DIR)/components_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', @@ -33,23 +30,36 @@ ], 'files': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/libosmesa.so', '<(PRODUCT_DIR)/xdisplaycheck', ], }, }], - ['OS=="mac"', { + ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'command': [ + 'files': [ + 'test/data/', + '<(PRODUCT_DIR)/components_tests_resources.pak', + ], + }, + }], + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'files': [ '../testing/test_env.py', - '<(PRODUCT_DIR)/components_unittests', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', + '<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)', ], + }, + }], + ['OS=="linux"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/libffmpegsumo.so', + '<(PRODUCT_DIR)/libosmesa.so', + ], + }, + }], + ['OS=="mac"', { + 'variables': { 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.so', '<(PRODUCT_DIR)/osmesa.so', @@ -58,15 +68,6 @@ }], ['OS=="win"', { 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/components_unittests.exe', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], 'files': [ '../chrome/test/data/policy/', '<(PRODUCT_DIR)/ffmpegsumo.dll', diff --git a/crypto/crypto_unittests.isolate b/crypto/crypto_unittests.isolate index 68ac6fa..93272b4 100644 --- a/crypto/crypto_unittests.isolate +++ b/crypto/crypto_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)/crypto_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', @@ -36,19 +49,6 @@ 'read_only': 1, }, }], - ['OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/crypto_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/extensions/extensions_browsertests.isolate b/extensions/extensions_browsertests.isolate index a8a6fb1..d939336 100644 --- a/extensions/extensions_browsertests.isolate +++ b/extensions/extensions_browsertests.isolate @@ -3,22 +3,20 @@ # found in the LICENSE file. { 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { + ['use_x11==0', { 'variables': { - 'files': [ - '../net/data/', - '../net/tools/testserver/', + 'command': [ '../testing/test_env.py', - '../third_party/pyftpdlib/', - '../third_party/pywebsocket/', - '../third_party/tlslite/', '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/extensions_shell_and_test.pak', - 'test/data/', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', ], }, }], - ['OS=="linux"', { + ['use_x11==1', { 'variables': { 'command': [ '../testing/xvfb.py', @@ -32,27 +30,35 @@ ], 'files': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/libosmesa.so', ], }, }], - ['OS=="linux" and use_ozone==0', { + ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '../net/data/', + '../net/tools/testserver/', + '../testing/test_env.py', + '../third_party/pyftpdlib/', + '../third_party/pywebsocket/', + '../third_party/tlslite/', + '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/extensions_shell_and_test.pak', + 'test/data/', ], }, }], - ['OS=="mac" or OS=="win"', { + ['OS=="linux"', { 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', + 'files': [ + '<(PRODUCT_DIR)/libosmesa.so', + ], + }, + }], + ['OS=="linux" and use_ozone==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], diff --git a/gpu/gpu_unittests.isolate b/gpu/gpu_unittests.isolate index a718aac..b12c5cb 100644 --- a/gpu/gpu_unittests.isolate +++ b/gpu/gpu_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)/gpu_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', @@ -29,29 +34,11 @@ ], }, }], - ['OS=="mac"', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/gpu_unittests', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], - }, - }], - ['OS=="win"', { + ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'command': [ + 'files': [ '../testing/test_env.py', - '<(PRODUCT_DIR)/gpu_unittests.exe', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', + '<(PRODUCT_DIR)/gpu_unittests<(EXECUTABLE_SUFFIX)', ], }, }], 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': [ diff --git a/media/media_unittests.isolate b/media/media_unittests.isolate index 742f24f..449fa88 100644 --- a/media/media_unittests.isolate +++ b/media/media_unittests.isolate @@ -6,22 +6,20 @@ '../base/base.isolate', ], 'conditions': [ - ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'files': [ - 'test/data/', - ], - }, - }], - ['OS=="linux" or OS=="mac" or OS=="win"', { + ['use_x11==0', { 'variables': { - 'files': [ + 'command': [ '../testing/test_env.py', '<(PRODUCT_DIR)/media_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', @@ -35,22 +33,34 @@ ], 'files': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/xdisplaycheck', ], }, }], - ['OS=="mac"', { + ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'command': [ + 'files': [ + 'test/data/', + ], + }, + }], + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'files': [ '../testing/test_env.py', - '<(PRODUCT_DIR)/media_unittests', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', + '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)', ], + }, + }], + ['OS=="linux"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/libffmpegsumo.so', + ], + }, + }], + ['OS=="mac"', { + 'variables': { 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.so', ], @@ -58,15 +68,6 @@ }], ['OS=="win"', { 'variables': { - 'command': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/media_unittests.exe', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.dll', ], |