diff options
| author | msw <msw@chromium.org> | 2015-05-07 15:10:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-07 22:11:25 +0000 |
| commit | f25a77f6df2637fea811581068e8e557f5b28544 (patch) | |
| tree | 4a02c2ed9bebb5ab13306ed09956c0a358fe003f | |
| parent | 1a43e72e774c030d2916219e109cb18e8b906421 (diff) | |
| download | chromium_src-f25a77f6df2637fea811581068e8e557f5b28544.zip chromium_src-f25a77f6df2637fea811581068e8e557f5b28544.tar.gz chromium_src-f25a77f6df2637fea811581068e8e557f5b28544.tar.bz2 | |
Use output_name for Mojo and Mandoline test targets.
I added support for Android test target output_name in:
https://codereview.chromium.org/1127053003/
BUG=482679
TEST=Android test apks use output_name; work as expected.
R=sky@chromium.org
Review URL: https://codereview.chromium.org/1135633002
Cr-Commit-Position: refs/heads/master@{#328852}
| -rw-r--r-- | components/html_viewer/BUILD.gn | 3 | ||||
| -rw-r--r-- | components/resource_provider/BUILD.gn | 3 | ||||
| -rw-r--r-- | components/view_manager/BUILD.gn | 3 | ||||
| -rw-r--r-- | mandoline/BUILD.gn | 6 | ||||
| -rw-r--r-- | mojo/BUILD.gn | 4 | ||||
| -rw-r--r-- | mojo/runner/BUILD.gn | 3 | ||||
| -rw-r--r-- | mojo/shell/BUILD.gn | 3 |
7 files changed, 15 insertions, 10 deletions
diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn index 35286571..79c6a6c 100644 --- a/components/html_viewer/BUILD.gn +++ b/components/html_viewer/BUILD.gn @@ -223,7 +223,8 @@ if (is_android) { } } -test("html_viewer_unittests") { +test("tests") { + output_name = "html_viewer_unittests" sources = [ "ax_provider_impl_unittest.cc", "discardable_memory_allocator_unittest.cc", diff --git a/components/resource_provider/BUILD.gn b/components/resource_provider/BUILD.gn index 354ffa0..9c95e61 100644 --- a/components/resource_provider/BUILD.gn +++ b/components/resource_provider/BUILD.gn @@ -94,7 +94,8 @@ source_set("lib") { ] } -test("resource_provider_unittests") { +test("tests") { + output_name = "resource_provider_unittests" sources = [ "file_utils_unittest.cc", ] diff --git a/components/view_manager/BUILD.gn b/components/view_manager/BUILD.gn index ddefeef..c401810 100644 --- a/components/view_manager/BUILD.gn +++ b/components/view_manager/BUILD.gn @@ -124,7 +124,8 @@ source_set("test_support") { ] } -test("view_manager_unittests") { +test("tests") { + output_name = "view_manager_unittests" sources = [ "animation_runner_unittest.cc", "focus_controller_unittest.cc", diff --git a/mandoline/BUILD.gn b/mandoline/BUILD.gn index b2e2412..db956d3 100644 --- a/mandoline/BUILD.gn +++ b/mandoline/BUILD.gn @@ -26,11 +26,11 @@ group("tests") { deps += [ "//components/clipboard:apptests", "//components/html_viewer:apptests", - "//components/html_viewer:html_viewer_unittests", + "//components/html_viewer:tests", "//components/resource_provider:apptests", - "//components/resource_provider:resource_provider_unittests", + "//components/resource_provider:tests", "//components/view_manager:apptests", - "//components/view_manager:view_manager_unittests", + "//components/view_manager:tests", "//components/window_manager:apptests", ] } diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn index 36941e2..8a27a71 100644 --- a/mojo/BUILD.gn +++ b/mojo/BUILD.gn @@ -43,9 +43,9 @@ group("tests") { if (!is_android && !is_component_build) { deps += [ "//mojo/runner:apptests", - "//mojo/runner:mojo_runner_unittests", + "//mojo/runner:tests", "//mojo/services/network:apptests", - "//mojo/shell:mojo_shell_unittests", + "//mojo/shell:tests", ] } } diff --git a/mojo/runner/BUILD.gn b/mojo/runner/BUILD.gn index 6e0c354..dffaeaf 100644 --- a/mojo/runner/BUILD.gn +++ b/mojo/runner/BUILD.gn @@ -334,7 +334,8 @@ mojom("child_process_bindings") { ] } -test("mojo_runner_unittests") { +test("tests") { + output_name = "mojo_runner_unittests" sources = [ "child_process_host_unittest.cc", "data_pipe_peek_unittest.cc", diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn index 71a0858..8e1988fc 100644 --- a/mojo/shell/BUILD.gn +++ b/mojo/shell/BUILD.gn @@ -49,7 +49,8 @@ source_set("shell") { ] } -test("mojo_shell_unittests") { +test("tests") { + output_name = "mojo_shell_unittests" sources = [ "application_manager_unittest.cc", "query_util_unittest.cc", |