Chromium Code Reviews| Index: ui/views/mus/BUILD.gn |
| diff --git a/ui/views/mus/BUILD.gn b/ui/views/mus/BUILD.gn |
| index 31563b9fe35b83d1774252791ac4c6ae02bd1554..5c082153ed8ae765fcb4b313bc323c04dc2438e5 100644 |
| --- a/ui/views/mus/BUILD.gn |
| +++ b/ui/views/mus/BUILD.gn |
| @@ -127,6 +127,39 @@ group("for_shared_library") { |
| } |
| } |
| +source_set("test_support") { |
| + testonly = true |
| + |
| + sources = [ |
| + "../run_all_unittests.cc", |
| + "../run_all_unittests.h", |
| + "../test/native_widget_factory_mus.cc", |
| + "platform_test_helper_mus.cc", |
| + ] |
| + |
| + deps = [ |
| + ":mus", |
| + "//base", |
| + "//base/test:test_support", |
| + "//services/shell/background:lib", |
| + "//services/shell/background/tests:test_support", |
| + "//services/shell/public/cpp:sources", |
| + "//testing/gtest", |
| + "//ui/aura", |
| + "//ui/gl:test_support", |
| + "//ui/resources", |
| + "//ui/resources:ui_test_pak", |
| + "//ui/views", |
| + "//ui/views:test_support_internal", |
| + ] |
| + |
| + # TODO(thakis): This should be a data_deps on //ui/resources:ui_test_pak, but |
| + # that has no effect. (See similar TODOs elsewhere ui_test.pak is listed) |
| + data = [ |
|
Dirk Pranke
2016/05/16 17:35:06
This should be `data_deps = [ "//ui/resources:ui_t
James Cook
2016/05/16 20:09:46
Done here and in ui/views/BUILD.gn, which seems to
|
| + "$root_out_dir/ui_test.pak", |
| + ] |
| +} |
| + |
| test("views_mus_unittests") { |
| testonly = true |
| @@ -134,14 +167,10 @@ test("views_mus_unittests") { |
| # TODO(sky): add more files. |
| sources = [ |
| - "../run_all_unittests.cc", |
| - "../run_all_unittests.h", |
| - "../test/native_widget_factory_mus.cc", |
| "../view_targeter_unittest.cc", |
| "../widget/native_widget_unittest.cc", |
| "../widget/widget_unittest.cc", |
| "native_widget_mus_unittest.cc", |
| - "platform_test_helper_mus.cc", |
| "platform_window_mus_unittest.cc", |
| "run_all_unittests_mus.cc", |
| "screen_mus_unittest.cc", |
| @@ -150,17 +179,13 @@ test("views_mus_unittests") { |
| deps = [ |
| ":mus", |
| + ":test_support", |
| "//base", |
| "//base:i18n", |
| - "//base/test:test_support", |
| "//cc", |
| "//components/mus/public/cpp", |
| "//components/mus/public/interfaces", |
| - "//services/shell/background:lib", |
| - "//services/shell/background:main", |
| - "//services/shell/background/tests:test_support", |
| - "//services/shell/public/cpp:sources", |
| - "//services/shell/runner/host:lib", |
| + "//services/shell/background:main", # Provides main(). |
| "//skia", |
| "//testing/gtest", |
| "//third_party/icu", |
| @@ -177,11 +202,7 @@ test("views_mus_unittests") { |
| "//ui/events/platform", |
| "//ui/gfx:test_support", |
| "//ui/gfx/geometry", |
| - "//ui/gl:test_support", |
| - "//ui/resources", |
| - "//ui/resources:ui_test_pak", |
| "//ui/strings", |
| - "//ui/touch_selection", |
| "//ui/views", |
| "//ui/views:test_support_internal", |
| "//ui/wm", |
| @@ -193,12 +214,6 @@ test("views_mus_unittests") { |
| "//mash/wm", |
| ] |
| - # TODO(thakis): This should be a data_deps on //ui/resources:ui_test_pak, but |
| - # that has no effect. (See similar TODOs elsewhere ui_test.pak is listed) |
| - data = [ |
| - "$root_out_dir/ui_test.pak", |
| - ] |
| - |
| if (is_win) { |
| deps += [ |
| "//build/win:default_exe_manifest", |
| @@ -225,12 +240,66 @@ test("views_mus_unittests") { |
| } |
| } |
| +# Tests that must run sequentially because they access system-wide features |
| +# like capture. |
| +test("views_mus_interactive_ui_tests") { |
| + testonly = true |
| + |
| + configs += [ "//build/config:precompiled_headers" ] |
| + |
| + sources = [ |
| + "../widget/widget_interactive_uitest.cc", |
| + "interactive_ui_tests_mus.cc", |
| + ] |
| + |
| + deps = [ |
| + ":mus", |
| + ":test_support", |
| + "//base", |
| + "//services/shell/background:main", # Provides main(). |
| + "//ui/aura", |
| + "//ui/base", |
| + "//ui/base/ime", |
| + "//ui/events:events_base", |
| + "//ui/events:test_support", |
| + "//ui/gl:test_support", |
| + "//ui/touch_selection", |
| + "//ui/views", |
| + "//ui/views:test_support_internal", |
| + "//ui/wm", |
| + ] |
| + |
| + data_deps = [ |
| + ":interactive_ui_tests_manifest", |
| + "//mash/wm", |
| + ] |
| + |
| + if (is_win) { |
| + deps += [ |
| + "//build/win:default_exe_manifest", |
| + "//third_party/iaccessible2", |
| + "//third_party/wtl", |
| + ] |
| + libs = [ |
| + "imm32.lib", |
| + "oleacc.lib", |
| + "comctl32.lib", |
| + ] |
| + } |
| +} |
| + |
| mojo_application_manifest("unittests_manifest") { |
| type = "exe" |
| application_name = "views_mus_unittests" |
| source = "unittests_manifest.json" |
| } |
| +mojo_application_manifest("interactive_ui_tests_manifest") { |
| + type = "exe" |
| + application_name = "views_mus_interactive_ui_tests" |
| + source = "interactive_ui_tests_manifest.json" |
| +} |
| + |
| group("for_component") { |
| public_deps = [ |
| ":mus", |