Chromium Code Reviews| Index: components/components_tests.gypi |
| diff --git a/components/components_tests.gypi b/components/components_tests.gypi |
| index 94b87007517ef409eeabcb90957640d353a3fc66..e20cfcd795cf6546ddb99b3e8b12a34384c8f721 100644 |
| --- a/components/components_tests.gypi |
| +++ b/components/components_tests.gypi |
| @@ -3,126 +3,150 @@ |
| # found in the LICENSE file. |
| { |
| - 'conditions': [ |
| - ['OS != "ios"', { |
| - 'targets': [ |
| - { |
| - 'target_name': 'components_unittests', |
| - 'type': '<(gtest_target_type)', |
| - 'sources': [ |
| - 'autofill/core/common/form_data_unittest.cc', |
| - 'autofill/core/common/form_field_data_unittest.cc', |
| - 'auto_login_parser/auto_login_parser_unittest.cc', |
| - 'browser_context_keyed_service/browser_context_dependency_manager_unittest.cc', |
| - 'browser_context_keyed_service/dependency_graph_unittest.cc', |
| - 'dom_distiller/core/dom_distiller_database_unittest.cc', |
| - 'json_schema/json_schema_validator_unittest.cc', |
| - 'json_schema/json_schema_validator_unittest_base.cc', |
| - 'json_schema/json_schema_validator_unittest_base.h', |
| - 'navigation_interception/intercept_navigation_resource_throttle_unittest.cc', |
| - 'sessions/serialized_navigation_entry_unittest.cc', |
| - 'test/run_all_unittests.cc', |
| - # TODO(asvitkine): These should be tested on iOS too. |
| - 'variations/entropy_provider_unittest.cc', |
| - 'variations/metrics_util_unittest.cc', |
| - 'variations/variations_associated_data_unittest.cc', |
| - 'variations/variations_seed_processor_unittest.cc', |
| - 'visitedlink/test/visitedlink_unittest.cc', |
| - 'webdata/encryptor/encryptor_password_mac_unittest.cc', |
| - 'webdata/encryptor/encryptor_unittest.cc', |
| - 'web_modal/web_contents_modal_dialog_manager_unittest.cc', |
| - ], |
| - 'include_dirs': [ |
| - '..', |
| - ], |
| - 'dependencies': [ |
| - '../base/base.gyp:test_support_base', |
| - '../testing/gmock.gyp:gmock', |
| - '../testing/gtest.gyp:gtest', |
| + 'targets': [ |
| + { |
| + 'target_name': 'components_unittests', |
|
blundell
2013/10/02 10:01:17
Same comment.
droger
2013/10/02 10:59:41
Done.
|
| + 'type': '<(gtest_target_type)', |
| + 'sources': [ |
| + 'autofill/core/common/form_data_unittest.cc', |
| + 'autofill/core/common/form_field_data_unittest.cc', |
| + 'auto_login_parser/auto_login_parser_unittest.cc', |
| + 'browser_context_keyed_service/browser_context_dependency_manager_unittest.cc', |
| + 'browser_context_keyed_service/dependency_graph_unittest.cc', |
| + 'dom_distiller/core/dom_distiller_database_unittest.cc', |
| + 'json_schema/json_schema_validator_unittest.cc', |
| + 'json_schema/json_schema_validator_unittest_base.cc', |
| + 'json_schema/json_schema_validator_unittest_base.h', |
| + 'navigation_interception/intercept_navigation_resource_throttle_unittest.cc', |
| + 'sessions/serialized_navigation_entry_unittest.cc', |
| + 'test/run_all_unittests.cc', |
| + 'translate/common/translate_metrics_unittest.cc', |
| + 'translate/common/translate_util_unittest.cc', |
| + 'translate/language_detection/language_detection_util_unittest.cc', |
| + # TODO(asvitkine): These should be tested on iOS too. |
| + 'variations/entropy_provider_unittest.cc', |
| + 'variations/metrics_util_unittest.cc', |
| + 'variations/variations_associated_data_unittest.cc', |
| + 'variations/variations_seed_processor_unittest.cc', |
| + 'visitedlink/test/visitedlink_unittest.cc', |
| + 'webdata/encryptor/encryptor_password_mac_unittest.cc', |
| + 'webdata/encryptor/encryptor_unittest.cc', |
| + 'web_modal/web_contents_modal_dialog_manager_unittest.cc', |
| + ], |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + 'dependencies': [ |
| + '../base/base.gyp:test_support_base', |
| + '../testing/gmock.gyp:gmock', |
| + '../testing/gtest.gyp:gtest', |
| - # Dependencies of autofill |
| - 'autofill_core_common', |
| + # Dependencies of autofill |
| + 'autofill_core_common', |
| - # Dependencies of auto_login_parser |
| - 'auto_login_parser', |
| + # Dependencies of auto_login_parser |
| + 'auto_login_parser', |
| - # Dependencies of browser_context_keyed_service |
| - 'browser_context_keyed_service', |
| + # Dependencies of browser_context_keyed_service |
| + 'browser_context_keyed_service', |
| - # Dependencies of dom_distiller |
| - 'dom_distiller_core', |
| - 'dom_distiller_core_proto', |
| + # Dependencies of dom_distiller |
| + 'dom_distiller_core', |
| + 'dom_distiller_core_proto', |
| - # Dependencies of encryptor |
| - 'encryptor', |
| + # Dependencies of encryptor |
| + 'encryptor', |
| - # Dependencies of json_schema |
| - 'json_schema', |
| + # Dependencies of json_schema |
| + 'json_schema', |
| - # Dependencies of intercept_navigation_resource_throttle_unittest.cc |
| - '../content/content.gyp:test_support_content', |
| - '../skia/skia.gyp:skia', |
| - 'navigation_interception', |
| + # Dependencies of intercept_navigation_resource_throttle_unittest.cc |
| + '../content/content.gyp:test_support_content', |
| + '../skia/skia.gyp:skia', |
| + 'navigation_interception', |
| - # Dependencies of policy |
| - 'policy_component', |
| + # Dependencies of policy |
| + 'policy_component', |
| - # Dependencies of sessions |
| - '../third_party/protobuf/protobuf.gyp:protobuf_lite', |
| - 'sessions', |
| - 'sessions_test_support', |
| + # Dependencies of sessions |
| + '../third_party/protobuf/protobuf.gyp:protobuf_lite', |
| + 'sessions', |
| + 'sessions_test_support', |
| - # Dependencies of variations |
| - 'variations', |
| + # Dependencies of translate. |
| + 'translate_common', |
| + 'translate_language_detection', |
| - # Dependencies of visitedlink |
| - 'visitedlink_browser', |
| - 'visitedlink_renderer', |
| - '../content/content_resources.gyp:content_resources', |
| + # Dependencies of variations |
| + 'variations', |
| + |
| + # Dependencies of visitedlink |
| + 'visitedlink_browser', |
| + 'visitedlink_renderer', |
| + '../content/content_resources.gyp:content_resources', |
| + 'web_modal', |
| + ], |
| + 'conditions': [ |
| + ['OS == "ios"', { |
| + 'sources/': [ |
| + ['exclude', '\\.cc$'], |
| + ['include', '^test/run_all_unittests\\.cc$'], |
| + # TODO(ios): Include files here as they are made to work. |
| + ['include', '^translate'], |
| + ], |
| + 'dependencies!': [ |
| + 'autofill_core_common', |
| + 'dom_distiller_core', |
| + 'dom_distiller_core_proto', |
| + 'navigation_interception', |
| + 'visitedlink_renderer', |
| + ], |
| + }], |
| + ['OS == "android"', { |
| + 'sources!': [ |
| + 'web_modal/web_contents_modal_dialog_manager_unittest.cc', |
| + ], |
| + 'dependencies!': [ |
| 'web_modal', |
| ], |
| - 'conditions': [ |
| - ['OS == "android"', { |
| - 'sources!': [ |
| - 'web_modal/web_contents_modal_dialog_manager_unittest.cc', |
| - ], |
| - 'dependencies!': [ |
| - 'web_modal', |
| - ], |
| - }], |
| - ['OS == "android" and gtest_target_type == "shared_library"', { |
| - 'dependencies': [ |
| - '../testing/android/native_test.gyp:native_test_native_code', |
| - ] |
| - }], |
| - ['OS=="win" and win_use_allocator_shim==1', { |
| - 'dependencies': [ |
| - '../base/allocator/allocator.gyp:allocator', |
| - ], |
| - }], |
| - ['android_webview_build == 0', { |
| - 'dependencies': [ |
| - '../sync/sync.gyp:sync', |
| - ], |
| - }], |
| - ['OS=="linux" and component=="shared_library" and linux_use_tcmalloc==1', { |
| - 'dependencies': [ |
| - '<(DEPTH)/base/allocator/allocator.gyp:allocator', |
| - ], |
| - 'link_settings': { |
| - 'ldflags': ['-rdynamic'], |
| - }, |
| - }], |
| - ['configuration_policy==1', { |
| - 'sources': [ |
| - 'policy/core/common/schema_unittest.cc', |
| - ], |
| - }], |
| + }], |
| + ['OS == "android" and gtest_target_type == "shared_library"', { |
| + 'dependencies': [ |
| + '../testing/android/native_test.gyp:native_test_native_code', |
| + ] |
| + }], |
| + ['OS=="win" and win_use_allocator_shim==1', { |
| + 'dependencies': [ |
| + '../base/allocator/allocator.gyp:allocator', |
| + ], |
| + }], |
| + ['android_webview_build == 0', { |
| + 'dependencies': [ |
| + '../sync/sync.gyp:sync', |
| ], |
| - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| - 'msvs_disabled_warnings': [4267, ], |
| + }], |
| + ['OS=="linux" and component=="shared_library" and linux_use_tcmalloc==1', { |
| + 'dependencies': [ |
| + '<(DEPTH)/base/allocator/allocator.gyp:allocator', |
| + ], |
| + 'link_settings': { |
| + 'ldflags': ['-rdynamic'], |
| }, |
| + }], |
| + ['configuration_policy==1', { |
| + 'sources': [ |
| + 'policy/core/common/schema_unittest.cc', |
| + ], |
| + }], |
| + ], |
| + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| + 'msvs_disabled_warnings': [4267, ], |
| + }, |
| + ], |
| + 'conditions': [ |
| + ['OS != "ios"', { |
| + 'targets': [ |
| { |
| 'target_name': 'components_perftests', |
| 'type': '<(gtest_target_type)', |