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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 83863005: Remove the test_support_chrome target, since it duplicates test_support_common. The latter is wher… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 'chromedriver_unittest_sources': [ 6 'chromedriver_unittest_sources': [
7 'test/chromedriver/capabilities_unittest.cc', 7 'test/chromedriver/capabilities_unittest.cc',
8 'test/chromedriver/chrome/chrome_finder_unittest.cc', 8 'test/chromedriver/chrome/chrome_finder_unittest.cc',
9 'test/chromedriver/chrome/console_logger_unittest.cc', 9 'test/chromedriver/chrome/console_logger_unittest.cc',
10 'test/chromedriver/chrome/device_manager_unittest.cc', 10 'test/chromedriver/chrome/device_manager_unittest.cc',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 'test/pyautolib/asan_stub.c', 55 'test/pyautolib/asan_stub.c',
56 ] 56 ]
57 }], 57 }],
58 ], 58 ],
59 }, 59 },
60 'includes': [ 60 'includes': [
61 'js_unittest_vars.gypi', 61 'js_unittest_vars.gypi',
62 ], 62 ],
63 'targets': [ 63 'targets': [
64 { 64 {
65 'target_name': 'test_support_chrome',
66 'type': 'static_library',
67 'dependencies': [
68 'test_support_common',
69 '../testing/gtest.gyp:gtest',
70 ],
71 'export_dependent_settings': [
72 'test_support_common',
73 ],
74 'include_dirs': [
75 '..',
76 ],
77 'sources': [
78 'test/base/chrome_test_launcher.cc',
79 'test/base/chrome_test_launcher.h',
80 ],
81 },
82 {
83 'target_name': 'test_support_ui_runner', 65 'target_name': 'test_support_ui_runner',
84 'type': 'static_library', 66 'type': 'static_library',
85 'dependencies': [ 67 'dependencies': [
86 'test_support_common', 68 'test_support_common',
87 '../testing/gtest.gyp:gtest', 69 '../testing/gtest.gyp:gtest',
88 ], 70 ],
89 'export_dependent_settings': [ 71 'export_dependent_settings': [
90 'test_support_common', 72 'test_support_common',
91 ], 73 ],
92 'include_dirs': [ 74 'include_dirs': [
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 'type': 'executable', 132 'type': 'executable',
151 'dependencies': [ 133 'dependencies': [
152 'browser', 134 'browser',
153 'chrome_resources.gyp:chrome_resources', 135 'chrome_resources.gyp:chrome_resources',
154 'chrome_resources.gyp:chrome_strings', 136 'chrome_resources.gyp:chrome_strings',
155 'chrome_resources.gyp:packed_extra_resources', 137 'chrome_resources.gyp:packed_extra_resources',
156 'chrome_resources.gyp:packed_resources', 138 'chrome_resources.gyp:packed_resources',
157 'common/extensions/api/api.gyp:api', 139 'common/extensions/api/api.gyp:api',
158 'debugger', 140 'debugger',
159 'renderer', 141 'renderer',
160 'test_support_chrome',
161 'test_support_common', 142 'test_support_common',
162 # NOTE: don't add test_support_ui, no more UITests. See 143 # NOTE: don't add test_support_ui, no more UITests. See
163 # http://crbug.com/137365 144 # http://crbug.com/137365
164 '../google_apis/google_apis.gyp:google_apis_test_support', 145 '../google_apis/google_apis.gyp:google_apis_test_support',
165 '../third_party/hunspell/hunspell.gyp:hunspell', 146 '../third_party/hunspell/hunspell.gyp:hunspell',
166 '../net/net.gyp:net', 147 '../net/net.gyp:net',
167 '../net/net.gyp:net_resources', 148 '../net/net.gyp:net_resources',
168 '../net/net.gyp:net_test_support', 149 '../net/net.gyp:net_test_support',
169 '../skia/skia.gyp:skia', 150 '../skia/skia.gyp:skia',
170 '../sync/sync.gyp:sync', 151 '../sync/sync.gyp:sync',
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], 901 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
921 'dependencies': [ 902 'dependencies': [
922 'browser', 903 'browser',
923 'chrome_resources.gyp:chrome_resources', 904 'chrome_resources.gyp:chrome_resources',
924 'chrome_resources.gyp:chrome_strings', 905 'chrome_resources.gyp:chrome_strings',
925 'chrome_resources.gyp:packed_extra_resources', 906 'chrome_resources.gyp:packed_extra_resources',
926 'chrome_resources.gyp:packed_resources', 907 'chrome_resources.gyp:packed_resources',
927 'common/extensions/api/api.gyp:api', 908 'common/extensions/api/api.gyp:api',
928 'renderer', 909 'renderer',
929 'test/perf/perf_test.gyp:*', 910 'test/perf/perf_test.gyp:*',
930 'test_support_chrome',
931 'test_support_common', 911 'test_support_common',
932 'test_support_unit', 912 'test_support_unit',
933 '../base/base.gyp:base', 913 '../base/base.gyp:base',
934 '../base/base.gyp:base_i18n', 914 '../base/base.gyp:base_i18n',
935 '../base/base.gyp:test_support_base', 915 '../base/base.gyp:test_support_base',
936 '../components/components.gyp:autofill_content_risk_proto', 916 '../components/components.gyp:autofill_content_risk_proto',
937 '../components/components.gyp:autofill_content_test_support', 917 '../components/components.gyp:autofill_content_test_support',
938 '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks', 918 '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
939 '../google_apis/google_apis.gyp:google_apis_test_support', 919 '../google_apis/google_apis.gyp:google_apis_test_support',
940 '../net/net.gyp:net', 920 '../net/net.gyp:net',
(...skipping 1099 matching lines...) Expand 10 before | Expand all | Expand 10 after
2040 'msvs_cygwin_shell': 0, 2020 'msvs_cygwin_shell': 0,
2041 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], 2021 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
2042 'dependencies': [ 2022 'dependencies': [
2043 'browser', 2023 'browser',
2044 'chrome_resources.gyp:chrome_resources', 2024 'chrome_resources.gyp:chrome_resources',
2045 'chrome_resources.gyp:chrome_strings', 2025 'chrome_resources.gyp:chrome_strings',
2046 'chrome_resources.gyp:packed_extra_resources', 2026 'chrome_resources.gyp:packed_extra_resources',
2047 'chrome_resources.gyp:packed_resources', 2027 'chrome_resources.gyp:packed_resources',
2048 'renderer', 2028 'renderer',
2049 'test/perf/perf_test.gyp:*', 2029 'test/perf/perf_test.gyp:*',
2050 'test_support_chrome',
2051 'test_support_common', 2030 'test_support_common',
2052 '../base/base.gyp:base', 2031 '../base/base.gyp:base',
2053 '../base/base.gyp:base_i18n', 2032 '../base/base.gyp:base_i18n',
2054 '../base/base.gyp:test_support_base', 2033 '../base/base.gyp:test_support_base',
2055 '../net/net.gyp:net', 2034 '../net/net.gyp:net',
2056 '../net/net.gyp:net_test_support', 2035 '../net/net.gyp:net_test_support',
2057 '../skia/skia.gyp:skia', 2036 '../skia/skia.gyp:skia',
2058 '../sync/sync.gyp:sync', 2037 '../sync/sync.gyp:sync',
2059 '../testing/gmock.gyp:gmock', 2038 '../testing/gmock.gyp:gmock',
2060 '../testing/gtest.gyp:gtest', 2039 '../testing/gtest.gyp:gtest',
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
2308 'dependencies': [ 2287 'dependencies': [
2309 'browser', 2288 'browser',
2310 'chrome', 2289 'chrome',
2311 'chrome_resources.gyp:chrome_resources', 2290 'chrome_resources.gyp:chrome_resources',
2312 'chrome_resources.gyp:chrome_strings', 2291 'chrome_resources.gyp:chrome_strings',
2313 'chrome_resources.gyp:packed_extra_resources', 2292 'chrome_resources.gyp:packed_extra_resources',
2314 'chrome_resources.gyp:packed_resources', 2293 'chrome_resources.gyp:packed_resources',
2315 'common', 2294 'common',
2316 'common/extensions/api/api.gyp:api', 2295 'common/extensions/api/api.gyp:api',
2317 'renderer', 2296 'renderer',
2318 'test_support_chrome',
2319 'test_support_common', 2297 'test_support_common',
2320 '../net/net.gyp:net', 2298 '../net/net.gyp:net',
2321 '../skia/skia.gyp:skia', 2299 '../skia/skia.gyp:skia',
2322 '../sync/sync.gyp:sync', 2300 '../sync/sync.gyp:sync',
2323 '../sync/sync.gyp:test_support_sync_testserver', 2301 '../sync/sync.gyp:test_support_sync_testserver',
2324 '../testing/gmock.gyp:gmock', 2302 '../testing/gmock.gyp:gmock',
2325 '../testing/gtest.gyp:gtest', 2303 '../testing/gtest.gyp:gtest',
2326 '../third_party/icu/icu.gyp:icui18n', 2304 '../third_party/icu/icu.gyp:icui18n',
2327 '../third_party/icu/icu.gyp:icuuc', 2305 '../third_party/icu/icu.gyp:icuuc',
2328 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 2306 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
2495 ], 2473 ],
2496 }, 2474 },
2497 { 2475 {
2498 'target_name': 'sync_performance_tests', 2476 'target_name': 'sync_performance_tests',
2499 'type': 'executable', 2477 'type': 'executable',
2500 'dependencies': [ 2478 'dependencies': [
2501 'browser', 2479 'browser',
2502 'chrome', 2480 'chrome',
2503 'common/extensions/api/api.gyp:api', 2481 'common/extensions/api/api.gyp:api',
2504 'test/perf/perf_test.gyp:*', 2482 'test/perf/perf_test.gyp:*',
2505 'test_support_chrome',
2506 'test_support_common', 2483 'test_support_common',
2507 '../skia/skia.gyp:skia', 2484 '../skia/skia.gyp:skia',
2508 '../sync/sync.gyp:sync', 2485 '../sync/sync.gyp:sync',
2509 '../sync/sync.gyp:test_support_sync_testserver', 2486 '../sync/sync.gyp:test_support_sync_testserver',
2510 '../testing/gmock.gyp:gmock', 2487 '../testing/gmock.gyp:gmock',
2511 '../testing/gtest.gyp:gtest', 2488 '../testing/gtest.gyp:gtest',
2512 ], 2489 ],
2513 'include_dirs': [ 2490 'include_dirs': [
2514 '..', 2491 '..',
2515 '<(INTERMEDIATE_DIR)', 2492 '<(INTERMEDIATE_DIR)',
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
3061 'utility', 3038 'utility',
3062 ], 3039 ],
3063 'sources': [ 3040 'sources': [
3064 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3041 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3065 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3042 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3066 ], 3043 ],
3067 }] 3044 }]
3068 }], 3045 }],
3069 ], # 'conditions' 3046 ], # 'conditions'
3070 } 3047 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698