diff options
author | msw <msw@chromium.org> | 2015-04-16 17:45:32 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-17 00:45:51 +0000 |
commit | 16b112790f541670d5f2ab97dfa70c8b89b44b1f (patch) | |
tree | 1e4311a7fddc29a29c7e4f541cae40a3dd3c88b6 /BUILD.gn | |
parent | 62c7ca83f831570f4d106213cf3ee5b8c0bb79f3 (diff) | |
download | chromium_src-16b112790f541670d5f2ab97dfa70c8b89b44b1f.zip chromium_src-16b112790f541670d5f2ab97dfa70c8b89b44b1f.tar.gz chromium_src-16b112790f541670d5f2ab97dfa70c8b89b44b1f.tar.bz2 |
Make a mojo:apptests GN meta-target, add apptests.
Add an apptest meta-target in mojo/BUILD.gn.
Move the apptests targets specified in src/BUILD.gn.
Add the remaining apptest targets (clipboard, VM, WM).
Was limited to release, allow debug, but exclude component.
See gn_debug compile error from including component build in PS2:
FAILED: /b/build/slave/linux_chromium_gn/build/src/buildtools/linux64/gn --root=/b/build/slave/linux_chromium_gn/build/src -q gen //out/Debug/
ERROR at //mojo/shell/BUILD.gn:13:1: Assertion failed.
assert(!is_component_build)
BUG=NONE
TEST=Building mojo:apptests builds all local apptest binaries (on dbg too!).
R=sky@chromium.org
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/1050233005
Cr-Commit-Position: refs/heads/master@{#325570}
Diffstat (limited to 'BUILD.gn')
-rw-r--r-- | BUILD.gn | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -684,6 +684,7 @@ group("gn_mojo_targets") { "//media/mojo/interfaces:interfaces_python", "//media/mojo/services:cdm_service", "//media/mojo:tests", + "//mojo:apptests", "//net/interfaces:interfaces_dart", "//net/interfaces:interfaces_python", "//third_party/mojo/src/mojo/edk/js/test:js_integration_tests", @@ -698,12 +699,8 @@ group("gn_mojo_targets") { "//third_party/mojo_services/src/window_manager/public/interfaces:interfaces_python", ] - if (!is_debug) { - deps += [ - "//mojo/services/html_viewer:apptests", - "//mojo/services/html_viewer:tests", - "//mojo/services/network:apptests", - ] + if (!is_component_build) { + deps += [ "//mojo/services/html_viewer:tests" ] } } } |