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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/sync_tests.gypi

Issue 418163002: Refactor sync_unit_tests target (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sync_tests.gypi
diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi
index 20ec987ce4077f2e92853b8a730c7e4d403b4f3f..31ac9f9e7381aa2ef23bf0464082f2b54a664b36 100644
--- a/sync/sync_tests.gypi
+++ b/sync/sync_tests.gypi
@@ -224,220 +224,107 @@
],
},
- # Unit tests for the 'sync_core' target. This cannot be a static
- # library because the unit test files have to be compiled directly
- # into the executable, so we push the target files to the
- # depending executable target via direct_dependent_settings.
+ # The unit test executable for sync tests.
{
- 'target_name': 'sync_core_tests',
- 'type': 'none',
- # We only want unit test executables to include this target.
- 'suppress_wildcard': 1,
- 'dependencies': [
- '../base/base.gyp:base',
- '../sql/sql.gyp:sql',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
- 'sync',
- 'test_support_sync_core',
- ],
- 'conditions': [
- ['OS=="linux" and chromeos==1', {
- # Required by get_session_name_unittest.cc on Chrome OS.
- 'dependencies': [
- '../chromeos/chromeos.gyp:chromeos',
- ],
- }],
- ],
- # Propagate all dependencies since the actual compilation
- # happens in the dependents.
- 'export_dependent_settings': [
- '../base/base.gyp:base',
- '../sql/sql.gyp:sql',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
- 'sync',
- 'test_support_sync_core',
+ 'target_name': 'sync_unit_tests',
+ 'type': '<(gtest_target_type)',
+ # Typed-parametrized tests generate exit-time destructors.
+ 'variables': { 'enable_wexit_time_destructors': 0, },
+ 'defines': [
+ 'SYNC_TEST',
],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'internal_api/public/base/attachment_id_proto_unittest.cc',
- 'internal_api/public/base/cancelation_signal_unittest.cc',
- 'internal_api/public/base/enum_set_unittest.cc',
- 'internal_api/public/base/node_ordinal_unittest.cc',
- 'internal_api/public/base/ordinal_unittest.cc',
- 'internal_api/public/base/unique_position_unittest.cc',
- 'internal_api/public/engine/model_safe_worker_unittest.cc',
- 'internal_api/public/util/immutable_unittest.cc',
- 'internal_api/public/util/weak_handle_unittest.cc',
- 'engine/apply_control_data_updates_unittest.cc',
- 'engine/backoff_delay_provider_unittest.cc',
- 'engine/directory_commit_contribution_unittest.cc',
- 'engine/directory_update_handler_unittest.cc',
- 'engine/entity_tracker_unittest.cc',
- 'engine/get_updates_processor_unittest.cc',
- 'engine/model_type_entity_unittest.cc',
- 'engine/model_type_sync_proxy_impl_unittest.cc',
- 'engine/model_type_sync_worker_impl_unittest.cc',
- 'engine/sync_scheduler_unittest.cc',
- 'engine/syncer_proto_util_unittest.cc',
- 'engine/syncer_unittest.cc',
- 'engine/syncer_util_unittest.cc',
- 'js/js_event_details_unittest.cc',
- 'js/sync_js_controller_unittest.cc',
- 'protocol/proto_enum_conversions_unittest.cc',
- 'protocol/proto_value_conversions_unittest.cc',
- 'sessions/model_type_registry_unittest.cc',
- 'sessions/nudge_tracker_unittest.cc',
- 'sessions/status_controller_unittest.cc',
- 'syncable/directory_unittest.cc',
- 'syncable/directory_unittest.h',
- 'syncable/directory_backing_store_unittest.cc',
- 'syncable/entry_kernel_unittest.cc',
- 'syncable/model_type_unittest.cc',
- 'syncable/nigori_util_unittest.cc',
- 'syncable/parent_child_index_unittest.cc',
- 'syncable/syncable_enum_conversions_unittest.cc',
- 'syncable/syncable_id_unittest.cc',
- 'syncable/syncable_unittest.cc',
- 'syncable/syncable_util_unittest.cc',
- 'util/cryptographer_unittest.cc',
- 'util/data_type_histogram_unittest.cc',
- 'util/get_session_name_unittest.cc',
- 'util/nigori_unittest.cc',
- 'util/protobuf_unittest.cc',
- ],
- },
- },
-
- # Unit tests for the 'sync_internal_api' target. This cannot be a static
- # library because the unit test files have to be compiled directly
- # into the executable, so we push the target files to the
- # depending executable target via direct_dependent_settings.
- {
- 'target_name': 'sync_internal_api_tests',
- 'type': 'none',
- # We only want unit test executables to include this target.
- 'suppress_wildcard': 1,
'dependencies': [
'../base/base.gyp:base',
+ '../base/base.gyp:run_all_unittests',
'../google_apis/google_apis.gyp:google_apis',
'../google_apis/google_apis.gyp:google_apis_test_support',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
+ '../sql/sql.gyp:sql',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
+ '../third_party/protobuf/protobuf.gyp:protobuf_lite',
'sync',
+ 'test_support_sync_core',
'test_support_sync_internal_api',
],
- # Propagate all dependencies since the actual compilation
- # happens in the dependents.
- 'export_dependent_settings': [
- '../base/base.gyp:base',
- '../google_apis/google_apis.gyp:google_apis',
- '../google_apis/google_apis.gyp:google_apis_test_support',
- '../net/net.gyp:net',
- '../net/net.gyp:net_test_support',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
- 'sync',
- 'test_support_sync_internal_api',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'internal_api/attachments/attachment_downloader_impl_unittest.cc',
- 'internal_api/attachments/attachment_uploader_impl_unittest.cc',
- 'internal_api/attachments/fake_attachment_downloader_unittest.cc',
- 'internal_api/attachments/fake_attachment_store_unittest.cc',
- 'internal_api/attachments/fake_attachment_uploader_unittest.cc',
- 'internal_api/debug_info_event_listener_unittest.cc',
- 'internal_api/http_bridge_unittest.cc',
- 'internal_api/js_mutation_event_observer_unittest.cc',
- 'internal_api/js_sync_encryption_handler_observer_unittest.cc',
- 'internal_api/js_sync_manager_observer_unittest.cc',
- 'internal_api/protocol_event_buffer_unittest.cc',
- 'internal_api/public/change_record_unittest.cc',
- 'internal_api/public/sessions/sync_session_snapshot_unittest.cc',
- 'internal_api/sync_backup_manager_unittest.cc',
- 'internal_api/sync_context_proxy_impl_unittest.cc',
- 'internal_api/sync_encryption_handler_impl_unittest.cc',
- 'internal_api/sync_manager_impl_unittest.cc',
- 'internal_api/sync_rollback_manager_base_unittest.cc',
- 'internal_api/sync_rollback_manager_unittest.cc',
- 'internal_api/syncapi_server_connection_manager_unittest.cc',
- ],
- 'conditions': [
- ['OS == "ios"', {
- 'sources!': [
- 'internal_api/http_bridge_unittest.cc',
- ],
- }],
- ],
- },
- },
-
- # Unit tests for the 'sync_api' target. This cannot be a static
- # library because the unit test files have to be compiled directly
- # into the executable, so we push the target files to the
- # depending executable target via direct_dependent_settings.
- {
- 'target_name': 'sync_api_tests',
- 'type': 'none',
- # We only want unit test executables to include this target.
- 'suppress_wildcard': 1,
- 'dependencies': [
- '../base/base.gyp:base',
- '../testing/gtest.gyp:gtest',
- 'sync',
- 'test_support_sync_internal_api',
- ],
- # Propagate all dependencies since the actual compilation
- # happens in the dependents.
- 'export_dependent_settings': [
- '../base/base.gyp:base',
- '../testing/gtest.gyp:gtest',
- 'sync',
- 'test_support_sync_internal_api',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'api/attachments/attachment_unittest.cc',
- 'api/attachments/attachment_id_unittest.cc',
- 'api/attachments/attachment_service_impl_unittest.cc',
- 'api/attachments/attachment_service_proxy_unittest.cc',
- 'api/sync_change_unittest.cc',
- 'api/sync_data_unittest.cc',
- 'api/sync_error_unittest.cc',
- 'api/sync_merge_result_unittest.cc',
- ],
- },
- },
-
- # The unit test executable for sync tests.
- {
- 'target_name': 'sync_unit_tests',
- 'type': '<(gtest_target_type)',
- # Typed-parametrized tests generate exit-time destructors.
- 'variables': { 'enable_wexit_time_destructors': 0, },
- 'defines': [
- 'SYNC_TEST',
+ 'include_dirs': [
+ '..',
],
- 'dependencies': [
- '../base/base.gyp:run_all_unittests',
- 'sync_api_tests',
- 'sync_core_tests',
- 'sync_internal_api_tests',
- 'sync',
- '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+ 'sources': [
+ 'api/attachments/attachment_id_unittest.cc',
+ 'api/attachments/attachment_service_impl_unittest.cc',
+ 'api/attachments/attachment_service_proxy_unittest.cc',
+ 'api/attachments/attachment_unittest.cc',
+ 'api/sync_change_unittest.cc',
+ 'api/sync_data_unittest.cc',
+ 'api/sync_error_unittest.cc',
+ 'api/sync_merge_result_unittest.cc',
+ 'engine/apply_control_data_updates_unittest.cc',
+ 'engine/backoff_delay_provider_unittest.cc',
+ 'engine/directory_commit_contribution_unittest.cc',
+ 'engine/directory_update_handler_unittest.cc',
+ 'engine/entity_tracker_unittest.cc',
+ 'engine/get_updates_processor_unittest.cc',
+ 'engine/model_type_entity_unittest.cc',
+ 'engine/model_type_sync_proxy_impl_unittest.cc',
+ 'engine/model_type_sync_worker_impl_unittest.cc',
+ 'engine/sync_scheduler_unittest.cc',
+ 'engine/syncer_proto_util_unittest.cc',
+ 'engine/syncer_unittest.cc',
+ 'engine/syncer_util_unittest.cc',
+ 'internal_api/attachments/attachment_downloader_impl_unittest.cc',
+ 'internal_api/attachments/attachment_uploader_impl_unittest.cc',
+ 'internal_api/attachments/fake_attachment_downloader_unittest.cc',
+ 'internal_api/attachments/fake_attachment_store_unittest.cc',
+ 'internal_api/attachments/fake_attachment_uploader_unittest.cc',
+ 'internal_api/debug_info_event_listener_unittest.cc',
+ 'internal_api/http_bridge_unittest.cc',
+ 'internal_api/js_mutation_event_observer_unittest.cc',
+ 'internal_api/js_sync_encryption_handler_observer_unittest.cc',
+ 'internal_api/js_sync_manager_observer_unittest.cc',
+ 'internal_api/protocol_event_buffer_unittest.cc',
+ 'internal_api/public/base/attachment_id_proto_unittest.cc',
+ 'internal_api/public/base/cancelation_signal_unittest.cc',
+ 'internal_api/public/base/enum_set_unittest.cc',
+ 'internal_api/public/base/node_ordinal_unittest.cc',
+ 'internal_api/public/base/ordinal_unittest.cc',
+ 'internal_api/public/base/unique_position_unittest.cc',
+ 'internal_api/public/change_record_unittest.cc',
+ 'internal_api/public/engine/model_safe_worker_unittest.cc',
+ 'internal_api/public/sessions/sync_session_snapshot_unittest.cc',
+ 'internal_api/public/util/immutable_unittest.cc',
+ 'internal_api/public/util/weak_handle_unittest.cc',
+ 'internal_api/sync_backup_manager_unittest.cc',
+ 'internal_api/sync_context_proxy_impl_unittest.cc',
+ 'internal_api/sync_encryption_handler_impl_unittest.cc',
+ 'internal_api/sync_manager_impl_unittest.cc',
+ 'internal_api/sync_rollback_manager_base_unittest.cc',
+ 'internal_api/sync_rollback_manager_unittest.cc',
+ 'internal_api/syncapi_server_connection_manager_unittest.cc',
+ 'js/js_event_details_unittest.cc',
+ 'js/sync_js_controller_unittest.cc',
+ 'protocol/proto_enum_conversions_unittest.cc',
+ 'protocol/proto_value_conversions_unittest.cc',
+ 'sessions/model_type_registry_unittest.cc',
+ 'sessions/nudge_tracker_unittest.cc',
+ 'sessions/status_controller_unittest.cc',
+ 'syncable/directory_backing_store_unittest.cc',
+ 'syncable/directory_unittest.cc',
+ 'syncable/directory_unittest.h',
+ 'syncable/entry_kernel_unittest.cc',
+ 'syncable/model_type_unittest.cc',
+ 'syncable/nigori_util_unittest.cc',
+ 'syncable/parent_child_index_unittest.cc',
+ 'syncable/syncable_enum_conversions_unittest.cc',
+ 'syncable/syncable_id_unittest.cc',
+ 'syncable/syncable_unittest.cc',
+ 'syncable/syncable_util_unittest.cc',
+ 'util/cryptographer_unittest.cc',
+ 'util/data_type_histogram_unittest.cc',
+ 'util/get_session_name_unittest.cc',
+ 'util/nigori_unittest.cc',
+ 'util/protobuf_unittest.cc',
],
'conditions': [
# TODO(akalin): This is needed because histogram.cc uses
@@ -453,6 +340,17 @@
'../testing/android/native_test.gyp:native_test_native_code',
],
}],
+ ['OS=="linux" and chromeos==1', {
+ # Required by get_session_name_unittest.cc on Chrome OS.
+ 'dependencies': [
+ '../chromeos/chromeos.gyp:chromeos',
+ ],
+ }],
+ ['OS == "ios"', {
+ 'sources!': [
+ 'internal_api/http_bridge_unittest.cc',
+ ],
+ }],
],
},
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698