Chromium Code Reviews| 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 './browser_tests_launcher.py', | 9 './browser_tests_launcher.py', |
| 10 '-f', | 10 '-f', |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 42 }, | 42 }, |
| 43 }], | 43 }], |
| 44 ['OS=="linux" or OS=="win"', { | 44 ['OS=="linux" or OS=="win"', { |
| 45 'variables': { | 45 'variables': { |
| 46 'files': [ | 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=="win"', { | |
| 53 'variables': { | |
| 54 'files': [ | |
| 55 # Copy the VS runtime DLLs into the isolate so that they | |
| 56 # don't have to be preinstalled on the target machine. | |
| 57 '<(PRODUCT_DIR)/chrome_elf.dll', | |
| 58 '<(PRODUCT_DIR)/ffmpegsumo.dll', | |
|
anandc
2014/11/04 22:07:08
I'm actually not certain these are sufficient.
Am
| |
| 59 ], | |
| 60 }, | |
| 61 }], | |
| 52 ['OS=="mac" or OS=="win"', { | 62 ['OS=="mac" or OS=="win"', { |
| 53 'variables': { | 63 'variables': { |
| 54 'command': [ | 64 'command': [ |
| 55 '../test_env.py', | 65 '../test_env.py', |
| 56 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', | 66 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', |
| 57 '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch', | 67 '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch', |
| 58 '--run-manual', | 68 '--run-manual', |
| 59 '--ui-test-action-timeout=100000', | 69 '--ui-test-action-timeout=100000', |
| 60 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp', | 70 '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp', |
| 61 '--extension-name=Chromoting', | 71 '--extension-name=Chromoting', |
| 62 ], | 72 ], |
| 63 }, | 73 }, |
| 64 }], | 74 }], |
| 65 ], | 75 ], |
| 66 'includes': [ | 76 'includes': [ |
| 67 '../../base/base.isolate', | 77 '../../base/base.isolate', |
| 68 ], | 78 ], |
| 69 } | 79 } |
| OLD | NEW |