| OLD | NEW |
| 1 # Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 { | 4 { |
| 5 'conditions': [ | 5 'conditions': [ |
| 6 ['OS=="linux"', { | 6 ['OS=="linux"', { |
| 7 'variables': { | 7 'variables': { |
| 8 'command': [ | 8 'command': [ |
| 9 '../xvfb.py', | 9 '../xvfb.py', |
| 10 '<(PRODUCT_DIR)', | 10 '<(PRODUCT_DIR)', |
| 11 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', | 11 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', |
| 12 '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch', | 12 '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch', |
| 13 '--run-manual', | 13 '--run-manual', |
| 14 '--ui-test-action-timeout=100000', | 14 '--ui-test-action-timeout=100000', |
| 15 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp', | 15 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp', |
| 16 '--extension-name=Chromoting', | 16 '--extension-name=Chromoting', |
| 17 ], | 17 ], |
| 18 'isolate_dependency_tracked': [ | 18 'files': [ |
| 19 '../xvfb.py', | 19 '../xvfb.py', |
| 20 '<(PRODUCT_DIR)/libffmpegsumo.so', | 20 '<(PRODUCT_DIR)/libffmpegsumo.so', |
| 21 '<(PRODUCT_DIR)/libosmesa.so', | 21 '<(PRODUCT_DIR)/libosmesa.so', |
| 22 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 22 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 23 ], | 23 ], |
| 24 }, | 24 }, |
| 25 }], | 25 }], |
| 26 ['OS=="linux" and use_ozone==0', { | 26 ['OS=="linux" and use_ozone==0', { |
| 27 'variables': { | 27 'variables': { |
| 28 'isolate_dependency_tracked': [ | 28 'files': [ |
| 29 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', | 29 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', |
| 30 ], | 30 ], |
| 31 }, | 31 }, |
| 32 }], | 32 }], |
| 33 ['OS=="linux" or OS=="mac" or OS=="win"', { | 33 ['OS=="linux" or OS=="mac" or OS=="win"', { |
| 34 'variables': { | 34 'variables': { |
| 35 'isolate_dependency_tracked': [ | 35 'files': [ |
| 36 '../test_env.py', | 36 '../test_env.py', |
| 37 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', | 37 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', |
| 38 '<(PRODUCT_DIR)/remoting/remoting.webapp/', | 38 '<(PRODUCT_DIR)/remoting/remoting.webapp/', |
| 39 '<(PRODUCT_DIR)/resources.pak', | 39 '<(PRODUCT_DIR)/resources.pak', |
| 40 ], | 40 ], |
| 41 'read_only': 1, | 41 'read_only': 1, |
| 42 }, | 42 }, |
| 43 }], | 43 }], |
| 44 ['OS=="linux" or OS=="win"', { | 44 ['OS=="linux" or OS=="win"', { |
| 45 'variables': { | 45 'variables': { |
| 46 'isolate_dependency_tracked': [ | 46 'files': [ |
| 47 '<(PRODUCT_DIR)/chrome_100_percent.pak', | 47 '<(PRODUCT_DIR)/chrome_100_percent.pak', |
| 48 '<(PRODUCT_DIR)/locales/en-US.pak', | 48 '<(PRODUCT_DIR)/locales/en-US.pak', |
| 49 ], | 49 ], |
| 50 }, | 50 }, |
| 51 }], | 51 }], |
| 52 ['OS=="mac" or OS=="win"', { | 52 ['OS=="mac" or OS=="win"', { |
| 53 'variables': { | 53 'variables': { |
| 54 'command': [ | 54 'command': [ |
| 55 '../testing/test_env.py', | 55 '../testing/test_env.py', |
| 56 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', | 56 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', |
| 57 '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch', | 57 '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch', |
| 58 '--run-manual', | 58 '--run-manual', |
| 59 '--ui-test-action-timeout=100000', | 59 '--ui-test-action-timeout=100000', |
| 60 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp', | 60 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp', |
| 61 '--extension-name=Chromoting', | 61 '--extension-name=Chromoting', |
| 62 ], | 62 ], |
| 63 }, | 63 }, |
| 64 }], | 64 }], |
| 65 ], | 65 ], |
| 66 'includes': [ | 66 'includes': [ |
| 67 '../../base/base.isolate', | 67 '../../base/base.isolate', |
| 68 ], | 68 ], |
| 69 } | 69 } |
| OLD | NEW |