Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(848)

Side by Side Diff: testing/chromoting/integration_tests.gyp

Issue 1012883002: Adding an example multi-machine test for Chromoting. This example starts a test controller machine … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adding the executable bit to the test controller Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | testing/chromoting/multi_machine_example/example_task.isolate » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
5 { 8 {
6 'conditions': [ 9 'conditions': [
7 ['archive_chromoting_tests==1', { 10 ['archive_chromoting_tests==1', {
8 'targets': [ 11 'targets': [
9 { 12 {
10 'target_name': 'chromoting_integration_tests_run', 13 'target_name': 'chromoting_integration_tests_run',
11 'type': 'none', 14 'type': 'none',
12 'dependencies': [ 15 'dependencies': [
13 '../../chrome/chrome.gyp:browser_tests', 16 '../../chrome/chrome.gyp:browser_tests',
14 '../../remoting/remoting.gyp:remoting_webapp_v1', 17 '../../remoting/remoting.gyp:remoting_webapp_v1',
15 '../../remoting/remoting.gyp:remoting_webapp_v2', 18 '../../remoting/remoting.gyp:remoting_webapp_v2',
16 ], 19 ],
17 'includes': [ 20 'includes': [
18 '../../build/isolate.gypi', 21 '../../build/isolate.gypi',
19 ], 22 ],
20 'sources': [ 23 'sources': [
21 'chromoting_integration_tests.isolate', 24 'chromoting_integration_tests.isolate',
22 ], 25 ],
23 'conditions': [ 26 'conditions': [
24 ['OS=="linux"', { 27 ['OS=="linux"', {
25 'dependencies': [ 28 'dependencies': [
26 '../../remoting/remoting.gyp:remoting_me2me_host_archive', 29 '../../remoting/remoting.gyp:remoting_me2me_host_archive',
27 ], 30 ],
28 }], # OS=="linux" 31 }], # OS=="linux"
29 ], 32 ],
30 }, 33 }, # target_name: 'chromoting_integration_tests_run'
34 {
35 'target_name': 'chromoting_multi_machine_example_test',
36 'type': 'none',
37 'dependencies': [
38 '../../chrome/chrome.gyp:browser_tests',
39 '../../remoting/remoting.gyp:remoting_webapp_v1',
40 '../../remoting/remoting.gyp:remoting_webapp_v2',
41 ],
42 'includes': [
43 '../../build/isolate.gypi',
44 ],
45 'sources': [
46 'multi_machine_example/example_test_controller.isolate',
47 'multi_machine_example/example_task.isolate',
48 ],
49 'conditions': [
50 ['OS=="linux"', {
51 'dependencies': [
52 '../../remoting/remoting.gyp:remoting_me2me_host_archive',
53 ],
54 }], # OS=="linux"
55 ],
56 }, # target_name: 'chromoting_multi_machine_example_test'
31 ], 57 ],
32 }], 58 }],
33 ], 59 ],
34 } 60 }
OLDNEW
« no previous file with comments | « no previous file | testing/chromoting/multi_machine_example/example_task.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698