Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Side by Side Diff: ui/views/BUILD.gn

Issue 2807833002: [views-mus] Prevent creating a native OzonePlatform in mus tests. (Closed)
Patch Set: Use the same detection method at all levels. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 import("//ui/base/ui_features.gni") 8 import("//ui/base/ui_features.gni")
9 import("//ui/ozone/ozone.gni") 9 import("//ui/ozone/ozone.gni")
10 import("//ui/vector_icons/vector_icons.gni") 10 import("//ui/vector_icons/vector_icons.gni")
(...skipping 888 matching lines...) Expand 10 before | Expand all | Expand 10 after
899 "view_model_unittest.cc", 899 "view_model_unittest.cc",
900 "view_model_utils_unittest.cc", 900 "view_model_utils_unittest.cc",
901 "view_targeter_unittest.cc", 901 "view_targeter_unittest.cc",
902 "view_unittest.cc", 902 "view_unittest.cc",
903 "view_unittest_mac.mm", 903 "view_unittest_mac.mm",
904 "widget/native_widget_mac_accessibility_unittest.mm", 904 "widget/native_widget_mac_accessibility_unittest.mm",
905 "widget/native_widget_mac_unittest.mm", 905 "widget/native_widget_mac_unittest.mm",
906 "widget/native_widget_unittest.cc", 906 "widget/native_widget_unittest.cc",
907 "widget/root_view_unittest.cc", 907 "widget/root_view_unittest.cc",
908 "widget/widget_unittest.cc", 908 "widget/widget_unittest.cc",
909 "widget/window_reorderer_unittest.cc",
910 "window/custom_frame_view_unittest.cc", 909 "window/custom_frame_view_unittest.cc",
911 "window/dialog_client_view_unittest.cc", 910 "window/dialog_client_view_unittest.cc",
912 "window/dialog_delegate_unittest.cc", 911 "window/dialog_delegate_unittest.cc",
913 ] 912 ]
914 913
915 configs += [ "//build/config:precompiled_headers" ] 914 configs += [ "//build/config:precompiled_headers" ]
916 915
917 # Make all deps in this target public so both views_unittests and 916 # Make all deps in this target public so both views_unittests and
918 # views_mus_unittests will get them. 917 # views_mus_unittests will get them.
919 public_deps = [ 918 public_deps = [
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
977 "//ui/events/devices", 976 "//ui/events/devices",
978 "//ui/events/platform/x11", 977 "//ui/events/platform/x11",
979 "//ui/gfx/x", 978 "//ui/gfx/x",
980 ] 979 ]
981 } 980 }
982 981
983 if (use_aura) { 982 if (use_aura) {
984 sources += [ 983 sources += [
985 "accessibility/ax_aura_obj_cache_unittest.cc", 984 "accessibility/ax_aura_obj_cache_unittest.cc",
986 "controls/native/native_view_host_aura_unittest.cc", 985 "controls/native/native_view_host_aura_unittest.cc",
987 "corewm/tooltip_controller_unittest.cc",
988 "touchui/touch_selection_menu_runner_views_unittest.cc", 986 "touchui/touch_selection_menu_runner_views_unittest.cc",
989 "view_unittest_aura.cc", 987 "view_unittest_aura.cc",
990 "widget/native_widget_aura_unittest.cc",
991 ] 988 ]
992 public_deps += [ 989 public_deps += [
993 "//ui/aura", 990 "//ui/aura",
994 "//ui/aura:test_support", 991 "//ui/aura:test_support",
995 "//ui/touch_selection", 992 "//ui/touch_selection",
996 "//ui/wm", 993 "//ui/wm",
997 ] 994 ]
998 } 995 }
999 996
1000 if (is_mac) { 997 if (is_mac) {
1001 # views_unittests not yet compiling on Mac. http://crbug.com/378134 998 # views_unittests not yet compiling on Mac. http://crbug.com/378134
1002 sources -= [ 999 sources -= [
1003 "bubble/bubble_window_targeter_unittest.cc", 1000 "bubble/bubble_window_targeter_unittest.cc",
1004 "controls/native/native_view_host_unittest.cc", 1001 "controls/native/native_view_host_unittest.cc",
1005 "widget/window_reorderer_unittest.cc",
1006 ] 1002 ]
1007 public_deps += [ "//ui/accelerated_widget_mac" ] 1003 public_deps += [ "//ui/accelerated_widget_mac" ]
1008 } 1004 }
1009 } 1005 }
1010 1006
1011 test("views_unittests") { 1007 test("views_unittests") {
1012 sources = [ 1008 sources = [
1013 "run_all_unittests_main.cc", 1009 "run_all_unittests_main.cc",
1014 1010
1015 # EventGenerator doesn't work well with IME in mus so this must not be in 1011 # EventGenerator doesn't work well with IME in mus so this must not be in
1016 # the shared unit test sources. 1012 # the shared unit test sources.
1017 # crbug.com/615033 crbug.com/548407 1013 # crbug.com/615033 crbug.com/548407
1018 "controls/textfield/textfield_unittest.cc", 1014 "controls/textfield/textfield_unittest.cc",
1019 ] 1015 ]
1020 1016
1021 if (use_aura) { 1017 if (use_aura) {
1022 sources += [ 1018 sources += [
1019 # These tests currently use AuraTestBase, but then try to use views
sky 2017/04/10 23:53:26 Please file a bug on these so we can update them.
1020 # objects. Thus, when they are run in views_mus_unittests, they test the
1021 # local aura path instead of the remote mus path, so pull them out.
1023 # Some of the tests need drag-drop support. crbug.com/614037 1022 # Some of the tests need drag-drop support. crbug.com/614037
Elliot Glaysher 2017/04/10 23:46:14 git cl format is preventing me from separating the
1023 "corewm/tooltip_controller_unittest.cc",
1024 "touchui/touch_selection_controller_impl_unittest.cc", 1024 "touchui/touch_selection_controller_impl_unittest.cc",
1025 "widget/native_widget_aura_unittest.cc",
1026 "widget/window_reorderer_unittest.cc",
1025 ] 1027 ]
1026 1028
1029 if (is_mac) {
1030 # views_unittests not yet compiling on Mac. http://crbug.com/378134
1031 sources -= [ "widget/window_reorderer_unittest.cc" ]
1032 }
1033
1027 if (!is_chromeos) { 1034 if (!is_chromeos) {
1028 sources += [ 1035 sources += [
1029 "widget/desktop_aura/desktop_focus_rules_unittest.cc", 1036 "widget/desktop_aura/desktop_focus_rules_unittest.cc",
1030 "widget/desktop_aura/desktop_native_widget_aura_unittest.cc", 1037 "widget/desktop_aura/desktop_native_widget_aura_unittest.cc",
1031 ] 1038 ]
1032 if (use_x11) { 1039 if (use_x11) {
1033 sources += [ 1040 sources += [
1034 "widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc", 1041 "widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc",
1035 "widget/desktop_aura/desktop_screen_x11_unittest.cc", 1042 "widget/desktop_aura/desktop_screen_x11_unittest.cc",
1036 "widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc", 1043 "widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc",
(...skipping 28 matching lines...) Expand all
1065 "//ui/base:test_support", 1072 "//ui/base:test_support",
1066 "//ui/compositor", 1073 "//ui/compositor",
1067 "//ui/events:test_support", 1074 "//ui/events:test_support",
1068 "//ui/gl:test_support", 1075 "//ui/gl:test_support",
1069 "//ui/resources", 1076 "//ui/resources",
1070 "//ui/resources:ui_test_pak", 1077 "//ui/resources:ui_test_pak",
1071 "//ui/strings", 1078 "//ui/strings",
1072 ] 1079 ]
1073 } 1080 }
1074 } 1081 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698