Commit ddd3c8c5 authored by sky's avatar sky Committed by Commit bot

Makes us compile mojo_view_manager_lib_unittests

We previously weren't.

BUG=none
TEST=none
R=msw@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#330792}
parent 1da1e686
...@@ -111,8 +111,16 @@ source_set("test_support") { ...@@ -111,8 +111,16 @@ source_set("test_support") {
] ]
} }
test("tests") { group("tests") {
output_name = "view_manager_unittests" testonly = true
deps = [
":apptests",
":view_manager_unittests",
"//components/view_manager/public/cpp/tests:mojo_view_manager_lib_unittests",
]
}
test("view_manager_unittests") {
sources = [ sources = [
"animation_runner_unittest.cc", "animation_runner_unittest.cc",
"focus_controller_unittest.cc", "focus_controller_unittest.cc",
......
...@@ -16,16 +16,12 @@ test("mojo_view_manager_lib_unittests") { ...@@ -16,16 +16,12 @@ test("mojo_view_manager_lib_unittests") {
deps = [ deps = [
"//base", "//base",
"//base/test:test_support", "//base/test:test_support",
"//components/view_manager/public/cpp",
# TODO(vtl): These non-public deps are illegal here. This should be
# converted to an apptest.
"//mojo/application/public/cpp", "//mojo/application/public/cpp",
"//mojo/edk/system",
"//mojo/public/cpp/system",
"//mojo/services/geometry/public/cpp",
"//mojo/services/geometry/public/interfaces",
"//mojo/services/view_manager/public/cpp",
"//testing/gtest", "//testing/gtest",
"//third_party/mojo/src/mojo/public/cpp/system",
"//third_party/mojo/src/mojo/edk/system",
"//ui/mojo/geometry:interfaces",
] ]
if (use_x11) { if (use_x11) {
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
int main(int argc, char** argv) { int main(int argc, char** argv) {
mojo::ViewManagerTestSuite test_suite(argc, argv); mojo::ViewManagerTestSuite test_suite(argc, argv);
return base::LaunchUnitTests( return base::LaunchUnitTests(argc, argv,
argc, argv, base::Bind(&TestSuite::Run, base::Unretained(&test_suite))); base::Bind(&mojo::ViewManagerTestSuite::Run,
base::Unretained(&test_suite)));
} }
...@@ -29,7 +29,6 @@ group("tests") { ...@@ -29,7 +29,6 @@ group("tests") {
"//components/html_viewer:tests", "//components/html_viewer:tests",
"//components/resource_provider:apptests", "//components/resource_provider:apptests",
"//components/resource_provider:tests", "//components/resource_provider:tests",
"//components/view_manager:apptests",
"//components/view_manager:tests", "//components/view_manager:tests",
] ]
} }
......
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