| 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 './browser_tests_launcher.py', |
| 10 '-f', |
| 11 './browser_test_commands_linux.txt', |
| 12 '-p', |
| 10 '<(PRODUCT_DIR)', | 13 '<(PRODUCT_DIR)', |
| 11 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', | |
| 12 '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch', | |
| 13 '--run-manual', | |
| 14 '--ui-test-action-timeout=100000', | |
| 15 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp', | |
| 16 '--extension-name=Chromoting', | |
| 17 ], | 14 ], |
| 18 'files': [ | 15 'files': [ |
| 19 '../xvfb.py', | 16 '../xvfb.py', |
| 17 './browser_tests_launcher.py', |
| 18 './browser_test_commands_linux.txt', |
| 20 '<(PRODUCT_DIR)/libffmpegsumo.so', | 19 '<(PRODUCT_DIR)/libffmpegsumo.so', |
| 21 '<(PRODUCT_DIR)/libosmesa.so', | 20 '<(PRODUCT_DIR)/libosmesa.so', |
| 22 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 21 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 23 ], | 22 ], |
| 24 }, | 23 }, |
| 25 }], | 24 }], |
| 26 ['OS=="linux" and use_ozone==0', { | 25 ['OS=="linux" and use_ozone==0', { |
| 27 'variables': { | 26 'variables': { |
| 28 'files': [ | 27 'files': [ |
| 29 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', | 28 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', |
| (...skipping 30 matching lines...) Expand all Loading... |
| 60 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp', | 59 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp', |
| 61 '--extension-name=Chromoting', | 60 '--extension-name=Chromoting', |
| 62 ], | 61 ], |
| 63 }, | 62 }, |
| 64 }], | 63 }], |
| 65 ], | 64 ], |
| 66 'includes': [ | 65 'includes': [ |
| 67 '../../base/base.isolate', | 66 '../../base/base.isolate', |
| 68 ], | 67 ], |
| 69 } | 68 } |
| OLD | NEW |