Chromium Code Reviews| Index: media/cast/cast_unittests.isolate |
| diff --git a/ui/app_list/app_list_unittests.isolate b/media/cast/cast_unittests.isolate |
| similarity index 68% |
| copy from ui/app_list/app_list_unittests.isolate |
| copy to media/cast/cast_unittests.isolate |
| index 9862ecf79384b0b47a94eb172a4c2fbce92d1bf7..504f140e64094144e2e8c8074908a32f0e000aeb 100644 |
| --- a/ui/app_list/app_list_unittests.isolate |
| +++ b/media/cast/cast_unittests.isolate |
| @@ -1,81 +1,87 @@ |
| -# Copyright (c) 2014 The Chromium Authors. All rights reserved. |
| -# Use of this source code is governed by a BSD-style license that can be |
| -# found in the LICENSE file. |
| -{ |
| - 'conditions': [ |
| - ['OS=="linux" or OS=="mac" or OS=="win"', { |
| - 'variables': { |
| - 'files': [ |
| - '../../testing/test_env.py', |
| - '<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)', |
| - '<(PRODUCT_DIR)/ui_test.pak', |
| - ], |
| - }, |
| - }], |
| - ['OS=="linux"', { |
| - 'variables': { |
| - 'command': [ |
| - '../../testing/xvfb.py', |
| - '<(PRODUCT_DIR)', |
| - '<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)', |
| - '--brave-new-test-launcher', |
| - '--test-launcher-bot-mode', |
| - '--asan=<(asan)', |
| - '--lsan=<(lsan)', |
| - '--msan=<(msan)', |
| - '--tsan=<(tsan)', |
| - ], |
| - 'files': [ |
| - '../../testing/xvfb.py', |
| - '<(PRODUCT_DIR)/libosmesa.so', |
| - ], |
| - }, |
| - }], |
| - ['OS=="linux" and use_ozone==0', { |
| - 'variables': { |
| - 'files': [ |
| - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', |
| - ], |
| - }, |
| - }], |
| - ['OS=="mac"', { |
| - 'variables': { |
| - 'files': [ |
| - '<(PRODUCT_DIR)/osmesa.so', |
| - ], |
| - }, |
| - }], |
| - ['OS=="win"', { |
| - 'variables': { |
| - 'files': [ |
| - '<(PRODUCT_DIR)/osmesa.dll', |
| - ], |
| - }, |
| - }], |
| - ['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)', |
| - '--msan=<(msan)', |
| - '--tsan=<(tsan)', |
| - ], |
| - }, |
| - }], |
| - ['OS=="mac" and asan==1 and fastbuild==0', { |
| - 'variables': { |
| - 'files': [ |
| - '<(PRODUCT_DIR)/app_list_unittests.dSYM/', |
| - '<(PRODUCT_DIR)/osmesa.so.dSYM/', |
| - ], |
| - }, |
| - }], |
| - ], |
| - 'includes': [ |
| - '../../base/base.isolate', |
| - ], |
| -} |
| +# Copyright 2015 The Chromium Authors. All rights reserved. |
| +# Use of this source code is governed by a BSD-style license that can be |
| +# found in the LICENSE file. |
| +{ |
| + 'conditions': [ |
| + ['OS=="linux"', { |
| + 'variables': { |
| + 'command': [ |
| + '../../testing/xvfb.py', |
| + '<(PRODUCT_DIR)', |
| + '<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)', |
| + '--brave-new-test-launcher', |
| + '--test-launcher-bot-mode', |
| + '--asan=<(asan)', |
| + '--lsan=<(lsan)', |
| + '--msan=<(msan)', |
| + '--tsan=<(tsan)', |
| + ], |
| + 'files': [ |
| + '../../testing/xvfb.py', |
| + '<(PRODUCT_DIR)/libffmpegsumo.so', |
| + ], |
| + }, |
| + }], |
| + ['OS=="linux" and use_ozone==0', { |
| + 'variables': { |
| + 'files': [ |
| + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', |
| + ], |
| + }, |
| + }], |
| + ['OS=="linux" or OS=="mac" or OS=="win"', { |
| + 'variables': { |
| + 'files': [ |
| + '../../testing/test_env.py', |
| + '<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)', |
| + ], |
| + 'read_only': 1, |
|
M-A Ruel
2015/02/26 01:07:02
read_only:1 is now the default so it's not needed
scottmg
2015/02/26 01:09:27
Done.
|
| + }, |
| + }], |
| + ['OS=="mac"', { |
| + 'variables': { |
| + 'files': [ |
| + '<(PRODUCT_DIR)/ffmpegsumo.so', |
| + ], |
| + }, |
| + }], |
| + ['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)', |
| + '--lsan=<(lsan)', |
| + '--msan=<(msan)', |
| + '--tsan=<(tsan)', |
| + ], |
| + }, |
| + }], |
| + ['OS=="mac" and asan==1 and fastbuild==0', { |
| + 'variables': { |
| + 'files': [ |
| + '<(PRODUCT_DIR)/cast_unittests.dSYM/', |
| + ], |
| + }, |
| + }], |
| + ['OS=="win"', { |
| + 'variables': { |
| + 'files': [ |
| + '<(PRODUCT_DIR)/ffmpegsumo.dll', |
| + ], |
| + }, |
| + }], |
| + ['OS=="win" and (fastbuild==0 or fastbuild==1)', { |
| + 'variables': { |
| + 'files': [ |
| + '<(PRODUCT_DIR)/cast_unittests.exe.pdb', |
| + ], |
| + }, |
| + }], |
| + ], |
| + 'includes': [ |
| + '../../base/base.isolate', |
| + ], |
| +} |