diff options
author | msw <msw@chromium.org> | 2015-04-17 17:14:34 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-18 00:14:53 +0000 |
commit | dd1f7db3f1fbe6267f1fb2b8318d7f4c960cb460 (patch) | |
tree | d1d5f939bd03aade2349cf7bdbe912ffdc13ee66 /mojo | |
parent | 8561e4f5cbf931e9980668ae5c7888ebc0ac5566 (diff) | |
download | chromium_src-dd1f7db3f1fbe6267f1fb2b8318d7f4c960cb460.zip chromium_src-dd1f7db3f1fbe6267f1fb2b8318d7f4c960cb460.tar.gz chromium_src-dd1f7db3f1fbe6267f1fb2b8318d7f4c960cb460.tar.bz2 |
Reland Make a mojo:apptests GN meta-target, add apptests.
Originally landed as https://codereview.chromium.org/1050233005/
Add test and apptest meta-targets in mojo/services/BUILD.gn.
Add most remaining test and apptest targets (clipboard, VM, WM).
(mojo shell apptests target is currently broken/no-op)
Allow debug, but exclude component and Mac configs as needed.
Rename and consolidate VM and WM apptest targets.
BUG=NONE
TEST=Building mojo:apptests builds all local apptest binaries (on dbg too!).
R=sky@chromium.org
TBR=ben@chromium.org
Committed: https://crrev.com/713b3a495380d37e0adf86a0ada837bb651156ec
Cr-Commit-Position: refs/heads/master@{#325711}
Review URL: https://codereview.chromium.org/1093883002
Cr-Commit-Position: refs/heads/master@{#325742}
Diffstat (limited to 'mojo')
-rw-r--r-- | mojo/services/BUILD.gn | 50 | ||||
-rw-r--r-- | mojo/services/view_manager/BUILD.gn | 21 | ||||
-rw-r--r-- | mojo/services/window_manager/BUILD.gn | 3 |
3 files changed, 56 insertions, 18 deletions
diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn index 945e6f0..494785f 100644 --- a/mojo/services/BUILD.gn +++ b/mojo/services/BUILD.gn @@ -27,6 +27,7 @@ group("services") { "//mojo/services/surfaces", "//mojo/services/tracing", "//mojo/services/view_manager", + "//mojo/services/window_manager:lib", ] # TODO(GYP): Make this work. @@ -36,6 +37,55 @@ group("services") { "//mojo/services/kiosk_wm:window_manager", "//mojo/services/native_viewport", "//mojo/services/view_manager", + "//mojo/services/window_manager:lib", + ] + } + } +} + +group("tests") { + testonly = true + deps = [ + ":services", + ] + if (!is_component_build) { + deps += [ + "//mojo/services/html_viewer:tests", + "//mojo/services/view_manager:view_manager_service_unittests", + "//mojo/services/window_manager:window_manager_unittests", + ] + + # TODO(GYP): Make this work. + if (is_mac) { + deps -= [ + "//mojo/services/html_viewer:tests", + "//mojo/services/view_manager:view_manager_service_unittests", + "//mojo/services/window_manager:window_manager_unittests", + ] + } + } +} + +group("apptests") { + testonly = true + deps = [ + ":services", + ] + if (!is_component_build) { + deps += [ + "//mojo/services/clipboard:apptests", + "//mojo/services/html_viewer:apptests", + "//mojo/services/network:apptests", + "//mojo/services/view_manager:apptests", + "//mojo/services/window_manager:apptests", + ] + + # TODO(GYP): Make this work. + if (is_mac) { + deps -= [ + "//mojo/services/html_viewer:apptests", + "//mojo/services/view_manager:apptests", + "//mojo/services/window_manager:apptests", ] } } diff --git a/mojo/services/view_manager/BUILD.gn b/mojo/services/view_manager/BUILD.gn index a0eb871..04b3988 100644 --- a/mojo/services/view_manager/BUILD.gn +++ b/mojo/services/view_manager/BUILD.gn @@ -156,37 +156,24 @@ test("view_manager_service_unittests") { } } -mojo_native_application("mojo_view_manager_client_apptests") { +mojo_native_application("apptests") { + output_name = "view_manager_apptests" testonly = true sources = [ "view_manager_client_apptest.cc", - ] - - deps = [ - "//base", - "//base/test:test_config", - "//mojo/application", - "//mojo/application:test_support", - "//third_party/mojo_services/src/geometry/public/cpp:cpp", - "//third_party/mojo_services/src/view_manager/public/cpp", - ] -} - -mojo_native_application("view_manager_service_apptests") { - testonly = true - - sources = [ "view_manager_service_apptest.cc", ] deps = [ ":test_support", "//base", + "//base/test:test_config", "//mojo/application", "//mojo/application:test_support", "//mojo/common", "//third_party/mojo/src/mojo/public/cpp/bindings:bindings", + "//third_party/mojo_services/src/geometry/public/cpp:cpp", "//third_party/mojo_services/src/geometry/public/interfaces", "//third_party/mojo_services/src/view_manager/public/cpp", "//third_party/mojo_services/src/view_manager/public/interfaces", diff --git a/mojo/services/window_manager/BUILD.gn b/mojo/services/window_manager/BUILD.gn index bf5e416..74259dc 100644 --- a/mojo/services/window_manager/BUILD.gn +++ b/mojo/services/window_manager/BUILD.gn @@ -106,7 +106,8 @@ mojo_native_application("test_window_manager") { ] } -mojo_native_application("window_manager_apptests") { +mojo_native_application("apptests") { + output_name = "window_manager_apptests" testonly = true sources = [ |