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

Unified Diff: remoting/remoting_test.gypi

Issue 1237093004: Support for connecting to localhost on the chromoting test driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleaned up ConnectionSetupInfo, comments, and merge changes. Created 5 years, 5 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
Index: remoting/remoting_test.gypi
diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi
index ec3a693440b776c56661fe632cef9fd174c7b804..5964acb8b0e6fde267349a3325382cc086be0f95 100644
--- a/remoting/remoting_test.gypi
+++ b/remoting/remoting_test.gypi
@@ -56,6 +56,15 @@
'test/app_remoting_report_issue_request.h',
'test/app_remoting_service_urls.cc',
'test/app_remoting_service_urls.h',
+ 'test/app_remoting_test_driver_environment.cc',
+ 'test/app_remoting_test_driver_environment_app_details.cc',
joedow 2015/07/16 23:26:33 Same comments as the other CL, please make sure al
tonychun 2015/07/17 16:25:49 Done.
+ 'test/app_remoting_test_driver_environment.h',
Sergey Ulanov 2015/07/16 23:42:09 Please remove these 3 files - it would fail to com
tonychun 2015/07/17 16:25:49 Done.
+ 'test/connection_setup_info.cc',
+ 'test/connection_setup_info.h',
+ 'test/host_info.cc',
+ 'test/host_info.h',
+ 'test/host_list_fetcher.cc',
+ 'test/host_list_fetcher.h',
'test/fake_access_token_fetcher.cc',
'test/fake_access_token_fetcher.h',
'test/fake_app_remoting_report_issue_request.cc',
@@ -103,14 +112,52 @@
],
},
{
+ 'target_name': 'remoting_test_driver_common',
joedow 2015/07/16 23:26:33 Pretty sure this was removed, please make sure thi
Sergey Ulanov 2015/07/16 23:42:09 I removed this target in my CL. It's not necessary
tonychun 2015/07/17 16:25:49 Done.
+ 'type': 'static_library',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../base/base.gyp:test_support_base',
+ '../google_apis/google_apis.gyp:google_apis',
+ '../net/net.gyp:net',
+ '../remoting/remoting.gyp:remoting_base',
+ '../remoting/remoting.gyp:remoting_client',
+ '../remoting/remoting.gyp:remoting_protocol',
+ '../testing/gtest.gyp:gtest',
+ ],
+ 'defines': [
+ 'VERSION=<(version_full)',
+ ],
+ 'sources': [
+ 'test/access_token_fetcher.cc',
+ 'test/access_token_fetcher.h',
+ 'test/connection_setup_info.cc',
+ 'test/connection_setup_info.h',
+ 'test/refresh_token_store.cc',
+ 'test/refresh_token_store.h',
+ 'test/remote_connection_observer.h',
+ 'test/test_chromoting_client.cc',
+ 'test/test_chromoting_client.h',
+ 'test/test_video_renderer.cc',
+ 'test/test_video_renderer.h',
+ ],
+ }, # end of target 'remoting_test_driver_common'
+ {
+ # A chromoting version of remoting_test_driver_common
'target_name': 'chromoting_test_driver',
'type': '<(gtest_target_type)',
'dependencies': [
- 'remoting_test_support',
- '../testing/gtest.gyp:gtest',
+ '../remoting/proto/chromotocol.gyp:chromotocol_proto_lib',
+ 'remoting_test_driver_common',
+ ],
+ 'defines': [
+ 'VERSION=<(version_full)',
],
'sources': [
'test/chromoting_test_driver.cc',
+ 'test/host_info.cc',
+ 'test/host_info.h',
+ 'test/host_list_fetcher.cc',
+ 'test/host_list_fetcher.h',
],
}, # end of target 'chromoting_test_driver'
{

Powered by Google App Engine
This is Rietveld 408576698