Commit 69bc247e authored by msw's avatar msw Committed by Commit bot

Revert of Make a mojo:apptests GN meta-target, add apptests. (patchset #3...

Revert of Make a mojo:apptests GN meta-target, add apptests. (patchset #3 id:60001 of https://codereview.chromium.org/1050233005/)

Reason for revert:
Caused compile failures (many errors, one example below) on Mac GN bot:
http://build.chromium.org/p/chromium.mac/builders/Mac%20GN/builds/7019/steps/compile/logs/stdio

gen/mojo/services/html_viewer/blink_resource_map.h:37:58:error: no newline at end of file [-Werror,-Wnewline-eof]
#endif // MOJO_SERVICES_HTML_VIEWER_BLINK_RESOURCE_MAP_H_

Original issue's description:
> 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
>
> Committed: https://crrev.com/16b112790f541670d5f2ab97dfa70c8b89b44b1f
> Cr-Commit-Position: refs/heads/master@{#325570}

TBR=sky@chromium.org,ben@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=NONE

Review URL: https://codereview.chromium.org/1093763002

Cr-Commit-Position: refs/heads/master@{#325575}
parent 19c5c9b4
...@@ -684,7 +684,6 @@ group("gn_mojo_targets") { ...@@ -684,7 +684,6 @@ group("gn_mojo_targets") {
"//media/mojo/interfaces:interfaces_python", "//media/mojo/interfaces:interfaces_python",
"//media/mojo/services:cdm_service", "//media/mojo/services:cdm_service",
"//media/mojo:tests", "//media/mojo:tests",
"//mojo:apptests",
"//net/interfaces:interfaces_dart", "//net/interfaces:interfaces_dart",
"//net/interfaces:interfaces_python", "//net/interfaces:interfaces_python",
"//third_party/mojo/src/mojo/edk/js/test:js_integration_tests", "//third_party/mojo/src/mojo/edk/js/test:js_integration_tests",
...@@ -699,8 +698,12 @@ group("gn_mojo_targets") { ...@@ -699,8 +698,12 @@ group("gn_mojo_targets") {
"//third_party/mojo_services/src/window_manager/public/interfaces:interfaces_python", "//third_party/mojo_services/src/window_manager/public/interfaces:interfaces_python",
] ]
if (!is_component_build) { if (!is_debug) {
deps += [ "//mojo/services/html_viewer:tests" ] deps += [
"//mojo/services/html_viewer:apptests",
"//mojo/services/html_viewer:tests",
"//mojo/services/network:apptests",
]
} }
} }
} }
......
...@@ -39,20 +39,3 @@ group("tests") { ...@@ -39,20 +39,3 @@ group("tests") {
"//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests", "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
] ]
} }
# TODO(GYP): Not included in the mojo group meta-target; missing gyp targets.
# See the gn_all and gn_only comments in //src/BUILD.gn.
group("apptests") {
testonly = true
deps = []
if (!is_component_build) {
deps += [
"//mojo/services/clipboard:apptests",
"//mojo/services/html_viewer:apptests",
"//mojo/services/network:apptests",
"//mojo/services/view_manager:mojo_view_manager_client_apptests",
"//mojo/services/view_manager:view_manager_service_apptests",
"//mojo/services/window_manager:window_manager_apptests",
]
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment