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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | testing/chromoting/multi_machine_example/example_task.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/chromoting/integration_tests.gyp
diff --git a/testing/chromoting/integration_tests.gyp b/testing/chromoting/integration_tests.gyp
index 2588d249054cec7523c642be9e0e4d7829a9683f..0ab85be342d8f450775dd2138606ca160f053e6e 100644
--- a/testing/chromoting/integration_tests.gyp
+++ b/testing/chromoting/integration_tests.gyp
@@ -2,6 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+# TODO: Factor out all of the common items across the test targets into a
+# single .gypi file that can be included by each test target.
+
{
'conditions': [
['archive_chromoting_tests==1', {
@@ -27,7 +30,30 @@
],
}], # OS=="linux"
],
- },
+ }, # target_name: 'chromoting_integration_tests_run'
+ {
+ 'target_name': 'chromoting_multi_machine_example_test',
+ 'type': 'none',
+ 'dependencies': [
+ '../../chrome/chrome.gyp:browser_tests',
+ '../../remoting/remoting.gyp:remoting_webapp_v1',
+ '../../remoting/remoting.gyp:remoting_webapp_v2',
+ ],
+ 'includes': [
+ '../../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'multi_machine_example/example_test_controller.isolate',
+ 'multi_machine_example/example_task.isolate',
+ ],
+ 'conditions': [
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../../remoting/remoting.gyp:remoting_me2me_host_archive',
+ ],
+ }], # OS=="linux"
+ ],
+ }, # target_name: 'chromoting_multi_machine_example_test'
],
}],
],
« 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