diff --git a/BUILD.gn b/BUILD.gn index b9b9233b4f96a4..eea3c8c25bd7e9 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -130,7 +130,6 @@ if (is_win) { "//base:base_unittests", "//chrome/test:browser_tests", "//chrome/test:sync_integration_tests", - "//components/sync:sync_unit_tests", "//ipc:ipc_tests", "//media:media_unittests", "//media/midi:midi_unittests", @@ -185,7 +184,6 @@ group("both_gn_and_gyp") { "//base:base_unittests", "//chrome/installer", "//components:components_unittests", - "//components/sync:sync_unit_tests", "//net:net_unittests", "//skia:skia_unittests", "//sql:sql_unittests", diff --git a/build/all.gyp b/build/all.gyp index 8a8417edf80dbb..04cd9752f840e5 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -310,7 +310,6 @@ '../net/net.gyp:net_unittests', '../skia/skia_tests.gyp:skia_unittests', '../sql/sql.gyp:sql_unittests', - '../components/sync.gyp:sync_unit_tests', '../ui/base/ui_base_tests.gyp:ui_base_unittests', '../ui/display/display.gyp:display_unittests', '../ui/gfx/gfx_tests.gyp:gfx_unittests', @@ -795,7 +794,6 @@ '../sandbox/sandbox.gyp:sandbox_linux_unittests_deps', '../skia/skia_tests.gyp:skia_unittests', '../sql/sql.gyp:sql_unittests', - '../components/sync.gyp:sync_unit_tests', '../testing/android/junit/junit_test.gyp:junit_unit_tests', '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests', '../third_party/WebKit/public/all.gyp:*', @@ -826,7 +824,6 @@ '../net/net.gyp:net_unittests_apk', '../skia/skia_tests.gyp:skia_unittests_apk', '../sql/sql.gyp:sql_unittests_apk', - '../components/sync.gyp:sync_unit_tests_apk', '../ui/android/ui_android.gyp:ui_android_unittests_apk', '../ui/android/ui_android.gyp:ui_junit_tests', '../ui/base/ui_base_tests.gyp:ui_base_unittests_apk', @@ -910,7 +907,6 @@ '../rlz/rlz.gyp:*', '../skia/skia_tests.gyp:skia_unittests', '../sql/sql.gyp:sql_unittests', - '../components/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests', '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', @@ -949,7 +945,6 @@ '../remoting/remoting.gyp:remoting_unittests', '../skia/skia_tests.gyp:skia_unittests', '../sql/sql.gyp:sql_unittests', - '../components/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests', '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', @@ -1021,7 +1016,6 @@ '../remoting/remoting.gyp:remoting_unittests', '../skia/skia_tests.gyp:skia_unittests', '../sql/sql.gyp:sql_unittests', - '../components/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests', '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', @@ -1113,7 +1107,6 @@ '../remoting/remoting.gyp:remoting_unittests', '../skia/skia_tests.gyp:skia_unittests', '../sql/sql.gyp:sql_unittests', - '../components/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests', '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', @@ -1169,7 +1162,6 @@ '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', '../sql/sql.gyp:sql_unittests', - '../components/sync.gyp:sync_unit_tests', '../ui/base/ui_base_tests.gyp:ui_base_unittests', '../ui/gfx/gfx_tests.gyp:gfx_unittests', '../ui/gl/gl_tests.gyp:gl_unittests', @@ -1250,7 +1242,6 @@ '../base/base.gyp:base_unittests', '../ipc/ipc.gyp:ipc_tests', '../sql/sql.gyp:sql_unittests', - '../components/sync.gyp:sync_unit_tests', ], }], ['chromeos==1', { diff --git a/build/android/pylib/gtest/gtest_config.py b/build/android/pylib/gtest/gtest_config.py index c80ba7f4f83cf9..9bc2c80f862553 100644 --- a/build/android/pylib/gtest/gtest_config.py +++ b/build/android/pylib/gtest/gtest_config.py @@ -37,7 +37,6 @@ 'sandbox_linux_unittests', 'skia_unittests', 'sql_unittests', - 'sync_unit_tests', 'ui_android_unittests', 'ui_base_unittests', 'ui_touch_selection_unittests', diff --git a/build/android/pylib/gtest/gtest_test_instance.py b/build/android/pylib/gtest/gtest_test_instance.py index f41881a76f8029..56755baecd2cd2 100644 --- a/build/android/pylib/gtest/gtest_test_instance.py +++ b/build/android/pylib/gtest/gtest_test_instance.py @@ -42,7 +42,6 @@ 'midi_unittests': 'media/midi/midi_unittests.isolate', 'net_unittests': 'net/net_unittests.isolate', 'sql_unittests': 'sql/sql_unittests.isolate', - 'sync_unit_tests': 'components/sync/sync_unit_tests.isolate', 'ui_base_unittests': 'ui/base/ui_base_tests.isolate', 'unit_tests': 'chrome/unit_tests.isolate', 'webkit_unit_tests': diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index c9c582dd819ddf..7535ff394f4026 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -71,7 +71,6 @@ '../printing/printing.gyp:printing_unittests', '../skia/skia_tests.gyp:skia_unittests', '../sql/sql.gyp:sql_unittests', - '../components/sync.gyp:sync_unit_tests', '../testing/gmock.gyp:gmock_main', '../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_heap_unittests', '../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_platform_unittests', @@ -220,7 +219,6 @@ '../sandbox/sandbox.gyp:sandbox_linux_unittests_deps', '../skia/skia_tests.gyp:skia_unittests_apk', '../sql/sql.gyp:sql_unittests_apk', - '../components/sync.gyp:sync_unit_tests_apk', '../testing/android/junit/junit_test.gyp:junit_unit_tests', '../third_party/smhasher/smhasher.gyp:murmurhash3', '../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_heap_unittests_apk', @@ -573,7 +571,6 @@ '../remoting/remoting.gyp:remoting_unittests_run', '../skia/skia_tests.gyp:skia_unittests_run', '../sql/sql.gyp:sql_unittests_run', - '../components/sync.gyp:sync_unit_tests_run', '../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_heap_unittests_run', '../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_platform_unittests_run', '../third_party/WebKit/Source/web/web_tests.gyp:webkit_unit_tests_run', diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index 827e5998ebd23f..f1783d85ed362f 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -521,11 +521,6 @@ FILES = [ 'buildtype': ['dev', 'official'], 'optional': ['dev', 'official'], }, - { - 'filename': 'sync_unit_tests.exe', - 'buildtype': ['official'], - 'optional': ['official'], - }, # Installer files (official build only): { 'filename': 'setup.exe', diff --git a/chromecast/BUILD.gn b/chromecast/BUILD.gn index 2bcf69be95a054..cfd4ad75a1bd8f 100644 --- a/chromecast/BUILD.gn +++ b/chromecast/BUILD.gn @@ -40,7 +40,6 @@ cast_test_group("cast_tests") { "//ppapi:ppapi_unittests", "//sandbox/linux:sandbox_linux_unittests", "//sql:sql_unittests", - "//components/sync:sync_unit_tests", "//third_party/cacheinvalidation:cacheinvalidation_unittests", "//ui/base:ui_base_unittests", ] @@ -85,7 +84,6 @@ cast_test_group("cast_tests") { # SoundsManagerTest.Play # Disable AudioStreamHandlerTest.ConsecutivePlayRequests (b/16539293) "media_unittests --gtest_filter=-AudioOutputControllerTest.PlayDivertSwitchDeviceRevertClose:AudioOutputControllerTest.PlaySwitchDeviceClose:AudioStreamHandlerTest.Play:AudioStreamHandlerTest.ConsecutivePlayRequests:PipelineIntegrationTest.BasicPlayback_MediaSource_VP9_WebM:PipelineIntegrationTest.BasicPlayback_VideoOnly_VP9_WebM:PipelineIntegrationTest.BasicPlayback_VP9*:PipelineIntegrationTest.P444_VP9_WebM:PipelineIntegrationTest.BasicPlayback_VP8A*:OpusAudioDecoderTest/AudioDecoderTest.ProduceAudioSamples/0:SoundsManagerTest.Play", - "sync_unit_tests --gtest_filter=-SyncHttpBridgeTest.*", # DoAppendUTF8Invalid fails because of dcheck_always_on flag in Eng builds "url_unittests --gtest_filter=-URLCanonTest.DoAppendUTF8Invalid", diff --git a/chromecast/chromecast_tests.gypi b/chromecast/chromecast_tests.gypi index 68e6d47805c0ea..cac841a18984ec 100644 --- a/chromecast/chromecast_tests.gypi +++ b/chromecast/chromecast_tests.gypi @@ -110,7 +110,6 @@ '../ppapi/ppapi_internal.gyp:ppapi_unittests', '../sandbox/sandbox.gyp:sandbox_linux_unittests', '../sql/sql.gyp:sql_unittests', - '../components/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../ui/base/ui_base_tests.gyp:ui_base_unittests', '../url/url.gyp:url_unittests', @@ -153,7 +152,6 @@ # SoundsManagerTest.Play # Disable AudioStreamHandlerTest.ConsecutivePlayRequests (b/16539293) 'media_unittests --gtest_filter=-AudioOutputControllerTest.PlayDivertSwitchDeviceRevertClose:AudioOutputControllerTest.PlaySwitchDeviceClose:AudioStreamHandlerTest.Play:AudioStreamHandlerTest.ConsecutivePlayRequests:PipelineIntegrationTest.BasicPlayback_MediaSource_VP9_WebM:PipelineIntegrationTest.BasicPlayback_VideoOnly_VP9_WebM:PipelineIntegrationTest.BasicPlayback_VP9*:PipelineIntegrationTest.P444_VP9_WebM:PipelineIntegrationTest.BasicPlayback_VP8A*:OpusAudioDecoderTest/AudioDecoderTest.ProduceAudioSamples/0:SoundsManagerTest.Play', - 'sync_unit_tests --gtest_filter=-SyncHttpBridgeTest.*', # DoAppendUTF8Invalid fails because of dcheck_always_on flag in Eng builds 'url_unittests --gtest_filter=-URLCanonTest.DoAppendUTF8Invalid', ], @@ -262,7 +260,6 @@ '../media/midi/midi.gyp:midi_unittests_apk', '../net/net.gyp:net_unittests_apk', '../sql/sql.gyp:sql_unittests_apk', - '../components/sync.gyp:sync_unit_tests_apk', '../ui/events/events_unittests.gyp:events_unittests_apk', '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk', ], diff --git a/components/BUILD.gn b/components/BUILD.gn index 900b50af71a7f7..6c5950ee945aee 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -126,6 +126,7 @@ test("components_unittests") { "//components/subresource_filter/core/common:unit_tests", "//components/suggestions:unit_tests", "//components/supervised_user_error_page:unit_tests", + "//components/sync:unit_tests", "//components/sync_bookmarks:unit_tests", "//components/sync_driver:unit_tests", "//components/sync_sessions:unit_tests", diff --git a/components/components_tests.gyp b/components/components_tests.gyp index d1e1a891749013..841fe277c6ab14 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -832,6 +832,90 @@ 'supervised_user_error_page_unittest_sources': [ 'supervised_user_error_page/supervised_user_error_page_unittest.cc', ], + 'sync_unittest_sources': [ + 'sync/api/attachments/attachment_id_unittest.cc', + 'sync/api/attachments/attachment_metadata_unittest.cc', + 'sync/api/attachments/attachment_unittest.cc', + 'sync/api/entity_data_unittest.cc', + 'sync/api/model_type_service_unittest.cc', + 'sync/api/sync_change_unittest.cc', + 'sync/api/sync_data_unittest.cc', + 'sync/api/sync_error_unittest.cc', + 'sync/api/sync_merge_result_unittest.cc', + 'sync/engine_impl/apply_control_data_updates_unittest.cc', + 'sync/engine_impl/backoff_delay_provider_unittest.cc', + 'sync/engine_impl/directory_commit_contribution_unittest.cc', + 'sync/engine_impl/directory_update_handler_unittest.cc', + 'sync/engine_impl/get_updates_processor_unittest.cc', + 'sync/engine_impl/model_type_worker_unittest.cc', + 'sync/engine_impl/sync_scheduler_unittest.cc', + 'sync/engine_impl/syncer_proto_util_unittest.cc', + 'sync/engine_impl/syncer_unittest.cc', + 'sync/engine_impl/syncer_util_unittest.cc', + 'sync/engine_impl/worker_entity_tracker_unittest.cc', + 'sync/core_impl/attachments/attachment_downloader_impl_unittest.cc', + 'sync/core_impl/attachments/attachment_service_impl_unittest.cc', + 'sync/core_impl/attachments/attachment_service_proxy_unittest.cc', + 'sync/core_impl/attachments/attachment_store_frontend_unittest.cc', + 'sync/core_impl/attachments/attachment_store_test_template.h', + 'sync/core_impl/attachments/attachment_uploader_impl_unittest.cc', + 'sync/core_impl/attachments/fake_attachment_downloader_unittest.cc', + 'sync/core_impl/attachments/fake_attachment_uploader_unittest.cc', + 'sync/core_impl/attachments/in_memory_attachment_store_unittest.cc', + 'sync/core_impl/attachments/on_disk_attachment_store_unittest.cc', + 'sync/core_impl/attachments/task_queue_unittest.cc', + 'sync/core_impl/debug_info_event_listener_unittest.cc', + 'sync/core/http_bridge_unittest.cc', + 'sync/core_impl/js_mutation_event_observer_unittest.cc', + 'sync/core_impl/js_sync_encryption_handler_observer_unittest.cc', + 'sync/core_impl/js_sync_manager_observer_unittest.cc', + 'sync/core_impl/model_type_connector_proxy_unittest.cc', + 'sync/core/model_type_store_backend_unittest.cc', + 'sync/core/model_type_store_impl_unittest.cc', + 'sync/core/processor_entity_tracker_unittest.cc', + 'sync/core_impl/protocol_event_buffer_unittest.cc', + 'sync/base/attachment_id_proto_unittest.cc', + 'sync/base/cancelation_signal_unittest.cc', + 'sync/base/enum_set_unittest.cc', + 'sync/base/node_ordinal_unittest.cc', + 'sync/base/ordinal_unittest.cc', + 'sync/base/unique_position_unittest.cc', + 'sync/core/change_record_unittest.cc', + 'sync/core/data_batch_impl_unittest.cc', + 'sync/engine/model_safe_worker_unittest.cc', + 'sync/sessions/sync_session_snapshot_unittest.cc', + 'sync/core/simple_metadata_change_list_unittest.cc', + 'sync/base/immutable_unittest.cc', + 'sync/base/proto_value_ptr_unittest.cc', + 'sync/base/weak_handle_unittest.cc', + 'sync/core/shared_model_type_processor_unittest.cc', + 'sync/core_impl/sync_encryption_handler_impl_unittest.cc', + 'sync/core_impl/sync_manager_impl_unittest.cc', + 'sync/core_impl/syncapi_server_connection_manager_unittest.cc', + 'sync/js/js_event_details_unittest.cc', + 'sync/js/sync_js_controller_unittest.cc', + 'sync/protocol/proto_enum_conversions_unittest.cc', + 'sync/protocol/proto_value_conversions_unittest.cc', + 'sync/sessions_impl/model_type_registry_unittest.cc', + 'sync/sessions_impl/nudge_tracker_unittest.cc', + 'sync/sessions_impl/status_controller_unittest.cc', + 'sync/syncable/directory_backing_store_unittest.cc', + 'sync/syncable/directory_unittest.cc', + 'sync/syncable/directory_unittest.h', + 'sync/syncable/entry_kernel_unittest.cc', + 'sync/syncable/model_type_unittest.cc', + 'sync/syncable/nigori_util_unittest.cc', + 'sync/syncable/parent_child_index_unittest.cc', + 'sync/syncable/syncable_enum_conversions_unittest.cc', + 'sync/syncable/syncable_id_unittest.cc', + 'sync/syncable/syncable_unittest.cc', + 'sync/syncable/syncable_util_unittest.cc', + 'sync/base/cryptographer_unittest.cc', + 'sync/base/data_type_histogram_unittest.cc', + 'sync/base/get_session_name_unittest.cc', + 'sync/base/nigori_unittest.cc', + 'sync/base/protobuf_unittest.cc', + ], 'sync_bookmarks_unittest_sources': [ 'sync_bookmarks/bookmark_data_type_controller_unittest.cc', ], @@ -1101,6 +1185,7 @@ '<@(subresource_filter_core_common_unittest_sources)', '<@(suggestions_unittest_sources)', '<@(supervised_user_error_page_unittest_sources)', + '<@(sync_unittest_sources)', '<@(sync_bookmarks_unittest_sources)', '<@(sync_driver_unittest_sources)', '<@(sync_sessions_unittest_sources)', @@ -1127,8 +1212,6 @@ '../jingle/jingle.gyp:notifier_test_util', '../net/net.gyp:net_test_support', '../sql/sql.gyp:test_support_sql', - '../components/sync.gyp:sync', - '../components/sync.gyp:test_support_sync_api', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icui18n', @@ -1274,6 +1357,10 @@ 'mime_util/mime_util.gyp:mime_util', 'prefs/prefs.gyp:prefs', 'prefs/prefs.gyp:prefs_test_support', + 'sync.gyp:sync', + 'sync.gyp:test_support_sync_api', + 'sync.gyp:test_support_sync_core', + 'sync.gyp:test_support_sync_core_impl', 'url_formatter/url_formatter.gyp:url_formatter', ], 'conditions': [ @@ -1443,6 +1530,9 @@ # component directory structure). ['exclude', '^[^/]*/content/'], ], + 'sources!': [ + 'core/http_bridge_unittest.cc', + ], 'mac_bundle_resources': [ '<(PRODUCT_DIR)/ui_test.pak', ], diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn index 0ed965235bc233..e1e0273044b889 100644 --- a/components/sync/BUILD.gn +++ b/components/sync/BUILD.gn @@ -609,8 +609,8 @@ static_library("test_support_sync_api") { ] } -# GYP version: sync/sync_tests.gypi:sync_unit_tests -test("sync_unit_tests") { +source_set("unit_tests") { + testonly = true sources = [ "api/attachments/attachment_id_unittest.cc", "api/attachments/attachment_metadata_unittest.cc", @@ -712,7 +712,6 @@ test("sync_unit_tests") { ":test_support_sync_core", ":test_support_sync_core_impl", "//base", - "//base/test:run_all_unittests", "//components/sync", "//components/sync/protocol", "//google_apis", diff --git a/components/sync/sync_tests.gypi b/components/sync/sync_tests.gypi index 6fdc321ad56e01..7a3ad9d8d059af 100644 --- a/components/sync/sync_tests.gypi +++ b/components/sync/sync_tests.gypi @@ -242,141 +242,6 @@ 'api/sync_error_factory_mock.h', ], }, - - # The unit test executable for sync tests. - # GN version: //components/sync:sync_unit_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', - ], - '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', - '../sql/sql.gyp:test_support_sql', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', - 'sync', - 'test_support_sync_api', - 'test_support_sync_core', - 'test_support_sync_core_impl', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'api/attachments/attachment_id_unittest.cc', - 'api/attachments/attachment_metadata_unittest.cc', - 'api/attachments/attachment_unittest.cc', - 'api/entity_data_unittest.cc', - 'api/model_type_service_unittest.cc', - 'api/sync_change_unittest.cc', - 'api/sync_data_unittest.cc', - 'api/sync_error_unittest.cc', - 'api/sync_merge_result_unittest.cc', - 'engine_impl/apply_control_data_updates_unittest.cc', - 'engine_impl/backoff_delay_provider_unittest.cc', - 'engine_impl/directory_commit_contribution_unittest.cc', - 'engine_impl/directory_update_handler_unittest.cc', - 'engine_impl/get_updates_processor_unittest.cc', - 'engine_impl/model_type_worker_unittest.cc', - 'engine_impl/sync_scheduler_unittest.cc', - 'engine_impl/syncer_proto_util_unittest.cc', - 'engine_impl/syncer_unittest.cc', - 'engine_impl/syncer_util_unittest.cc', - 'engine_impl/worker_entity_tracker_unittest.cc', - 'core_impl/attachments/attachment_downloader_impl_unittest.cc', - 'core_impl/attachments/attachment_service_impl_unittest.cc', - 'core_impl/attachments/attachment_service_proxy_unittest.cc', - 'core_impl/attachments/attachment_store_frontend_unittest.cc', - 'core_impl/attachments/attachment_store_test_template.h', - 'core_impl/attachments/attachment_uploader_impl_unittest.cc', - 'core_impl/attachments/fake_attachment_downloader_unittest.cc', - 'core_impl/attachments/fake_attachment_uploader_unittest.cc', - 'core_impl/attachments/in_memory_attachment_store_unittest.cc', - 'core_impl/attachments/on_disk_attachment_store_unittest.cc', - 'core_impl/attachments/task_queue_unittest.cc', - 'core_impl/debug_info_event_listener_unittest.cc', - 'core/http_bridge_unittest.cc', - 'core_impl/js_mutation_event_observer_unittest.cc', - 'core_impl/js_sync_encryption_handler_observer_unittest.cc', - 'core_impl/js_sync_manager_observer_unittest.cc', - 'core_impl/model_type_connector_proxy_unittest.cc', - 'core/model_type_store_backend_unittest.cc', - 'core/model_type_store_impl_unittest.cc', - 'core/processor_entity_tracker_unittest.cc', - 'core_impl/protocol_event_buffer_unittest.cc', - 'base/attachment_id_proto_unittest.cc', - 'base/cancelation_signal_unittest.cc', - 'base/enum_set_unittest.cc', - 'base/node_ordinal_unittest.cc', - 'base/ordinal_unittest.cc', - 'base/unique_position_unittest.cc', - 'core/change_record_unittest.cc', - 'core/data_batch_impl_unittest.cc', - 'engine/model_safe_worker_unittest.cc', - 'sessions/sync_session_snapshot_unittest.cc', - 'core/simple_metadata_change_list_unittest.cc', - 'base/immutable_unittest.cc', - 'base/proto_value_ptr_unittest.cc', - 'base/weak_handle_unittest.cc', - 'core/shared_model_type_processor_unittest.cc', - 'core_impl/sync_encryption_handler_impl_unittest.cc', - 'core_impl/sync_manager_impl_unittest.cc', - 'core_impl/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_impl/model_type_registry_unittest.cc', - 'sessions_impl/nudge_tracker_unittest.cc', - 'sessions_impl/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', - 'base/cryptographer_unittest.cc', - 'base/data_type_histogram_unittest.cc', - 'base/get_session_name_unittest.cc', - 'base/nigori_unittest.cc', - 'base/protobuf_unittest.cc', - ], - 'conditions': [ - ['OS == "android"', { - 'dependencies': [ - '../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!': [ - 'core/http_bridge_unittest.cc', - ], - }], - ], - }, ], 'conditions': [ ['OS != "ios"', { @@ -494,55 +359,6 @@ 'test/fake_server/android/fake_server_helper_android.h', ], }, - { - # GN: //components/sync:sync_unit_tests_apk - 'target_name': 'sync_unit_tests_apk', - 'type': 'none', - 'dependencies': [ - 'sync_unit_tests', - ], - 'variables': { - 'test_suite_name': 'sync_unit_tests', - 'isolate_file': '../sync_unit_tests.isolate', - }, - 'includes': [ '../../build/apk_test.gypi' ], - }, - ], - 'conditions': [ - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'sync_unit_tests_apk_run', - 'type': 'none', - 'dependencies': [ - 'sync_unit_tests_apk', - ], - 'includes': [ - '../../build/isolate.gypi', - ], - 'sources': [ - 'sync_unit_tests_apk.isolate', - ], - }, - ], - }], - ], - }], - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'sync_unit_tests_run', - 'type': 'none', - 'dependencies': [ - 'sync_unit_tests', - ], - 'includes': [ - '../../build/isolate.gypi', - ], - 'sources': [ - '../sync_unit_tests.isolate', - ], - }, ], }], ], diff --git a/components/sync/sync_unit_tests_apk.isolate b/components/sync/sync_unit_tests_apk.isolate deleted file mode 100644 index dbd6410830be56..00000000000000 --- a/components/sync/sync_unit_tests_apk.isolate +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2015 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -{ - 'includes': [ - '../../build/android/android.isolate', - 'sync_unit_tests.isolate', - ], - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/bin/run_sync_unit_tests', - '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', - ], - 'files': [ - '../../base/base.isolate', - '../../build/config/', - '../../third_party/icu/icu.isolate', - '../../third_party/instrumented_libraries/instrumented_libraries.isolate', - '<(PRODUCT_DIR)/bin/run_sync_unit_tests', - '<(PRODUCT_DIR)/sync_unit_tests_apk/', - 'sync_unit_tests.isolate', - ] - }, -} diff --git a/components/sync_unit_tests.isolate b/components/sync_unit_tests.isolate deleted file mode 100644 index b1806521e6cfdd..00000000000000 --- a/components/sync_unit_tests.isolate +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2015 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '../../testing/test_env.py', - '<(PRODUCT_DIR)/sync_unit_tests<(EXECUTABLE_SUFFIX)', - '--brave-new-test-launcher', - '--test-launcher-bot-mode', - '--asan=<(asan)', - '--msan=<(msan)', - '--tsan=<(tsan)', - ], - 'files': [ - '../../chrome/test/data/sync/', - '../../net/tools/testserver/', - '../../testing/test_env.py', - '../../third_party/pyftpdlib/', - '../../third_party/pywebsocket/', - '../../third_party/tlslite/', - '<(PRODUCT_DIR)/pyproto/google/', - ], - }, - }], - ], - 'includes': [ - '../../base/base.isolate', - ], -} diff --git a/ios/build/bots/tests/common_tests.json b/ios/build/bots/tests/common_tests.json index f5aca97e5c1be5..81f46344db53cb 100644 --- a/ios/build/bots/tests/common_tests.json +++ b/ios/build/bots/tests/common_tests.json @@ -36,9 +36,6 @@ { "app": "sql_unittests" }, - { - "app": "sync_unit_tests" - }, { "app": "ui_base_unittests" }, diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json index d70e33cb657501..1e9e20216c9cca 100644 --- a/testing/buildbot/chromium.android.json +++ b/testing/buildbot/chromium.android.json @@ -469,19 +469,6 @@ }, "test": "sql_unittests" }, - { - "override_isolate_target": "sync_unit_tests", - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "device_os": "MMB29Q", - "device_type": "bullhead" - } - ] - }, - "test": "sync_unit_tests" - }, { "override_isolate_target": "ui_android_unittests", "swarming": { @@ -1020,19 +1007,6 @@ }, "test": "sql_unittests" }, - { - "override_isolate_target": "sync_unit_tests", - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "device_os": "KTU84P", - "device_type": "hammerhead" - } - ] - }, - "test": "sync_unit_tests" - }, { "override_isolate_target": "ui_android_unittests", "swarming": { @@ -1182,9 +1156,6 @@ { "test": "sql_unittests" }, - { - "test": "sync_unit_tests" - }, { "test": "ui_android_unittests" }, @@ -1289,9 +1260,6 @@ { "test": "sql_unittests" }, - { - "test": "sync_unit_tests" - }, { "test": "ui_android_unittests" }, @@ -1399,9 +1367,6 @@ { "test": "sql_unittests" }, - { - "test": "sync_unit_tests" - }, { "test": "ui_android_unittests" }, @@ -1517,9 +1482,6 @@ { "test": "sql_unittests" }, - { - "test": "sync_unit_tests" - }, { "test": "ui_android_unittests" }, @@ -1630,9 +1592,6 @@ { "test": "sql_unittests" }, - { - "test": "sync_unit_tests" - }, { "test": "ui_android_unittests" }, @@ -1740,9 +1699,6 @@ { "test": "sql_unittests" }, - { - "test": "sync_unit_tests" - }, { "test": "ui_android_unittests" }, @@ -1856,9 +1812,6 @@ { "test": "sql_unittests" }, - { - "test": "sync_unit_tests" - }, { "test": "ui_android_unittests" }, @@ -1966,9 +1919,6 @@ { "test": "sql_unittests" }, - { - "test": "sync_unit_tests" - }, { "test": "ui_android_unittests" }, diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json index 6cd6fd433871e1..ac106b3586fd27 100644 --- a/testing/buildbot/chromium.chromiumos.json +++ b/testing/buildbot/chromium.chromiumos.json @@ -313,12 +313,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "test": "ui_arc_unittests" }, @@ -655,12 +649,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "test": "ui_arc_unittests" }, @@ -971,12 +959,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "test": "ui_arc_unittests" }, diff --git a/testing/buildbot/chromium.full.json b/testing/buildbot/chromium.full.json index 6e5ea1866f7b7f..173dd033cacc4a 100644 --- a/testing/buildbot/chromium.full.json +++ b/testing/buildbot/chromium.full.json @@ -356,12 +356,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -652,12 +646,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -906,12 +894,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index 82291b043baf46..76288d5b6d1c59 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json @@ -109,12 +109,6 @@ ], "test": "sql_unittests" }, - { - "args": [ - "--tool=asan" - ], - "test": "sync_unit_tests" - }, { "args": [ "--tool=asan" @@ -607,19 +601,6 @@ }, "test": "sql_unittests" }, - { - "override_isolate_target": "sync_unit_tests", - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "android_devices": "4", - "device_type": "gce_x86" - } - ] - }, - "test": "sync_unit_tests" - }, { "override_isolate_target": "ui_android_unittests", "swarming": { @@ -788,9 +769,6 @@ { "test": "sql_unittests" }, - { - "test": "sync_unit_tests" - }, { "test": "ui_android_unittests" }, @@ -1164,12 +1142,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -1526,12 +1498,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -1707,9 +1673,6 @@ { "test": "sync_integration_tests" }, - { - "test": "sync_unit_tests" - }, { "test": "ui_base_unittests" }, @@ -1858,9 +1821,6 @@ { "test": "sync_integration_tests" }, - { - "test": "sync_unit_tests" - }, { "test": "ui_base_unittests" }, @@ -2040,9 +2000,6 @@ { "test": "sync_integration_tests" }, - { - "test": "sync_unit_tests" - }, { "test": "ui_base_unittests" }, @@ -2337,12 +2294,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -2613,12 +2564,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -2901,12 +2846,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -3374,12 +3313,6 @@ { "test": "sync_integration_tests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -3695,12 +3628,6 @@ { "test": "sync_integration_tests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -3964,12 +3891,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -4227,12 +4148,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -4490,12 +4405,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -4753,12 +4662,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -5016,12 +4919,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -5279,12 +5176,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -5530,12 +5421,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -5769,12 +5654,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -5995,12 +5874,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -6240,12 +6113,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -6503,12 +6370,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -6766,12 +6627,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -7029,12 +6884,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -7292,12 +7141,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -7555,12 +7398,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -7818,12 +7655,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -8081,12 +7912,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -8338,12 +8163,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -8601,12 +8420,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -8965,12 +8778,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -9306,12 +9113,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -9533,9 +9334,6 @@ { "test": "sql_unittests" }, - { - "test": "sync_unit_tests" - }, { "test": "ui_base_unittests" }, @@ -9856,12 +9654,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -10077,9 +9869,6 @@ { "test": "sql_unittests" }, - { - "test": "sync_unit_tests" - }, { "test": "ui_base_unittests" }, @@ -10900,12 +10689,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -11157,12 +10940,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json index 269e79e547f696..344f3bf3807488 100644 --- a/testing/buildbot/chromium.linux.json +++ b/testing/buildbot/chromium.linux.json @@ -513,20 +513,6 @@ }, "test": "sql_unittests" }, - { - "override_isolate_target": "sync_unit_tests", - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "android_devices": "4", - "device_os": "KTU84P", - "device_type": "hammerhead" - } - ] - }, - "test": "sync_unit_tests" - }, { "override_isolate_target": "ui_android_unittests", "swarming": { @@ -740,9 +726,6 @@ { "test": "sql_unittests" }, - { - "test": "sync_unit_tests" - }, { "test": "ui_android_unittests" }, @@ -951,12 +934,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -1388,12 +1365,6 @@ }, "test": "sync_integration_tests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -1827,12 +1798,6 @@ }, "test": "sync_integration_tests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -2200,12 +2165,6 @@ }, "test": "sync_integration_tests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json index e24c31878486a3..05e39bfae6134f 100644 --- a/testing/buildbot/chromium.mac.json +++ b/testing/buildbot/chromium.mac.json @@ -13,7 +13,6 @@ "printing_unittests", "skia_unittests", "sql_unittests", - "sync_unit_tests", "ui_base_unittests", "unit_tests", "url_unittests" @@ -291,12 +290,6 @@ }, "test": "sync_integration_tests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -630,12 +623,6 @@ }, "test": "sync_integration_tests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -970,12 +957,6 @@ }, "test": "sync_integration_tests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -1298,12 +1279,6 @@ }, "test": "sync_integration_tests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true diff --git a/testing/buildbot/chromium.memory.full.json b/testing/buildbot/chromium.memory.full.json index 6e5ea1866f7b7f..173dd033cacc4a 100644 --- a/testing/buildbot/chromium.memory.full.json +++ b/testing/buildbot/chromium.memory.full.json @@ -356,12 +356,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -652,12 +646,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -906,12 +894,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true diff --git a/testing/buildbot/chromium.memory.fyi.json b/testing/buildbot/chromium.memory.fyi.json index 6e5ea1866f7b7f..173dd033cacc4a 100644 --- a/testing/buildbot/chromium.memory.fyi.json +++ b/testing/buildbot/chromium.memory.fyi.json @@ -356,12 +356,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -652,12 +646,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -906,12 +894,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json index 72540d8b60cc5a..d16b5f9ad96e71 100644 --- a/testing/buildbot/chromium.memory.json +++ b/testing/buildbot/chromium.memory.json @@ -214,12 +214,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -509,12 +503,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "test": "ui_arc_unittests" }, @@ -721,12 +709,6 @@ }, "test": "sql_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index 961bfebee4bbed..d17ec107a281ad 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -405,12 +405,6 @@ }, "test": "sync_integration_tests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -853,12 +847,6 @@ }, "test": "sync_integration_tests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -1338,12 +1326,6 @@ }, "test": "sync_integration_tests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -1734,12 +1716,6 @@ }, "test": "sync_integration_tests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "sync_unit_tests" - }, { "swarming": { "can_use_on_swarming_builders": true diff --git a/testing/buildbot/chromium_memory_trybot.json b/testing/buildbot/chromium_memory_trybot.json index c7453442e6f481..ccc8226ff07d2f 100644 --- a/testing/buildbot/chromium_memory_trybot.json +++ b/testing/buildbot/chromium_memory_trybot.json @@ -125,7 +125,6 @@ }, "skia_unittests", "sql_unittests", - "sync_unit_tests", "ui_base_unittests", { "swarming": { diff --git a/testing/buildbot/client.v8.fyi.json b/testing/buildbot/client.v8.fyi.json index 7d6121ce12c8cc..bf13927ff1715c 100644 --- a/testing/buildbot/client.v8.fyi.json +++ b/testing/buildbot/client.v8.fyi.json @@ -50,7 +50,6 @@ "skia_unittests", "sql_unittests", "sync_integration_tests", - "sync_unit_tests", "ui_base_unittests", "ui_touch_selection_unittests", "unit_tests", diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl index 8b86459ea1a914..645bca1bf0d679 100644 --- a/testing/buildbot/gn_isolate_map.pyl +++ b/testing/buildbot/gn_isolate_map.pyl @@ -526,10 +526,6 @@ "label": "//chrome/test:sync_integration_tests", "type": "windowed_test_launcher", }, - "sync_unit_tests": { - "label": "//components/sync:sync_unit_tests", - "type": "console_test_launcher", - }, "tab_capture_end2end_tests": { "label": "//chrome/test:browser_tests", "type": "gpu_browser_test", diff --git a/testing/buildbot/tryserver.v8.json b/testing/buildbot/tryserver.v8.json index 09adc1a4751992..bdb04a0933eaf8 100644 --- a/testing/buildbot/tryserver.v8.json +++ b/testing/buildbot/tryserver.v8.json @@ -50,7 +50,6 @@ "skia_unittests", "sql_unittests", "sync_integration_tests", - "sync_unit_tests", "ui_base_unittests", "ui_touch_selection_unittests", "unit_tests", diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index 458acfd216c5ae..c2d8ad3db14833 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -453,9 +453,6 @@ def TestSkia(self): def TestSql(self): return self.SimpleTest("chrome", "sql_unittests") - def TestSync(self): - return self.SimpleTest("chrome", "sync_unit_tests") - def TestLinuxSandbox(self): return self.SimpleTest("sandbox", "sandbox_linux_unittests") @@ -709,7 +706,6 @@ def TestLayout(self): "sandbox": TestLinuxSandbox, "sandbox_linux_unittests": TestLinuxSandbox, "skia": TestSkia, "skia_unittests": TestSkia, "sql": TestSql, "sql_unittests": TestSql, - "sync": TestSync, "sync_unit_tests": TestSync, "sync_integration_tests": TestSyncIntegration, "sync_integration": TestSyncIntegration, "ui_base_unit": TestUIBaseUnit, "ui_base_unittests": TestUIBaseUnit,