diff options
author | schenney <schenney@chromium.org> | 2015-04-17 14:25:05 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-17 21:25:20 +0000 |
commit | f757a75714ec2e15db2258b289de7b136c9798f3 (patch) | |
tree | 19a736b41e5f1ec5d1385b5f8a71624b42e16aeb /mojo | |
parent | 5954aaf89c97ce1cbd407ddbb5e206750a00b818 (diff) | |
download | chromium_src-f757a75714ec2e15db2258b289de7b136c9798f3.zip chromium_src-f757a75714ec2e15db2258b289de7b136c9798f3.tar.gz chromium_src-f757a75714ec2e15db2258b289de7b136c9798f3.tar.bz2 |
Revert of Reland Make a mojo:apptests GN meta-target, add apptests (patchset #5 id:80001 of https://codereview.chromium.org/1093883002/)
Reason for revert:
Causing compile failures:
http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux/builds/46775
http://build.chromium.org/p/chromium.webkit/builders/Linux%20ChromiumOS%20Builder/builds/66769
http://build.chromium.org/p/chromium.webkit/builders/GPU%20Mac%20Builder%20%28dbg%29/builds/33994
Original issue's description:
> 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}
TBR=ben@chromium.org,sky@chromium.org,msw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=NONE
Review URL: https://codereview.chromium.org/1072153003
Cr-Commit-Position: refs/heads/master@{#325720}
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, 18 insertions, 56 deletions
diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn index 494785f..945e6f0 100644 --- a/mojo/services/BUILD.gn +++ b/mojo/services/BUILD.gn @@ -27,7 +27,6 @@ group("services") { "//mojo/services/surfaces", "//mojo/services/tracing", "//mojo/services/view_manager", - "//mojo/services/window_manager:lib", ] # TODO(GYP): Make this work. @@ -37,55 +36,6 @@ 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 04b3988..a0eb871 100644 --- a/mojo/services/view_manager/BUILD.gn +++ b/mojo/services/view_manager/BUILD.gn @@ -156,24 +156,37 @@ test("view_manager_service_unittests") { } } -mojo_native_application("apptests") { - output_name = "view_manager_apptests" +mojo_native_application("mojo_view_manager_client_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 74259dc..bf5e416 100644 --- a/mojo/services/window_manager/BUILD.gn +++ b/mojo/services/window_manager/BUILD.gn @@ -106,8 +106,7 @@ mojo_native_application("test_window_manager") { ] } -mojo_native_application("apptests") { - output_name = "window_manager_apptests" +mojo_native_application("window_manager_apptests") { testonly = true sources = [ |