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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 1432653002: Revert of Run telemetry_perf_unittests via isolate on "Mac tests", "Linux tests" and trybot with swarming (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | chrome/telemetry_perf_unittests.isolate » ('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 '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',
(...skipping 3163 matching lines...) Expand 10 before | Expand all | Expand 10 after
3174 'telemetry_perf_unittests_android.isolate', 3174 'telemetry_perf_unittests_android.isolate',
3175 ], 3175 ],
3176 }], 3176 }],
3177 } 3177 }
3178 ], 3178 ],
3179 ], 3179 ],
3180 }], 3180 }],
3181 ['test_isolation_mode != "noop"', { 3181 ['test_isolation_mode != "noop"', {
3182 'targets': [ 3182 'targets': [
3183 { 3183 {
3184 'target_name': 'telemetry_chrome_test_base',
3185 'type': 'none',
3186 'dependencies': [
3187 '../content/content_shell_and_tests.gyp:telemetry_base',
3188 ],
3189 'conditions': [
3190 ['OS=="linux" or OS=="mac"', {
3191 'dependencies': [
3192 '../breakpad/breakpad.gyp:dump_syms',
3193 ],
3194 }],
3195 ['OS=="mac"', {
3196 'dependencies': [
3197 '../third_party/crashpad/crashpad/tools/tools.gyp:crashpad_datab ase_util',
3198 ],
3199 }],
3200 ['OS=="win"', {
3201 'dependencies': [
3202 'chrome.gyp:crash_service',
3203 ],
3204 }],
3205 ],
3206 },
3207 {
3208 'target_name': 'browser_tests_run', 3184 'target_name': 'browser_tests_run',
3209 'type': 'none', 3185 'type': 'none',
3210 'dependencies': [ 3186 'dependencies': [
3211 '../content/content_shell_and_tests.gyp:copy_test_netscape_plugin', 3187 '../content/content_shell_and_tests.gyp:copy_test_netscape_plugin',
3212 'browser_tests', 3188 'browser_tests',
3213 'chrome', 3189 'chrome',
3214 ], 3190 ],
3215 'includes': [ 3191 'includes': [
3216 '../build/isolate.gypi', 3192 '../build/isolate.gypi',
3217 ], 3193 ],
3218 'sources': [ 3194 'sources': [
3219 'browser_tests.isolate', 3195 'browser_tests.isolate',
3220 ], 3196 ],
3221 'conditions': [ 3197 'conditions': [
3222 ['use_x11==1', { 3198 ['use_x11==1', {
3223 'dependencies': [ 3199 'dependencies': [
3224 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 3200 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
3225 ], 3201 ],
3226 }], 3202 }],
3227 ], 3203 ],
3228 }, 3204 },
3229 { 3205 {
3230 'target_name': 'telemetry_perf_unittests',
3231 'type': 'none',
3232 'dependencies': [
3233 'chrome_run',
3234 'telemetry_chrome_test_base'
3235 ],
3236 'includes': [
3237 '../build/isolate.gypi',
3238 ],
3239 'sources': [
3240 'telemetry_perf_unittests.isolate',
3241 ],
3242 },
3243 {
3244 'target_name': 'telemetry_gpu_unittests', 3206 'target_name': 'telemetry_gpu_unittests',
3245 'type': 'none', 3207 'type': 'none',
3246 'dependencies': [ 3208 'dependencies': [
3247 '../content/content_shell_and_tests.gyp:telemetry_base', 3209 '../content/content_shell_and_tests.gyp:telemetry_base',
3248 ], 3210 ],
3249 'includes': [ 3211 'includes': [
3250 '../build/isolate.gypi', 3212 '../build/isolate.gypi',
3251 ], 3213 ],
3252 'sources': [ 3214 'sources': [
3253 'telemetry_gpu_unittests.isolate', 3215 'telemetry_gpu_unittests.isolate',
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
3329 # If we didn't do this the All target ends up with a rule that 3291 # If we didn't do this the All target ends up with a rule that
3330 # makes it unnecessarily compile in certain situations. 3292 # makes it unnecessarily compile in certain situations.
3331 'suppress_wildcard': 1, 3293 'suppress_wildcard': 1,
3332 'direct_dependent_settings': { 3294 'direct_dependent_settings': {
3333 'includes': [ 3295 'includes': [
3334 '../build/isolate.gypi', 3296 '../build/isolate.gypi',
3335 ], 3297 ],
3336 }, 3298 },
3337 }, 3299 },
3338 { 3300 {
3301 'target_name': 'telemetry_chrome_test_base',
3302 'type': 'none',
3303 'dependencies': [
3304 '../content/content_shell_and_tests.gyp:telemetry_base',
3305 ],
3306 'conditions': [
3307 ['OS=="linux" or OS=="mac"', {
3308 'dependencies': [
3309 '../breakpad/breakpad.gyp:dump_syms',
3310 ],
3311 }],
3312 ['OS=="mac"', {
3313 'dependencies': [
3314 '../third_party/crashpad/crashpad/tools/tools.gyp:crashpad_d atabase_util',
3315 ],
3316 }],
3317 ['OS=="win"', {
3318 'dependencies': [
3319 'chrome.gyp:crash_service',
3320 ],
3321 }],
3322 ],
3323 },
3324 {
3339 # GN: //gpu:angle_unittests_run 3325 # GN: //gpu:angle_unittests_run
3340 'target_name': 'angle_unittests_run', 3326 'target_name': 'angle_unittests_run',
3341 'type': 'none', 3327 'type': 'none',
3342 'dependencies': [ 3328 'dependencies': [
3343 '../gpu/gpu.gyp:angle_unittests', 3329 '../gpu/gpu.gyp:angle_unittests',
3344 'gpu_tests_base', 3330 'gpu_tests_base',
3345 ], 3331 ],
3346 'sources': [ 3332 'sources': [
3347 'angle_unittests.isolate', 3333 'angle_unittests.isolate',
3348 ], 3334 ],
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
3458 'utility', 3444 'utility',
3459 ], 3445 ],
3460 'sources': [ 3446 'sources': [
3461 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3447 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3462 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3448 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3463 ], 3449 ],
3464 }] 3450 }]
3465 }], 3451 }],
3466 ], # 'conditions' 3452 ], # 'conditions'
3467 } 3453 }
OLDNEW
« no previous file with comments | « no previous file | chrome/telemetry_perf_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698