Skip to content

Commit

Permalink
MacViews: Consolidate interactive_ui_tests source lists in gyp and GN
Browse files Browse the repository at this point in the history 
interactive_ui_tests was recently ported to gn in r310072 (all good wrt
MacViews).  Now is a good opportunity to make things a bit neater, and
get things closer to flipping toolkit_views=1 on Mac

This collapses the `sources!` filter for Mac+toolkit_views into
chrome_interactive_ui_test_views_non_mac_sources which now follows the
pattern that is already used in chrome_browser_ui.gypi. That is,
chrome_browser_ui_views_non_mac_sources and friends.

This does move a few more views test files out of interactive_ui_tests
on MacViews. These were compiling and linking, but had failing tests.
E.g. they do stuff like static_cast<BrowserView*>(browser->window())
which won't work while the browser is still Cocoa-based.

BUG=402679

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

Cr-Commit-Position: refs/heads/master@{#310731}
  • Loading branch information
@tapted
tapted authored and Commit bot committed Jan 9, 2015
1 parent 24c45d1 commit 66c9d8a
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 35 deletions.
36 changes: 16 additions & 20 deletions chrome/chrome_tests.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -942,26 +942,21 @@
'browser/ui/views/message_center/web_notification_tray_browsertest.cc',
'browser/ui/views/panels/panel_view_browsertest.cc',
],
# Cross-platform views interactive tests ready for toolkit-views on Mac.
'chrome_interactive_ui_test_views_sources': [
'../ui/views/controls/webview/webview_interactive_uitest.cc',
'../ui/views/corewm/desktop_capture_controller_unittest.cc',
'../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc',
'../ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc',
'../ui/views/widget/widget_interactive_uitest.cc',
'browser/ui/views/ash/tab_scrubber_browsertest.cc',
'browser/ui/views/find_bar_controller_interactive_uitest.cc',
'browser/ui/views/frame/browser_view_focus_uitest.cc',
'browser/ui/views/frame/browser_view_interactive_uitest.cc',
'browser/ui/views/keyboard_access_browsertest.cc',
'browser/ui/views/menu_controller_interactive_uitest.cc',
'browser/ui/views/menu_item_view_interactive_uitest.cc',
'browser/ui/views/menu_model_adapter_test.cc',
'browser/ui/views/menu_test_base.cc',
'browser/ui/views/menu_test_base.h',
'browser/ui/views/menu_model_adapter_test.cc',
'browser/ui/views/menu_view_drag_and_drop_test.cc',
'browser/ui/views/passwords/manage_passwords_icon_view_browsertest.cc',
'browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc',
'browser/ui/views/toolbar/toolbar_button_test.cc',
'test/base/view_event_test_base.cc',
'test/base/view_event_test_base.h',
],
Expand All @@ -982,18 +977,28 @@
'app/chrome_dll.rc',
'test/data/resource.rc',
],
'chrome_interactive_ui_test_non_mac_sources': [
# Cross-platform (except Mac) views interactive tests.
# TODO(tapted): Move these to chrome_interactive_ui_test_views_sources when
# the corresponding files are moved in chrome_browser_ui.gypi (i.e. out of
# chrome_browser_ui_views_non_mac_sources).
'chrome_interactive_ui_test_views_non_mac_sources': [
'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
'browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h',
'browser/ui/views/constrained_window_views_browsertest.cc',
'browser/ui/views/find_bar_controller_interactive_uitest.cc',
'browser/ui/views/find_bar_host_interactive_uitest.cc',
'browser/ui/views/frame/browser_view_focus_uitest.cc',
'browser/ui/views/frame/browser_view_interactive_uitest.cc',
'browser/ui/views/keyboard_access_browsertest.cc',
'browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc',
'browser/ui/views/location_bar/star_view_browsertest.cc',
'browser/ui/views/omnibox/omnibox_view_views_browsertest.cc',
'browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc',
'browser/ui/views/passwords/manage_passwords_icon_view_browsertest.cc',
'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h',
'browser/ui/views/toolbar/toolbar_button_test.cc',
'browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc',
],
'chrome_interactive_ui_test_notifications_sources': [
Expand Down Expand Up @@ -1493,23 +1498,13 @@
],
}],
['OS=="mac"', {
'sources!': [
# TODO(tapted): Enable toolkit-views tests on Mac when their
# respective implementations are ported.

# Note: Sources list duplicated in GN build.
'browser/ui/views/keyboard_access_browsertest.cc',
'browser/ui/views/message_center/web_notification_tray_browsertest.cc',
'browser/ui/views/panels/panel_view_browsertest.cc',
'browser/ui/views/toolbar/toolbar_button_test.cc',
],
'dependencies': [
'chrome'
],
# See comment about the same line in chrome/chrome_tests.gypi.
'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
}, { # Non-Mac.
'sources': [ '<@(chrome_interactive_ui_test_non_mac_sources)' ],
'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources)' ],
}],
['notifications == 1', {
# Common notifications tests.
Expand Down Expand Up @@ -1586,7 +1581,8 @@
# ChromeOS doesn't use panels, everybody else does.
'sources': [ '<@(chrome_interactive_ui_test_panels_sources)' ],
'conditions': [
[ 'toolkit_views==1', {
# TODO(tapted): Include on mac when views panels are ported.
[ 'toolkit_views==1 and OS != "mac"', {
'sources': [
'<@(chrome_interactive_ui_test_panels_views_sources)',
],
Expand Down
24 changes: 9 additions & 15 deletions chrome/test/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,19 +275,17 @@ if (!is_android) {
"//ui/views:test_support",
"//ui/views/controls/webview:test_support",
]
if (!is_mac) {
sources += rebase_path(
gypi_values.chrome_interactive_ui_test_views_non_mac_sources,
".",
"//chrome")
}
if (is_linux) {
# TODO(gbillock): aura linux does not support the automation for
# SendMouseMoveNotifyWhenDone
sources -= [ "../browser/ui/views/toolbar/toolbar_button_test.cc" ]
}
if (is_mac) {
sources -= [
"../browser/ui/views/keyboard_access_browsertest.cc",
"../browser/ui/views/message_center/web_notification_tray_browsertest.cc",
"../browser/ui/views/panels/panel_view_browsertest.cc",
"../browser/ui/views/toolbar/toolbar_button_test.cc",
]
}
if (is_chromeos) {
sources -= [
"../../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc",
Expand Down Expand Up @@ -349,7 +347,9 @@ if (!is_android) {
rebase_path(gypi_values.chrome_interactive_ui_test_panels_sources,
".",
"//chrome")
if (toolkit_views) {

# TODO(tapted): Include on mac when views panels are ported.
if (toolkit_views && !is_mac) {
sources += rebase_path(
gypi_values.chrome_interactive_ui_test_panels_views_sources,
".",
Expand Down Expand Up @@ -395,12 +395,6 @@ if (!is_android) {
# when we tried to pull it up to the common.gypi level, it broke other
# things like the ui and startup tests. *shrug*
ldflags += [ "-Wl,-ObjC" ]
} else {
# Non-Mac.
sources +=
rebase_path(gypi_values.chrome_interactive_ui_test_non_mac_sources,
".",
"//chrome")
}

if (cld_version == 0 || cld_version == 2) {
Expand Down

0 comments on commit 66c9d8a

Please sign in to comment.