diff options
Diffstat (limited to 'chromium/net/net_unittests.isolate')
| -rw-r--r-- | chromium/net/net_unittests.isolate | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/chromium/net/net_unittests.isolate b/chromium/net/net_unittests.isolate index 9c88f77493d..2e04ea34544 100644 --- a/chromium/net/net_unittests.isolate +++ b/chromium/net/net_unittests.isolate @@ -16,23 +16,15 @@ ], }, }], - ['OS=="linux"', { + ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../testing/xvfb.py', - '<(PRODUCT_DIR)', - '../tools/swarm_client/googletest/run_test_cases.py', + '../testing/test_env.py', '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', ], 'isolate_dependency_tracked': [ - '../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'isolate_dependency_tracked': [ '../testing/test_env.py', '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', ], @@ -40,29 +32,17 @@ '../third_party/pyftpdlib/', '../third_party/pywebsocket/', '../third_party/tlslite/', - '../tools/swarm_client/', + '../tools/swarming_client/', '<(PRODUCT_DIR)/pyproto/', 'tools/testserver/', ], }, }], - ['OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '../tools/swarm_client/googletest/run_test_cases.py', - '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', - ], - }, - }], ['OS=="win"', { 'variables': { 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/icudt.dll', ], - 'isolate_dependency_untracked': [ - '../third_party/python_26/', - ], }, }], ], |