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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 1208963003: Move GN obj files to target-specific dirs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'variables': { 5 'variables': {
6 'chrome_browser_extensions_test_support_sources': [ 6 'chrome_browser_extensions_test_support_sources': [
7 # A list of sources which is shared between different browser tests. 7 # A list of sources which is shared between different browser tests.
8 'browser/apps/app_browsertest_util.cc', 8 'browser/apps/app_browsertest_util.cc',
9 'browser/apps/app_browsertest_util.h', 9 'browser/apps/app_browsertest_util.h',
10 'browser/extensions/browsertest_util.cc', 10 'browser/extensions/browsertest_util.cc',
11 'browser/extensions/browsertest_util.h', 11 'browser/extensions/browsertest_util.h',
12 'browser/extensions/extension_apitest.cc', 12 'browser/extensions/extension_apitest.cc',
13 'browser/extensions/extension_apitest.h', 13 'browser/extensions/extension_apitest.h',
14 'browser/extensions/extension_browsertest.cc', 14 'browser/extensions/extension_browsertest.cc',
15 'browser/extensions/extension_browsertest.h', 15 'browser/extensions/extension_browsertest.h',
16 'browser/extensions/extension_function_test_utils.cc', 16 'browser/extensions/extension_function_test_utils.cc',
17 'browser/extensions/extension_function_test_utils.h', 17 'browser/extensions/extension_function_test_utils.h',
18 'browser/extensions/extension_test_notification_observer.cc', 18 'browser/extensions/extension_test_notification_observer.cc',
19 'browser/extensions/extension_test_notification_observer.h', 19 'browser/extensions/extension_test_notification_observer.h',
20 'browser/extensions/updater/extension_cache_fake.cc', 20 'browser/extensions/updater/extension_cache_fake.cc',
21 'browser/extensions/updater/extension_cache_fake.h', 21 'browser/extensions/updater/extension_cache_fake.h',
22 ], 22 ],
23 'chrome_browser_tests_sources': [ 23 # TODO(rockot): These should be moved to extensions_browsertests but have
24 # The list of sources which is only used by chrome browser tests. 24 # old dependencies on chrome files. The chrome dependencies should be
25 '../apps/app_restore_service_browsertest.cc', 25 # removed and these moved to the extensions_browsertests target.
26 '../apps/load_and_launch_browsertest.cc', 26 'chrome_browser_tests_extensions_sources': [
Nico 2015/06/30 20:38:46 Can you file a bug on rockot for this? I doubt he'
27 # TODO(rockot): Remove this once extensions_browsertests exists.
28 '../extensions/browser/api/app_window/app_window_apitest.cc', 27 '../extensions/browser/api/app_window/app_window_apitest.cc',
29 '../extensions/browser/api/bluetooth/bluetooth_apitest.cc', 28 '../extensions/browser/api/bluetooth/bluetooth_apitest.cc',
30 '../extensions/browser/api/bluetooth/bluetooth_private_apitest.cc', 29 '../extensions/browser/api/bluetooth/bluetooth_private_apitest.cc',
31 '../extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apite st.cc', 30 '../extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apite st.cc',
32 '../extensions/browser/api/cast_channel/cast_channel_apitest.cc', 31 '../extensions/browser/api/cast_channel/cast_channel_apitest.cc',
33 '../extensions/browser/api/runtime/runtime_apitest.cc', 32 '../extensions/browser/api/runtime/runtime_apitest.cc',
34 '../extensions/browser/api/serial/serial_apitest.cc', 33 '../extensions/browser/api/serial/serial_apitest.cc',
35 '../extensions/browser/api/usb/usb_manual_apitest.cc', 34 '../extensions/browser/api/usb/usb_manual_apitest.cc',
36 '../extensions/browser/app_window/app_window_browsertest.cc', 35 '../extensions/browser/app_window/app_window_browsertest.cc',
37 '../extensions/browser/guest_view/extension_options/extension_options_apit est.cc', 36 '../extensions/browser/guest_view/extension_options/extension_options_apit est.cc',
38 '../extensions/browser/guest_view/mime_handler_view/mime_handler_view_brow sertest.cc', 37 '../extensions/browser/guest_view/mime_handler_view/mime_handler_view_brow sertest.cc',
39 '../extensions/renderer/console_apitest.cc', 38 '../extensions/renderer/console_apitest.cc',
40 '../extensions/renderer/script_context_browsertest.cc', 39 '../extensions/renderer/script_context_browsertest.cc',
40 ],
41 'chrome_browser_tests_sources': [
42 # The list of sources which is only used by chrome browser tests.
43 '../apps/app_restore_service_browsertest.cc',
44 '../apps/load_and_launch_browsertest.cc',
41 'app/chrome_command_ids.h', 45 'app/chrome_command_ids.h',
42 'app/chrome_dll.rc', 46 'app/chrome_dll.rc',
43 'app/chrome_dll_resource.h', 47 'app/chrome_dll_resource.h',
44 'app/chrome_version.rc.version', 48 'app/chrome_version.rc.version',
45 'browser/accessibility/browser_accessibility_state_browsertest.cc', 49 'browser/accessibility/browser_accessibility_state_browsertest.cc',
46 'browser/app_controller_mac_browsertest.mm', 50 'browser/app_controller_mac_browsertest.mm',
47 'browser/apps/app_browsertest.cc', 51 'browser/apps/app_browsertest.cc',
48 'browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm', 52 'browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm',
49 'browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.cc', 53 'browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.cc',
50 'browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h', 54 'browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h',
55 'browser/apps/app_speech_recognition_browsertest.cc',
51 'browser/apps/app_url_redirector_browsertest.cc', 56 'browser/apps/app_url_redirector_browsertest.cc',
52 'browser/apps/app_window_browsertest.cc', 57 'browser/apps/app_window_browsertest.cc',
53 'browser/apps/ephemeral_app_browsertest.cc', 58 'browser/apps/ephemeral_app_browsertest.cc',
54 'browser/apps/ephemeral_app_browsertest.h', 59 'browser/apps/ephemeral_app_browsertest.h',
55 'browser/apps/ephemeral_app_launcher_browsertest.cc', 60 'browser/apps/ephemeral_app_launcher_browsertest.cc',
56 'browser/apps/ephemeral_app_service_browsertest.cc', 61 'browser/apps/ephemeral_app_service_browsertest.cc',
57 'browser/apps/event_page_browsertest.cc', 62 'browser/apps/event_page_browsertest.cc',
58 'browser/apps/guest_view/app_view_browsertest.cc', 63 'browser/apps/guest_view/app_view_browsertest.cc',
59 'browser/apps/guest_view/extension_view/extension_view_browsertest.cc', 64 'browser/apps/guest_view/extension_view/extension_view_browsertest.cc',
60 'browser/apps/guest_view/web_view_browsertest.cc', 65 'browser/apps/guest_view/web_view_browsertest.cc',
61 'browser/apps/speech_recognition_browsertest.cc',
62 'browser/apps/window_controls_browsertest.cc', 66 'browser/apps/window_controls_browsertest.cc',
63 'browser/autocomplete/autocomplete_browsertest.cc', 67 'browser/autocomplete/autocomplete_browsertest.cc',
64 'browser/autofill/autofill_browsertest.cc', 68 'browser/autofill/autofill_browsertest.cc',
65 'browser/autofill/autofill_server_browsertest.cc', 69 'browser/autofill/autofill_server_browsertest.cc',
66 'browser/autofill/content_autofill_driver_browsertest.cc', 70 'browser/autofill/content_autofill_driver_browsertest.cc',
67 'browser/autofill/form_structure_browsertest.cc', 71 'browser/autofill/form_structure_browsertest.cc',
68 'browser/banners/app_banner_data_fetcher_browsertest.cc', 72 'browser/banners/app_banner_data_fetcher_browsertest.cc',
69 'browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc', 73 'browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc',
70 'browser/browser_encoding_browsertest.cc', 74 'browser/browser_encoding_browsertest.cc',
71 'browser/browsing_data/browsing_data_database_helper_browsertest.cc', 75 'browser/browsing_data/browsing_data_database_helper_browsertest.cc',
(...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after
929 'test/data/webui/net_internals/net_internals_test.js', 933 'test/data/webui/net_internals/net_internals_test.js',
930 'test/data/webui/net_internals/prerender_view.js', 934 'test/data/webui/net_internals/prerender_view.js',
931 'test/data/webui/net_internals/timeline_view.js', 935 'test/data/webui/net_internals/timeline_view.js',
932 'test/data/webui/net_internals/waterfall_view.js', 936 'test/data/webui/net_internals/waterfall_view.js',
933 'test/data/webui/net_internals/sdch_view.js', 937 'test/data/webui/net_internals/sdch_view.js',
934 'test/data/webui/ntp4.js', 938 'test/data/webui/ntp4.js',
935 'test/data/webui/polymer_browser_test_base.js', 939 'test/data/webui/polymer_browser_test_base.js',
936 'test/data/webui/print_preview.js', 940 'test/data/webui/print_preview.js',
937 'test/data/webui/sandboxstatus_browsertest.js', 941 'test/data/webui/sandboxstatus_browsertest.js',
938 ], 942 ],
943 # TODO(rockot): These should be moved to a target in //extensions but have
944 # old dependencies on chrome files. The chrome dependencies should be
945 # removed and these moved to the extensions_browsertests target.
946 'chrome_interactive_ui_test_extensions_sources': [
947 '../extensions/browser/app_window/app_window_interactive_uitest.cc',
948 ],
939 'chrome_interactive_ui_test_sources': [ 949 'chrome_interactive_ui_test_sources': [
940 '../extensions/browser/app_window/app_window_interactive_uitest.cc',
941 '../ui/base/clipboard/clipboard_android_unittest.cc', 950 '../ui/base/clipboard/clipboard_android_unittest.cc',
942 '../ui/base/clipboard/clipboard_unittest.cc', 951 '../ui/base/clipboard/clipboard_unittest.cc',
943 'browser/apps/app_browsertest_util.cc', 952 'browser/apps/app_browsertest_util.cc',
944 'browser/apps/app_browsertest_util.h', 953 'browser/apps/app_browsertest_util.h',
945 'browser/apps/app_pointer_lock_interactive_uitest.cc', 954 'browser/apps/app_pointer_lock_interactive_uitest.cc',
946 'browser/apps/app_shim/app_shim_interactive_uitest_mac.mm', 955 'browser/apps/app_shim/app_shim_interactive_uitest_mac.mm',
947 'browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm', 956 'browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm',
948 'browser/apps/app_window_interactive_uitest.cc', 957 'browser/apps/app_window_interactive_uitest.cc',
949 'browser/apps/app_window_intercept_all_keys_uitest.cc', 958 'browser/apps/app_window_intercept_all_keys_uitest.cc',
950 'browser/apps/guest_view/web_view_interactive_browsertest.cc', 959 'browser/apps/guest_view/web_view_interactive_browsertest.cc',
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1067 # TODO(tapted): Move these to chrome_interactive_ui_test_views_sources when 1076 # TODO(tapted): Move these to chrome_interactive_ui_test_views_sources when
1068 # the corresponding files are moved in chrome_browser_ui.gypi (i.e. out of 1077 # the corresponding files are moved in chrome_browser_ui.gypi (i.e. out of
1069 # chrome_browser_ui_views_non_mac_sources). 1078 # chrome_browser_ui_views_non_mac_sources).
1070 'chrome_interactive_ui_test_views_non_mac_sources': [ 1079 'chrome_interactive_ui_test_views_non_mac_sources': [
1071 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc', 1080 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
1072 'browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h', 1081 'browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h',
1073 'browser/ui/views/certificate_selector_browsertest.cc', 1082 'browser/ui/views/certificate_selector_browsertest.cc',
1074 'browser/ui/views/constrained_window_views_browsertest.cc', 1083 'browser/ui/views/constrained_window_views_browsertest.cc',
1075 'browser/ui/views/extensions/extension_dialog_interactive_uitest.cc', 1084 'browser/ui/views/extensions/extension_dialog_interactive_uitest.cc',
1076 'browser/ui/views/find_bar_controller_interactive_uitest.cc', 1085 'browser/ui/views/find_bar_controller_interactive_uitest.cc',
1077 'browser/ui/views/find_bar_host_interactive_uitest.cc', 1086 'browser/ui/views/find_bar_views_interactive_uitest.cc',
1078 'browser/ui/views/frame/browser_view_focus_uitest.cc', 1087 'browser/ui/views/frame/browser_view_focus_uitest.cc',
1079 'browser/ui/views/frame/browser_view_interactive_uitest.cc', 1088 'browser/ui/views/frame/browser_view_interactive_uitest.cc',
1080 'browser/ui/views/keyboard_access_browsertest.cc', 1089 'browser/ui/views/keyboard_access_browsertest.cc',
1081 'browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc', 1090 'browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc',
1082 'browser/ui/views/location_bar/page_action_image_view_interactive_uitest.c c', 1091 'browser/ui/views/location_bar/page_action_image_view_interactive_uitest.c c',
1083 'browser/ui/views/location_bar/star_view_browsertest.cc', 1092 'browser/ui/views/location_bar/star_view_browsertest.cc',
1084 'browser/ui/views/omnibox/omnibox_view_views_browsertest.cc', 1093 'browser/ui/views/omnibox/omnibox_view_views_browsertest.cc',
1085 'browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc', 1094 'browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc',
1086 'browser/ui/views/passwords/manage_passwords_icon_view_browsertest.cc', 1095 'browser/ui/views/passwords/manage_passwords_icon_view_browsertest.cc',
1087 'browser/ui/views/ssl_client_certificate_selector_browsertest.cc', 1096 'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
1538 # Runtime dependencies 1547 # Runtime dependencies
1539 '../third_party/mesa/mesa.gyp:osmesa', 1548 '../third_party/mesa/mesa.gyp:osmesa',
1540 ], 1549 ],
1541 'include_dirs': [ 1550 'include_dirs': [
1542 '..', 1551 '..',
1543 ], 1552 ],
1544 'defines': [ 1553 'defines': [
1545 'HAS_OUT_OF_PROC_TEST_RUNNER', 1554 'HAS_OUT_OF_PROC_TEST_RUNNER',
1546 ], 1555 ],
1547 'sources': [ 1556 'sources': [
1557 '<@(chrome_interactive_ui_test_extensions_sources)',
1548 '<@(chrome_interactive_ui_test_sources)', 1558 '<@(chrome_interactive_ui_test_sources)',
1549 ], 1559 ],
1550 'conditions': [ 1560 'conditions': [
1551 [ 'cld_version==0 or cld_version==2', { 1561 [ 'cld_version==0 or cld_version==2', {
1552 'dependencies': [ 1562 'dependencies': [
1553 # Interactive tests should use whatever CLD2 data access mode that 1563 # Interactive tests should use whatever CLD2 data access mode that
1554 # the application embedder is using. 1564 # the application embedder is using.
1555 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ], 1565 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
1556 }], 1566 }],
1557 ['use_x11==1', { 1567 ['use_x11==1', {
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
2054 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_test_license_serv er', 2064 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_test_license_serv er',
2055 ], 2065 ],
2056 'include_dirs': [ 2066 'include_dirs': [
2057 '..', 2067 '..',
2058 '<(SHARED_INTERMEDIATE_DIR)', 2068 '<(SHARED_INTERMEDIATE_DIR)',
2059 ], 2069 ],
2060 'defines': [ 2070 'defines': [
2061 'HAS_OUT_OF_PROC_TEST_RUNNER', 2071 'HAS_OUT_OF_PROC_TEST_RUNNER',
2062 ], 2072 ],
2063 'sources': [ 2073 'sources': [
2074 '<@(chrome_browser_tests_extensions_sources)',
2064 '<@(chrome_browser_tests_sources)', 2075 '<@(chrome_browser_tests_sources)',
2065 '<@(chrome_browser_tests_webui_js_sources)', 2076 '<@(chrome_browser_tests_webui_js_sources)',
2066 '<@(chrome_browser_extensions_test_support_sources)', 2077 '<@(chrome_browser_extensions_test_support_sources)',
2067 'test/base/browser_tests_main.cc', 2078 'test/base/browser_tests_main.cc',
2068 ], 2079 ],
2069 'rules': [ 2080 'rules': [
2070 { 2081 {
2071 'rule_name': 'js2webui', 2082 'rule_name': 'js2webui',
2072 'extension': 'js', 2083 'extension': 'js',
2073 'msvs_external_rule': 1, 2084 'msvs_external_rule': 1,
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after
3300 'utility', 3311 'utility',
3301 ], 3312 ],
3302 'sources': [ 3313 'sources': [
3303 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3314 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3304 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3315 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3305 ], 3316 ],
3306 }] 3317 }]
3307 }], 3318 }],
3308 ], # 'conditions' 3319 ], # 'conditions'
3309 } 3320 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698