summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authorkbr <kbr@chromium.org>2015-06-26 10:04:42 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-26 17:05:25 +0000
commit57cf0faa30d1fed831fcddd9b6b07049582091ae (patch)
tree5eb9c1ef4d539c6280dac15964dd1bb248ca2ab7 /chrome/chrome_tests.gypi
parent44260b31cc7bcba8ed9754d0b51e0f8d555b94af (diff)
downloadchromium_src-57cf0faa30d1fed831fcddd9b6b07049582091ae.zip
chromium_src-57cf0faa30d1fed831fcddd9b6b07049582091ae.tar.gz
chromium_src-57cf0faa30d1fed831fcddd9b6b07049582091ae.tar.bz2
Add telemetry_gpu_unittests.isolate.
This will make it easier to run this test suite on the bots. Refactored Telemetry isolates into: - telemetry.isolate: contains just Telemetry's logic and dependencies (bitmaptools). Moved this from chrome/ into content/ to match its dependencies. - telemetry_chrome_test.isolate: describes Telemetry tests which run using the Chromium browser. Currently telemetry_gpu_test.isolate is the only consumer of this isolate. The new test target will be added to the bots in a subsequent commit; some more work is needed to do so. BUG=495868 R=zmo@chromium.org,phajdan.jr@chromium.org,maruel@google.com TBR=maruel@chromium.org Review URL: https://codereview.chromium.org/1212113003 Cr-Commit-Position: refs/heads/master@{#336392}
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r--chrome/chrome_tests.gypi6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 700db89..fc6f020 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3189,10 +3189,10 @@
},
},
{
- 'target_name': 'telemetry_isolate_base',
+ 'target_name': 'telemetry_chrome_test_base',
'type': 'none',
'dependencies': [
- '../tools/telemetry/telemetry.gyp:bitmaptools#host',
+ '../content/content_shell_and_tests.gyp:telemetry_base',
],
'conditions': [
['OS=="linux" or OS=="mac"', {
@@ -3246,7 +3246,7 @@
'dependencies': [
'chrome_run',
'gpu_tests_base',
- 'telemetry_isolate_base',
+ 'telemetry_chrome_test_base',
],
'sources': [
'telemetry_gpu_test.isolate',