[Sync] Rework Invalidator-related unit tests

sync/sync.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     # The core sync library.
@@ skipping 23 matching lines @@
         'protocol/sync_proto.gyp:sync_proto',
       ],
       'export_dependent_settings': [
         # Propagate sync_proto since our headers include its generated
         # files.
         'protocol/sync_proto.gyp:sync_proto',
       ],
       'sources': [
         'base/sync_export.h',
         'internal_api/public/base/enum_set.h',
+        'internal_api/public/base/invalidation_state.cc',
         'internal_api/public/base/invalidation_state.h',
         'internal_api/public/base/model_type.h',
         'internal_api/public/base/model_type_state_map.cc',
         'internal_api/public/base/model_type_state_map.h',
         'internal_api/public/engine/model_safe_worker.cc',
         'internal_api/public/engine/model_safe_worker.h',
         'internal_api/public/engine/passive_model_worker.cc',
         'internal_api/public/engine/passive_model_worker.h',
         'internal_api/public/engine/polling_constants.cc',
         'internal_api/public/engine/polling_constants.h',
@@ skipping 425 matching lines @@
       ],
       'sources': [
         'notifier/fake_invalidation_state_tracker.cc',
         'notifier/fake_invalidation_state_tracker.h',
         'notifier/fake_invalidator.cc',
         'notifier/fake_invalidator.h',
         'notifier/fake_invalidation_handler.cc',
         'notifier/fake_invalidation_handler.h',
         'notifier/object_id_state_map_test_util.cc',
         'notifier/object_id_state_map_test_util.h',
+        'notifier/invalidator_test_template.h',

[Nicolas Zea, 2012/08/29 23:41:05]

abc order

[akalin, 2012/08/30 22:20:38]

Done.

       ],
     },
 
     # Test support files for the 'syncapi_core' target.
     {
       'target_name': 'test_support_syncapi_core',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'include_dirs': [
         '..',
@@ skipping 67 matching lines @@
       # happens in the dependents.
       'export_dependent_settings': [
         '../base/base.gyp:base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         'protocol/sync_proto.gyp:sync_proto',
         'sync',
         'test_support_sync',
       ],
       'direct_dependent_settings': {
-        'variables': { 'enable_wexit_time_destructors': 1, },
         'include_dirs': [
           '..',
         ],
         'sources': [
           'internal_api/public/base/enum_set_unittest.cc',
           'internal_api/public/base/model_type_state_map_unittest.cc',
           'internal_api/public/engine/model_safe_worker_unittest.cc',
           'internal_api/public/util/immutable_unittest.cc',
           'engine/apply_updates_command_unittest.cc',
           'engine/backoff_delay_provider_unittest.cc',
@@ skipping 65 matching lines @@
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         '../third_party/libjingle/libjingle.gyp:libjingle',
         'sync',
         'sync_notifier',
         'test_support_sync_notifier',
       ],
       'direct_dependent_settings': {
-        'variables': { 'enable_wexit_time_destructors': 1, },
         'include_dirs': [
           '..',
         ],
         'sources': [
           'notifier/invalidator_factory_unittest.cc',
         ],
         'conditions': [
           ['OS != "android"', {
             'sources': [
               'notifier/chrome_invalidation_client_unittest.cc',
               'notifier/chrome_system_resources_unittest.cc',
+              'notifier/fake_invalidator_unittest.cc',
               'notifier/invalidation_notifier_unittest.cc',
               'notifier/invalidator_registrar_unittest.cc',
               'notifier/non_blocking_invalidator_unittest.cc',
               'notifier/p2p_invalidator_unittest.cc',
               'notifier/push_client_channel_unittest.cc',
               'notifier/registration_manager_unittest.cc',
             ],
           }],
         ],
       },
@@ skipping 28 matching lines @@
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         'protocol/sync_proto.gyp:sync_proto',
         'sync',
         'sync_notifier',
         'syncapi_core',
         'test_support_syncapi_core',
       ],
       'direct_dependent_settings': {
-        'variables': { 'enable_wexit_time_destructors': 1, },
         'include_dirs': [
           '..',
         ],
         'sources': [
           'internal_api/public/change_record_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',
@@ skipping 25 matching lines @@
       # happens in the dependents.
       'export_dependent_settings': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         'protocol/sync_proto.gyp:sync_proto',
         'sync',
         'syncapi_service',
         'test_support_syncapi_service',
       ],
       'direct_dependent_settings': {
-        'variables': { 'enable_wexit_time_destructors': 1, },
         'include_dirs': [
           '..',
         ],
         'sources': [
           'api/sync_change_unittest.cc',
           'api/sync_error_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, },
       'dependencies': [
         '../base/base.gyp:run_all_unittests',
         'sync_tests',
         'sync_notifier_tests',
         'syncapi_core_tests',
         'syncapi_service_tests',
       ],
       # TODO(akalin): This is needed because histogram.cc uses
       # leak_annotations.h, which pulls this in.  Make 'base'
       # propagate this dependency.
@@ skipping 71 matching lines @@
           'variables': {
             'test_suite_name': 'sync_unit_tests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sync_unit_tests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }