OLD | NEW |
---|---|
1 # Copyright 2012 The Chromium Authors. All rights reserved. | 1 # Copyright 2012 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 'targets': [ | 5 'targets': [ |
6 { | 6 { |
7 # This target contains mocks and test utilities that don't belong in | 7 # This target contains mocks and test utilities that don't belong in |
8 # production libraries but are used by more than one test executable. | 8 # production libraries but are used by more than one test executable. |
9 'target_name': 'test_support_common', | 9 'target_name': 'test_support_common', |
10 'type': 'static_library', | 10 'type': 'static_library', |
11 'dependencies': [ | 11 'dependencies': [ |
12 # NOTE: New dependencies should generally be added in the OS!="ios" | 12 # NOTE: New dependencies should generally be added in the OS!="ios" |
13 # dependencies block below, rather than here. | 13 # dependencies block below, rather than here. |
14 'app/policy/cloud_policy_codegen.gyp:policy_test_support', | 14 'app/policy/cloud_policy_codegen.gyp:policy_test_support', |
15 'browser', | 15 'browser', |
16 '../sync/protocol/sync_proto.gyp:sync_proto', | 16 '../sync/protocol/sync_proto.gyp:sync_proto', |
17 'chrome_resources.gyp:chrome_resources', | 17 'chrome_resources.gyp:chrome_resources', |
18 'chrome_resources.gyp:chrome_strings', | 18 'chrome_resources.gyp:chrome_strings', |
19 'chrome_resources.gyp:theme_resources', | 19 'chrome_resources.gyp:theme_resources', |
20 'common', | 20 'common', |
21 '../base/base.gyp:test_support_base', | 21 '../base/base.gyp:test_support_base', |
22 '../base/base.gyp:base_prefs_test_support', | |
22 '../content/content.gyp:content_app', | 23 '../content/content.gyp:content_app', |
23 '../content/content.gyp:test_support_content', | 24 '../content/content.gyp:test_support_content', |
24 '../media/media.gyp:media_test_support', | 25 '../media/media.gyp:media_test_support', |
25 '../net/net.gyp:net', | 26 '../net/net.gyp:net', |
26 '../net/net.gyp:net_test_support', | 27 '../net/net.gyp:net_test_support', |
27 '../skia/skia.gyp:skia', | 28 '../skia/skia.gyp:skia', |
28 '../testing/gmock.gyp:gmock', | 29 '../testing/gmock.gyp:gmock', |
29 '../testing/gtest.gyp:gtest', | 30 '../testing/gtest.gyp:gtest', |
30 ], | 31 ], |
31 'export_dependent_settings': [ | 32 'export_dependent_settings': [ |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
246 'test/logging/win/log_file_printer.h', | 247 'test/logging/win/log_file_printer.h', |
247 'test/logging/win/log_file_reader.cc', | 248 'test/logging/win/log_file_reader.cc', |
248 'test/logging/win/log_file_reader.h', | 249 'test/logging/win/log_file_reader.h', |
249 'test/logging/win/mof_data_parser.cc', | 250 'test/logging/win/mof_data_parser.cc', |
250 'test/logging/win/mof_data_parser.h', | 251 'test/logging/win/mof_data_parser.h', |
251 'test/logging/win/test_log_collector.cc', | 252 'test/logging/win/test_log_collector.cc', |
252 'test/logging/win/test_log_collector.h', | 253 'test/logging/win/test_log_collector.h', |
253 'test/ppapi/ppapi_test.cc', | 254 'test/ppapi/ppapi_test.cc', |
254 'test/ppapi/ppapi_test.h', | 255 'test/ppapi/ppapi_test.h', |
255 | 256 |
256 # TODO(joi): Move to 'base_prefs' target in base/base.gyp once | |
257 # Prefs move is complete and dependencies have been broken. | |
258 '../base/prefs/testing_pref_store.cc', | |
259 '../base/prefs/testing_pref_store.h', | |
260 '../base/prefs/pref_store_observer_mock.cc', | |
261 '../base/prefs/pref_store_observer_mock.h', | |
262 | |
263 '../ui/gfx/image/image_unittest_util.h', | 257 '../ui/gfx/image/image_unittest_util.h', |
264 '../ui/gfx/image/image_unittest_util.cc', | 258 '../ui/gfx/image/image_unittest_util.cc', |
265 '../webkit/quota/mock_quota_manager.cc', | 259 '../webkit/quota/mock_quota_manager.cc', |
266 '../webkit/quota/mock_quota_manager.h', | 260 '../webkit/quota/mock_quota_manager.h', |
267 ], | 261 ], |
268 'conditions': [ | 262 'conditions': [ |
269 ['OS!="ios"', { | 263 ['OS!="ios"', { |
270 'dependencies': [ | 264 'dependencies': [ |
271 'common/extensions/api/api.gyp:api', | 265 'common/extensions/api/api.gyp:api', |
272 'plugin', | 266 'plugin', |
(...skipping 1313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1586 'test/base/menu_model_test.h', | 1580 'test/base/menu_model_test.h', |
1587 'test/base/v8_unit_test.cc', | 1581 'test/base/v8_unit_test.cc', |
1588 'test/base/v8_unit_test.h', | 1582 'test/base/v8_unit_test.h', |
1589 'test/data/resource.rc', | 1583 'test/data/resource.rc', |
1590 'test/data/unit/framework_unittest.gtestjs', | 1584 'test/data/unit/framework_unittest.gtestjs', |
1591 'test/logging/win/mof_data_parser_unittest.cc', | 1585 'test/logging/win/mof_data_parser_unittest.cc', |
1592 'tools/convert_dict/convert_dict_unittest.cc', | 1586 'tools/convert_dict/convert_dict_unittest.cc', |
1593 | 1587 |
1594 # TODO(joi): Move to 'base_prefs' target in base/base.gyp once | 1588 # TODO(joi): Move to 'base_prefs' target in base/base.gyp once |
1595 # Prefs move is complete and dependencies have been broken. | 1589 # Prefs move is complete and dependencies have been broken. |
1590 '../base/prefs/json_pref_store_unittest.cc', | |
tfarina
2013/01/19 20:50:59
We can move it back to base_unittests and exclude
Jói
2013/01/21 10:33:22
If that passes all bots then I have no issue with
| |
1596 '../base/prefs/public/pref_change_registrar_unittest.cc', | 1591 '../base/prefs/public/pref_change_registrar_unittest.cc', |
1597 '../base/prefs/public/pref_member_unittest.cc', | 1592 '../base/prefs/public/pref_member_unittest.cc', |
1598 '../base/prefs/overlay_user_pref_store_unittest.cc', | |
1599 '../base/prefs/pref_value_map_unittest.cc', | |
1600 '../base/prefs/json_pref_store_unittest.cc', | |
1601 | 1593 |
1602 # TODO(joi): Move the google_apis tests to a separate | 1594 # TODO(joi): Move the google_apis tests to a separate |
1603 # google_apis_unittests executable. | 1595 # google_apis_unittests executable. |
1604 '../google_apis/google_api_keys_unittest.cc', | 1596 '../google_apis/google_api_keys_unittest.cc', |
1605 '../google_apis/gaia/mock_url_fetcher_factory.h', | 1597 '../google_apis/gaia/mock_url_fetcher_factory.h', |
1606 '../google_apis/gaia/gaia_auth_fetcher_unittest.cc', | 1598 '../google_apis/gaia/gaia_auth_fetcher_unittest.cc', |
1607 '../google_apis/gaia/gaia_auth_util_unittest.cc', | 1599 '../google_apis/gaia/gaia_auth_util_unittest.cc', |
1608 '../google_apis/gaia/gaia_authenticator_unittest.cc', | 1600 '../google_apis/gaia/gaia_authenticator_unittest.cc', |
1609 '../google_apis/gaia/gaia_oauth_client_unittest.cc', | 1601 '../google_apis/gaia/gaia_oauth_client_unittest.cc', |
1610 '../google_apis/gaia/google_service_auth_error_unittest.cc', | 1602 '../google_apis/gaia/google_service_auth_error_unittest.cc', |
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2329 'unit_tests.isolate', | 2321 'unit_tests.isolate', |
2330 ], | 2322 ], |
2331 'sources': [ | 2323 'sources': [ |
2332 'unit_tests.isolate', | 2324 'unit_tests.isolate', |
2333 ], | 2325 ], |
2334 }, | 2326 }, |
2335 ], | 2327 ], |
2336 }], | 2328 }], |
2337 ], # 'conditions' | 2329 ], # 'conditions' |
2338 } | 2330 } |
OLD | NEW |