Skip to content

GitLab

T
tangled
Commit d22dcfdd authored by tfarina's avatar tfarina Committed by Commit bot
Browse files
Options

Move ui:unittests target into ui/base/BUILD.gn 

With commit 2148b92f, ui_unittests is now in
ui/base/ui_base_tests.gyp.

To mirror this change in GN, we moved the unittests target into
ui/base/BUILD.gn

BUG=331829,373148,299841,103304
TEST=gn gen out/Debug_gn && ninja -C out/Debug_gn ui/base:unittests
R=brettw@chromium.org,sky@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#293960}
parent 14eb3501
Hide whitespace changes
Inline Side-by-side
Showing with 198 additions and 179 deletions
BUILD.gn
View file @ d22dcfdd
...@@ -107,10 +107,9 @@ group("root") { ...@@ -107,10 +107,9 @@ group("root") {
"//third_party:jpeg", "//third_party:jpeg",
"//tools/gn", "//tools/gn",
"//tools/imagediff($host_toolchain)", "//tools/imagediff($host_toolchain)",
"//ui:ui_unittests", "//ui/accessibility",
"//ui/app_list", "//ui/app_list",
"//ui/aura", "//ui/aura",
"//ui/accessibility",
"//ui/base", "//ui/base",
"//ui/display", "//ui/display",
"//ui/events", "//ui/events",
...@@ -228,7 +227,6 @@ group("root") { ...@@ -228,7 +227,6 @@ group("root") {
"//third_party/cld_2", "//third_party/cld_2",
"//third_party/libaddressinput", "//third_party/libaddressinput",
"//third_party/ffmpeg", "//third_party/ffmpeg",
"//ui:ui_unittests",
"//ui/app_list", "//ui/app_list",
"//ui/web_dialogs", "//ui/web_dialogs",
"//ui/wm", "//ui/wm",
......
ui/BUILD.gn deleted 100644 → 0
View file @ 14eb3501
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ui.gni")
test("ui_unittests") {
sources = [
"base/layout_unittest.cc",
"base/l10n/l10n_util_mac_unittest.mm",
"base/l10n/l10n_util_unittest.cc",
"base/l10n/l10n_util_win_unittest.cc",
"base/l10n/time_format_unittest.cc",
"base/models/tree_node_iterator_unittest.cc",
"base/resource/data_pack_literal.cc",
"base/resource/data_pack_unittest.cc",
"base/resource/resource_bundle_unittest.cc",
"base/test/run_all_unittests.cc",
]
if (is_ios) {
# Compile this Mac file on iOS as well.
set_sources_assignment_filter([])
sources += [ "base/l10n/l10n_util_mac_unittest.mm" ]
set_sources_assignment_filter(sources_assignment_filter)
} else { # !is_ios
sources += [
"base/accelerators/accelerator_manager_unittest.cc",
"base/accelerators/menu_label_accelerator_util_linux_unittest.cc",
"base/clipboard/custom_data_helper_unittest.cc",
"base/cocoa/base_view_unittest.mm",
"base/cocoa/cocoa_base_utils_unittest.mm",
"base/cocoa/controls/blue_label_button_unittest.mm",
"base/cocoa/controls/hover_image_menu_button_unittest.mm",
"base/cocoa/controls/hyperlink_button_cell_unittest.mm",
"base/cocoa/focus_tracker_unittest.mm",
"base/cocoa/fullscreen_window_manager_unittest.mm",
"base/cocoa/hover_image_button_unittest.mm",
"base/cocoa/menu_controller_unittest.mm",
"base/cocoa/nsgraphics_context_additions_unittest.mm",
"base/cocoa/tracking_area_unittest.mm",
"base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc",
"base/ime/candidate_window_unittest.cc",
"base/ime/chromeos/character_composer_unittest.cc",
"base/ime/composition_text_util_pango_unittest.cc",
"base/ime/input_method_base_unittest.cc",
"base/ime/input_method_chromeos_unittest.cc",
"base/ime/remote_input_method_win_unittest.cc",
"base/ime/win/imm32_manager_unittest.cc",
"base/ime/win/tsf_input_scope_unittest.cc",
"base/models/list_model_unittest.cc",
"base/models/list_selection_model_unittest.cc",
"base/models/tree_node_model_unittest.cc",
"base/test/data/resource.h",
"base/text/bytes_formatting_unittest.cc",
"base/view_prop_unittest.cc",
"base/webui/web_ui_util_unittest.cc",
"base/x/selection_requestor_unittest.cc",
]
if (!use_x11) {
if (is_chromeos) {
# These were already removed in the chromeos case.
sources -= [
"base/ime/chromeos/character_composer_unittest.cc",
"base/ime/input_method_chromeos_unittest.cc",
]
}
sources -= [ "base/ime/composition_text_util_pango_unittest.cc" ]
}
}
deps = [
"//base",
"//base/allocator",
"//base/test:test_support",
"//net",
"//skia",
"//testing/gmock",
"//testing/gtest",
"//third_party/icu",
"//ui/base",
"//ui/base:test_support",
"//ui/events:events_base",
"//ui/events:test_support",
"//ui/gfx:test_support",
"//ui/resources",
"//ui/resources:ui_test_pak",
"//ui/strings",
"//url",
]
if (is_ios) {
# TODO(GYP) lots of iOS-only steps for ui_unittests
}
if (is_win) {
sources += [
"base/dragdrop/os_exchange_data_win_unittest.cc",
"base/win/hwnd_subclass_unittest.cc",
"base/win/open_file_name_win_unittest.cc",
]
ldflags = [
"/DELAYLOAD:d2d1.dll",
"/DELAYLOAD:d3d10_1.dll",
]
libs = [
"d2d1.lib",
"d3d10_1.lib",
"imm32.lib",
"oleacc.lib",
]
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
cflags = [ "/wd4267" ]
}
if (is_android) {
deps += [
#"testing/android/native_test.gyp:native_test_native_code" TODO(GYP)
]
}
if (use_pango) {
configs += [ "//build/config/linux:pangocairo" ]
}
if (use_x11) {
sources += [ "base/cursor/cursor_loader_x11_unittest.cc" ]
configs += [ "//build/config/linux:x11" ]
deps += [
"//ui/events/platform/x11",
"//ui/gfx/x",
]
datadeps = [ "//tools/xdisplaycheck" ]
}
if (!is_win || !use_aura) {
sources -= [ "base/view_prop_unittest.cc" ]
}
if (is_mac) {
deps += [
"//third_party/mozilla",
#'ui_unittests_bundle', TODO(GYP)
]
}
if (use_aura || toolkit_views) {
sources += [ "base/dragdrop/os_exchange_data_unittest.cc" ]
deps += [
"//ui/events",
"//ui/events/platform",
]
}
if (is_chromeos) {
sources += [
"chromeos/touch_exploration_controller_unittest.cc",
]
sources -= [
"base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc",
"base/x/selection_requestor_unittest.cc",
]
deps += [
"//ui/aura:test_support",
"//ui/events:gesture_detection",
#'../chromeos/chromeos.gyp:chromeos', TODO(GYP)
#'chromeos/ui_chromeos.gyp:ui_chromeos',
]
}
}
# TODO(GYP) Mac (ui_unittest_bundle) and Android (ui_unittests_apk).
ui/base/BUILD.gn
View file @ d22dcfdd
...@@ -597,3 +597,199 @@ if (is_android) { ...@@ -597,3 +597,199 @@ if (is_android) {
jni_package = "base" jni_package = "base"
} }
} }
# TODO(GYP): Make this work on Android and reenable it.
if (!is_android) {
# GYP version: ui/base/ui_base_tests.gyp:ui_unittests
test("unittests") {
# TODO(tfarina): Rename this target to ui_base_unittests.
# In order to do this we will need to keep this target, add a dummy
# ui_base_unittests target that just points to ui_unittests, change
# buildbot code to reference the new 'ui_base_unittests' target.
# After buildbot is updated, we can make the changes in Chromium and
# remove 'ui_unittests' target. crbug.com/331829
output_name = "ui_unittests"
sources = [
"l10n/l10n_util_mac_unittest.mm",
"l10n/l10n_util_unittest.cc",
"l10n/l10n_util_win_unittest.cc",
"l10n/time_format_unittest.cc",
"layout_unittest.cc",
"models/tree_node_iterator_unittest.cc",
"resource/data_pack_literal.cc",
"resource/data_pack_unittest.cc",
"resource/resource_bundle_unittest.cc",
"test/run_all_unittests.cc",
]
if (is_ios) {
# Compile this Mac file on iOS as well.
set_sources_assignment_filter([])
sources += [ "l10n/l10n_util_mac_unittest.mm" ]
set_sources_assignment_filter(sources_assignment_filter)
} else { # !is_ios
sources += [
"accelerators/accelerator_manager_unittest.cc",
"accelerators/menu_label_accelerator_util_linux_unittest.cc",
"clipboard/custom_data_helper_unittest.cc",
"cocoa/base_view_unittest.mm",
"cocoa/cocoa_base_utils_unittest.mm",
"cocoa/controls/blue_label_button_unittest.mm",
"cocoa/controls/hover_image_menu_button_unittest.mm",
"cocoa/controls/hyperlink_button_cell_unittest.mm",
"cocoa/focus_tracker_unittest.mm",
"cocoa/fullscreen_window_manager_unittest.mm",
"cocoa/hover_image_button_unittest.mm",
"cocoa/menu_controller_unittest.mm",
"cocoa/nsgraphics_context_additions_unittest.mm",
"cocoa/tracking_area_unittest.mm",
"dragdrop/os_exchange_data_provider_aurax11_unittest.cc",
"ime/candidate_window_unittest.cc",
"ime/chromeos/character_composer_unittest.cc",
"ime/composition_text_util_pango_unittest.cc",
"ime/input_method_base_unittest.cc",
"ime/input_method_chromeos_unittest.cc",
"ime/remote_input_method_win_unittest.cc",
"ime/win/imm32_manager_unittest.cc",
"ime/win/tsf_input_scope_unittest.cc",
"models/list_model_unittest.cc",
"models/list_selection_model_unittest.cc",
"models/tree_node_model_unittest.cc",
"test/data/resource.h",
"text/bytes_formatting_unittest.cc",
"view_prop_unittest.cc",
"webui/web_ui_util_unittest.cc",
"x/selection_requestor_unittest.cc",
]
if (!use_x11) {
if (is_chromeos) {
# These were already removed in the chromeos case.
sources -= [
"ime/chromeos/character_composer_unittest.cc",
"ime/input_method_chromeos_unittest.cc",
]
}
sources -= [ "ime/composition_text_util_pango_unittest.cc" ]
}
}
deps = [
"//base",
"//base/allocator",
"//base/test:test_support",
"//net",
"//skia",
"//testing/gmock",
"//testing/gtest",
"//third_party/icu",
"//ui/base",
"//ui/base:test_support",
"//ui/events:events_base",
"//ui/events:test_support",
"//ui/gfx:test_support",
"//ui/resources",
"//ui/resources:ui_test_pak",
"//ui/strings",
"//url",
]
if (is_ios) {
# TODO(GYP) lots of iOS-only steps for ui_unittests
}
if (is_win) {
sources += [
"dragdrop/os_exchange_data_win_unittest.cc",
"win/hwnd_subclass_unittest.cc",
"win/open_file_name_win_unittest.cc",
]
ldflags = [
"/DELAYLOAD:d2d1.dll",
"/DELAYLOAD:d3d10_1.dll",
]
libs = [
"d2d1.lib",
"d3d10_1.lib",
"imm32.lib",
"oleacc.lib",
]
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
cflags = [ "/wd4267" ]
}
if (is_android) {
deps += [
#"testing/android/native_test.gyp:native_test_native_code" TODO(GYP)
]
}
if (use_pango) {
configs += [
"//build/config/linux:pangocairo"
]
}
if (use_x11) {
sources += [
"cursor/cursor_loader_x11_unittest.cc"
]
configs += [
"//build/config/linux:x11"
]
deps += [
"//ui/events/platform/x11",
"//ui/gfx/x",
]
datadeps = [
"//tools/xdisplaycheck"
]
}
if (!is_win || !use_aura) {
sources -= [
"view_prop_unittest.cc"
]
}
if (is_mac) {
deps += [
"//third_party/mozilla",
#'ui_unittests_bundle', TODO(GYP)
]
}
if (use_aura || toolkit_views) {
sources += [
"dragdrop/os_exchange_data_unittest.cc"
]
deps += [
"//ui/events",
"//ui/events/platform",
]
}
if (is_chromeos) {
sources += [
"../chromeos/touch_exploration_controller_unittest.cc",
]
sources -= [
"dragdrop/os_exchange_data_provider_aurax11_unittest.cc",
"x/selection_requestor_unittest.cc",
]
deps += [
"//ui/aura:test_support",
"//ui/events:gesture_detection",
#'../chromeos/chromeos.gyp:chromeos', TODO(GYP)
#'chromeos/ui_chromeos.gyp:ui_chromeos',
]
}
}
}
# TODO(GYP) Mac (ui_unittest_bundle) and Android (ui_unittests_apk).
ui/base/ui_base_tests.gyp
View file @ d22dcfdd
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
# buildbot code to reference the new 'ui_base_unittests' target. # buildbot code to reference the new 'ui_base_unittests' target.
# After buildbot is updated, we can make the changes in Chromium and # After buildbot is updated, we can make the changes in Chromium and
# remove 'ui_unittests' target. crbug.com/331829 # remove 'ui_unittests' target. crbug.com/331829
# GN version: //ui/base:unittests
'target_name': 'ui_unittests', 'target_name': 'ui_unittests',
'type': '<(gtest_target_type)', 'type': '<(gtest_target_type)',
'dependencies': [ 'dependencies': [
......
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