summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authoraiolos <aiolos@chromium.org>2015-10-05 16:47:57 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-05 23:50:00 +0000
commit1d04ea6da7706f077179459ad3175f776a530f96 (patch)
tree480144104aef948a3d646b340e9acaf863810280 /chrome/chrome_tests.gypi
parent1587f7d11e2b75eeccd08c3a48d53f013ace4c8b (diff)
downloadchromium_src-1d04ea6da7706f077179459ad3175f776a530f96.zip
chromium_src-1d04ea6da7706f077179459ad3175f776a530f96.tar.gz
chromium_src-1d04ea6da7706f077179459ad3175f776a530f96.tar.bz2
Add crash_service to Telemetry's isolates.
Switch to using binary_manager for the crash_service executable, eliminating downloads of this binary from cloud storage. (A follow-on CL will likely forbid the bots from downloading this and other executables from cloud storage entirely, rather than continuing to use this as a fallback path.) Telemetry's isolates are currently specified fairly differently for the GYP and GN builds; other CLs underway will unify their specification more. authors=aiolos@,kbr@ BUG=466877 TBR=phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/1372943003 Cr-Commit-Position: refs/heads/master@{#352465}
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r--chrome/chrome_tests.gypi18
1 files changed, 18 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 8eff757..072a826 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3227,6 +3227,19 @@
},
},
{
+ 'target_name': 'telemetry_gpu_unittests_run',
+ 'type': 'none',
+ 'dependencies': [
+ '../content/content_shell_and_tests.gyp:telemetry_base',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'telemetry_gpu_unittests.isolate',
+ ],
+ },
+ {
'target_name': 'telemetry_chrome_test_base',
'type': 'none',
'dependencies': [
@@ -3243,6 +3256,11 @@
'../third_party/crashpad/crashpad/tools/tools.gyp:crashpad_database_util',
],
}],
+ ['OS=="win"', {
+ 'dependencies': [
+ 'chrome.gyp:crash_service',
+ ],
+ }],
],
},
{