Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 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 { | 5 { |
| 6 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 # GN version: //remoting:test_support | 8 # GN version: //remoting:test_support |
| 9 'target_name': 'remoting_test_common', | 9 'target_name': 'remoting_test_common', |
| 10 'type': 'static_library', | 10 'type': 'static_library', |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 113 '../remoting/remoting.gyp:remoting_client', | 113 '../remoting/remoting.gyp:remoting_client', |
| 114 '../remoting/remoting.gyp:remoting_protocol', | 114 '../remoting/remoting.gyp:remoting_protocol', |
| 115 '../testing/gtest.gyp:gtest', | 115 '../testing/gtest.gyp:gtest', |
| 116 ], | 116 ], |
| 117 'defines': [ | 117 'defines': [ |
| 118 'VERSION=<(version_full)', | 118 'VERSION=<(version_full)', |
| 119 ], | 119 ], |
| 120 'sources': [ | 120 'sources': [ |
| 121 'test/access_token_fetcher.cc', | 121 'test/access_token_fetcher.cc', |
| 122 'test/access_token_fetcher.h', | 122 'test/access_token_fetcher.h', |
| 123 'test/host_info.cc', | |
| 124 'test/host_info.h', | |
|
joedow
2015/07/14 19:58:44
Why were the chromoting and app remoting specific
tonychun
2015/07/15 17:32:50
I have made a new struct called ConnectionInfo whi
| |
| 123 'test/refresh_token_store.cc', | 125 'test/refresh_token_store.cc', |
| 124 'test/refresh_token_store.h', | 126 'test/refresh_token_store.h', |
| 125 'test/remote_connection_observer.h', | 127 'test/remote_connection_observer.h', |
| 128 'test/remote_host_info.cc', | |
| 129 'test/remote_host_info.h', | |
| 126 'test/test_chromoting_client.cc', | 130 'test/test_chromoting_client.cc', |
| 127 'test/test_chromoting_client.h', | 131 'test/test_chromoting_client.h', |
| 128 'test/test_video_renderer.cc', | 132 'test/test_video_renderer.cc', |
| 129 'test/test_video_renderer.h', | 133 'test/test_video_renderer.h', |
| 130 ], | 134 ], |
| 131 }, # end of target 'remoting_test_driver_common' | 135 }, # end of target 'remoting_test_driver_common' |
| 132 { | 136 { |
| 133 # A chromoting version of remoting_test_driver_common | 137 # A chromoting version of remoting_test_driver_common |
| 134 'target_name': 'chromoting_test_driver', | 138 'target_name': 'chromoting_test_driver', |
| 135 'type': '<(gtest_target_type)', | 139 'type': '<(gtest_target_type)', |
| 136 'dependencies': [ | 140 'dependencies': [ |
| 141 '../remoting/proto/chromotocol.gyp:chromotocol_proto_lib', | |
|
joedow
2015/07/14 19:58:44
Shouldn't this go in the common section since it i
tonychun
2015/07/15 17:32:50
I tried moving this dependency up to 'remoting_tes
anandc
2015/07/15 21:12:29
How about moving it to remoting_test_common?
| |
| 137 'remoting_test_driver_common', | 142 'remoting_test_driver_common', |
| 138 ], | 143 ], |
| 139 'defines': [ | 144 'defines': [ |
| 140 'VERSION=<(version_full)', | 145 'VERSION=<(version_full)', |
| 141 ], | 146 ], |
| 142 'sources': [ | 147 'sources': [ |
| 143 'test/host_info.cc', | 148 'test/chromoting_test_driver.cc', |
| 144 'test/host_info.h', | |
| 145 'test/host_list_fetcher.cc', | 149 'test/host_list_fetcher.cc', |
| 146 'test/host_list_fetcher.h', | 150 'test/host_list_fetcher.h', |
| 147 'test/chromoting_test_driver.cc', | |
| 148 ], | 151 ], |
| 149 'include_dirs': [ | 152 'include_dirs': [ |
| 150 '../testing/gtest/include', | 153 '../testing/gtest/include', |
| 151 ], | 154 ], |
| 152 }, # end of target 'chromoting_test_driver' | 155 }, # end of target 'chromoting_test_driver' |
| 153 { | 156 { |
| 154 'target_name': 'ar_test_driver_common', | 157 'target_name': 'ar_test_driver_common', |
| 155 'type': 'static_library', | 158 'type': 'static_library', |
| 156 'dependencies': [ | 159 'dependencies': [ |
| 157 '../remoting/proto/chromotocol.gyp:chromotocol_proto_lib', | 160 '../remoting/proto/chromotocol.gyp:chromotocol_proto_lib', |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 168 'test/app_remoting_connection_helper.h', | 171 'test/app_remoting_connection_helper.h', |
| 169 'test/app_remoting_latency_test_fixture.cc', | 172 'test/app_remoting_latency_test_fixture.cc', |
| 170 'test/app_remoting_latency_test_fixture.h', | 173 'test/app_remoting_latency_test_fixture.h', |
| 171 'test/app_remoting_report_issue_request.cc', | 174 'test/app_remoting_report_issue_request.cc', |
| 172 'test/app_remoting_report_issue_request.h', | 175 'test/app_remoting_report_issue_request.h', |
| 173 'test/app_remoting_service_urls.cc', | 176 'test/app_remoting_service_urls.cc', |
| 174 'test/app_remoting_service_urls.h', | 177 'test/app_remoting_service_urls.h', |
| 175 'test/app_remoting_test_driver_environment.cc', | 178 'test/app_remoting_test_driver_environment.cc', |
| 176 'test/app_remoting_test_driver_environment.h', | 179 'test/app_remoting_test_driver_environment.h', |
| 177 'test/remote_application_details.h', | 180 'test/remote_application_details.h', |
| 178 'test/remote_host_info.cc', | |
| 179 'test/remote_host_info.h', | |
| 180 'test/remote_host_info_fetcher.cc', | 181 'test/remote_host_info_fetcher.cc', |
| 181 'test/remote_host_info_fetcher.h', | 182 'test/remote_host_info_fetcher.h', |
| 182 ], | 183 ], |
| 183 'include_dirs': [ | 184 'include_dirs': [ |
| 184 '../testing/gtest/include', | 185 '../testing/gtest/include', |
| 185 ], | 186 ], |
| 186 }, # end of target 'ar_test_driver_common' | 187 }, # end of target 'ar_test_driver_common' |
| 187 { | 188 { |
| 188 # An external version of the test driver tool which includes minimal tests | 189 # An external version of the test driver tool which includes minimal tests |
| 189 'target_name': 'ar_sample_test_driver', | 190 'target_name': 'ar_sample_test_driver', |
| (...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 652 '../build/isolate.gypi', | 653 '../build/isolate.gypi', |
| 653 ], | 654 ], |
| 654 'sources': [ | 655 'sources': [ |
| 655 'remoting_unittests.isolate', | 656 'remoting_unittests.isolate', |
| 656 ], | 657 ], |
| 657 }, | 658 }, |
| 658 ], | 659 ], |
| 659 }], | 660 }], |
| 660 ] # end of 'conditions' | 661 ] # end of 'conditions' |
| 661 } | 662 } |
| OLD | NEW |