diff options
| author | dpranke <dpranke@chromium.org> | 2015-08-27 20:21:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-28 03:21:42 +0000 |
| commit | 6abd8652f8bc7a1d825962003ac88ec6a37a82f1 (patch) | |
| tree | 4946ea8e98e57cfe7272f62472dc30d797cee553 /testing | |
| parent | 8a1824383c05f4f48ed2ae0ccb69fc073ddfc099 (diff) | |
| download | chromium_src-6abd8652f8bc7a1d825962003ac88ec6a37a82f1.zip chromium_src-6abd8652f8bc7a1d825962003ac88ec6a37a82f1.tar.gz chromium_src-6abd8652f8bc7a1d825962003ac88ec6a37a82f1.tar.bz2 | |
Add remaining GN targets for the Linux gpu tests.
This patch adds support for the telemetry-based
gpu tests to the GN build, adds a stubbed out
target for angle_end2end_tests (full support
depends on angle GN fixes), and adds a dummy
'chromium_swarm_tests' build target.
With these fixes, it should be possible to flip the
linux_chromium_rel_ng bot to GN and still have
everything run.
R=kbr@chromium.org, brettw@chromium.org
BUG=519778
Review URL: https://codereview.chromium.org/1311913004
Cr-Commit-Position: refs/heads/master@{#346067}
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/buildbot/gn_isolate_map.pyl | 10 | ||||
| -rwxr-xr-x | testing/buildbot/manage.py | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl index f122abd..2a12be2 100644 --- a/testing/buildbot/gn_isolate_map.pyl +++ b/testing/buildbot/gn_isolate_map.pyl @@ -38,6 +38,11 @@ "type": "raw", "args": [], }, + "angle_end2end_tests": { + "label": "//gpu:angle_end2end_tests", + "type": "raw", + "args": [], + }, "angle_unittests": { "label": "//gpu:angle_unittests", "type": "raw", @@ -366,6 +371,11 @@ "type": "gpu_browser_test", "gtest_filter": "CastStreamingApiTestWithPixelOutput.EndToEnd*:TabCaptureApiPixelTest.EndToEnd*", }, + "telemetry_gpu_test": { + "label": "//chrome/test:telemetry_gpu_test", + "type": "script", + "script": "//content/test/gpu/run_gpu_test.py", + }, "ui_base_unittests": { "label": "//ui/base:ui_base_unittests", "type": "windowed_test_launcher", diff --git a/testing/buildbot/manage.py b/testing/buildbot/manage.py index 94cf3f6..38d1594 100755 --- a/testing/buildbot/manage.py +++ b/testing/buildbot/manage.py @@ -65,10 +65,12 @@ SKIP_GN_ISOLATE_MAP_TARGETS = { # These targets are run on the bots but not listed in the # buildbot JSON files. + 'angle_end2end_tests', 'content_gl_tests', 'gl_tests', 'gles2_conform_test', 'tab_capture_end2end_tests', + 'telemetry_gpu_test', } |