| 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 # TODO: Factor out all of the common items across the test targets into a | |
| 6 # single .gypi file that can be included by each test target. | |
| 7 | |
| 8 { | 5 { |
| 9 'conditions': [ | 6 'conditions': [ |
| 10 ['archive_chromoting_tests==1', { | 7 ['archive_chromoting_tests==1', { |
| 11 'targets': [ | 8 'targets': [ |
| 12 { | 9 { |
| 13 'target_name': 'chromoting_integration_tests_run', | 10 'target_name': 'chromoting_integration_tests_run', |
| 14 'type': 'none', | |
| 15 'dependencies': [ | |
| 16 '../../chrome/chrome.gyp:browser_tests', | |
| 17 '../../remoting/remoting.gyp:remoting_webapp_v1', | |
| 18 '../../remoting/remoting.gyp:remoting_webapp_v2', | |
| 19 ], | |
| 20 'includes': [ | 11 'includes': [ |
| 21 '../../build/isolate.gypi', | 12 './dependencies.gypi', |
| 22 ], | 13 ], |
| 23 'sources': [ | 14 'sources': [ |
| 24 'chromoting_integration_tests.isolate', | 15 'chromoting_integration_tests.isolate', |
| 25 ], | 16 ], |
| 26 'conditions': [ | |
| 27 ['OS=="linux"', { | |
| 28 'dependencies': [ | |
| 29 '../../remoting/remoting.gyp:remoting_me2me_host_archive', | |
| 30 '../../remoting/webapp/app_remoting/internal/app_remoting_all.gy
p:app_remoting_all_apps', | |
| 31 ], | |
| 32 }], # OS=="linux" | |
| 33 ], | |
| 34 }, # target_name: 'chromoting_integration_tests_run' | 17 }, # target_name: 'chromoting_integration_tests_run' |
| 35 { | 18 { |
| 36 'target_name': 'chromoting_multi_machine_example_test', | 19 'target_name': 'chromoting_multi_machine_example_test', |
| 37 'type': 'none', | |
| 38 'dependencies': [ | |
| 39 '../../chrome/chrome.gyp:browser_tests', | |
| 40 '../../remoting/remoting.gyp:remoting_webapp_v1', | |
| 41 '../../remoting/remoting.gyp:remoting_webapp_v2', | |
| 42 ], | |
| 43 'includes': [ | 20 'includes': [ |
| 44 '../../build/isolate.gypi', | 21 './dependencies.gypi', |
| 45 ], | 22 ], |
| 46 'sources': [ | 23 'sources': [ |
| 47 'multi_machine_example/example_test_controller.isolate', | 24 'multi_machine_example/example_test_controller.isolate', |
| 48 'multi_machine_example/example_task.isolate', | 25 'multi_machine_example/example_task.isolate', |
| 49 ], | 26 ], |
| 50 'conditions': [ | |
| 51 ['OS=="linux"', { | |
| 52 'dependencies': [ | |
| 53 '../../remoting/remoting.gyp:remoting_me2me_host_archive', | |
| 54 ], | |
| 55 }], # OS=="linux" | |
| 56 ], | |
| 57 }, # target_name: 'chromoting_multi_machine_example_test' | 27 }, # target_name: 'chromoting_multi_machine_example_test' |
| 58 ], | 28 ], |
| 59 }], | 29 }], |
| 60 ], | 30 ], |
| 61 } | 31 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1124763003:
Update from https://crrev.com/327068 (Closed)
Base URL: git@github.com:domokit/mojo.git@master