summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authorjwd <jwd@chromium.org>2015-10-01 08:59:36 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-01 16:04:54 +0000
commit8608d47b147fd71d1f861991cdebedcb97cb63d1 (patch)
tree4e8b5be8770c7663cc53897f631a3ce358548491 /chrome/chrome_tests.gypi
parent16aab34ac99e4f00b6db3d0c93b67889bb9c9944 (diff)
downloadchromium_src-8608d47b147fd71d1f861991cdebedcb97cb63d1.zip
chromium_src-8608d47b147fd71d1f861991cdebedcb97cb63d1.tar.gz
chromium_src-8608d47b147fd71d1f861991cdebedcb97cb63d1.tar.bz2
Revert of Add crash_service to Telemetry's isolates. (patchset #12 id:340001 of https://codereview.chromium.org/1361523003/ )
Reason for revert: Seems to be causing failures on linux test bots https://build.chromium.org/p/chromium.linux/builders/Linux%20Tests/builds/31890/steps/telemetry_gpu_unittests/logs/stdio Original issue's description: > 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. > > Follow up CL's will be needed to add the client config to gpu's tests. > > authors=kbr@,aiolos@ > > BUG=466877 > > Committed: https://crrev.com/6bdfb7dfb3ce2e571697629895089cffc42b48e6 > Cr-Commit-Position: refs/heads/master@{#351196} > > Committed: https://crrev.com/70c5d0c0e2ff03c3b6cef0bdce391f93c35d218a > Cr-Commit-Position: refs/heads/master@{#351803} TBR=phajdan.jr@chromium.org,dpranke@chromium.org,kbr@chromium.org,maruel@chromium.org,piman@chromium.org,aiolos@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=466877 Review URL: https://codereview.chromium.org/1369213004 Cr-Commit-Position: refs/heads/master@{#351815}
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r--chrome/chrome_tests.gypi18
1 files changed, 0 insertions, 18 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index f8cf4b6..d063931 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3227,19 +3227,6 @@
],
},
},
- {
- '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',
@@ -3257,11 +3244,6 @@
'../third_party/crashpad/crashpad/tools/tools.gyp:crashpad_database_util',
],
}],
- ['OS=="win"', {
- 'dependencies': [
- 'chrome.gyp:crash_service',
- ],
- }],
],
},
{