diff options
| author | dpranke <dpranke@chromium.org> | 2015-09-03 14:53:35 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-03 21:54:21 +0000 |
| commit | 90882b45b498da847789a4897b14f47c6a702fd4 (patch) | |
| tree | 63217235423d15a254233c406661c57ab6f655e0 | |
| parent | d86db1082a7f7a90813641397b04e6c3097ab0f6 (diff) | |
| download | chromium_src-90882b45b498da847789a4897b14f47c6a702fd4.zip chromium_src-90882b45b498da847789a4897b14f47c6a702fd4.tar.gz chromium_src-90882b45b498da847789a4897b14f47c6a702fd4.tar.bz2 | |
Add GN swarming support for mojo_public_system_unittests and mojo_public_utility_unittests
These were running under swarming on the GYP bots but not the GN bots.
R=jam@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1305343005
Cr-Commit-Position: refs/heads/master@{#347255}
| -rw-r--r-- | mojo/BUILD.gn | 18 | ||||
| -rw-r--r-- | testing/buildbot/chromium.linux.json | 6 | ||||
| -rw-r--r-- | testing/buildbot/gn_isolate_map.pyl | 4 |
3 files changed, 26 insertions, 2 deletions
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn index 8e70627..2bb0214 100644 --- a/mojo/BUILD.gn +++ b/mojo/BUILD.gn @@ -41,6 +41,24 @@ group("mojo_public_environment_unittests_run") { ] } +# TODO(GYP): Delete this after we've converted everything to GN. +# The _run targets exist only for compatibility w/ GYP. +group("mojo_public_system_unittests_run") { + testonly = true + deps = [ + "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests", + ] +} + +# TODO(GYP): Delete this after we've converted everything to GN. +# The _run targets exist only for compatibility w/ GYP. +group("mojo_public_utility_unittests_run") { + testonly = true + deps = [ + "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests", + ] +} + group("tests") { testonly = true deps = [ diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json index d3b1169..cef5806 100644 --- a/testing/buildbot/chromium.linux.json +++ b/testing/buildbot/chromium.linux.json @@ -453,9 +453,15 @@ "test": "mojo_public_environment_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_public_utility_unittests" }, { diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl index 2a12be2..4d6e25d 100644 --- a/testing/buildbot/gn_isolate_map.pyl +++ b/testing/buildbot/gn_isolate_map.pyl @@ -266,11 +266,11 @@ }, "mojo_public_system_unittests": { "label": "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests", - "type": "unknown", + "type": "console_test_launcher", }, "mojo_public_utility_unittests": { "label": "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests", - "type": "unknown", + "type": "console_test_launcher", }, "mojo_runner_unittests": { "label": "//mojo/runner:mojo_runner_unittests", |