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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/ui_base_tests.gyp

Issue 506483002: ui: Move ui_unittests.gyp into ui/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome.gyp ('k') | ui/base/ui_base_tests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ui_base_tests.gyp
diff --git a/ui/ui_unittests.gyp b/ui/base/ui_base_tests.gyp
similarity index 44%
rename from ui/ui_unittests.gyp
rename to ui/base/ui_base_tests.gyp
index 5b514ce7cd2072ab2647323143a9eedbc3feb0e8..5f0aa11a4dd7d1130245100fb16162f12a8c4861 100644
--- a/ui/ui_unittests.gyp
+++ b/ui/base/ui_base_tests.gyp
@@ -8,78 +8,84 @@
},
'targets': [
{
+ # 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
'target_name': 'ui_unittests',
'type': '<(gtest_target_type)',
'dependencies': [
- '../base/base.gyp:base',
- '../base/base.gyp:test_support_base',
- '../net/net.gyp:net',
- '../skia/skia.gyp:skia',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
- '../url/url.gyp:url_lib',
- 'base/ui_base.gyp:ui_base',
- 'base/ui_base.gyp:ui_base_test_support',
- 'events/events.gyp:events_base',
- 'gfx/gfx.gyp:gfx_test_support',
- 'resources/ui_resources.gyp:ui_resources',
- 'resources/ui_resources.gyp:ui_test_pak',
- 'strings/ui_strings.gyp:ui_strings',
+ '../../base/base.gyp:base',
+ '../../base/base.gyp:test_support_base',
+ '../../net/net.gyp:net',
+ '../../skia/skia.gyp:skia',
+ '../../testing/gmock.gyp:gmock',
+ '../../testing/gtest.gyp:gtest',
+ '../../third_party/icu/icu.gyp:icui18n',
+ '../../third_party/icu/icu.gyp:icuuc',
+ '../../url/url.gyp:url_lib',
+ '../events/events.gyp:events_base',
+ '../gfx/gfx.gyp:gfx_test_support',
+ '../resources/ui_resources.gyp:ui_resources',
+ '../resources/ui_resources.gyp:ui_test_pak',
+ '../strings/ui_strings.gyp:ui_strings',
+ 'ui_base.gyp:ui_base',
+ 'ui_base.gyp:ui_base_test_support',
],
# iOS uses a small subset of ui. common_sources are the only files that
# are built on iOS.
'common_sources' : [
# Note: file list duplicated in GN build.
- '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',
+ 'layout_unittest.cc',
+ 'l10n/l10n_util_mac_unittest.mm',
+ 'l10n/l10n_util_unittest.cc',
+ 'l10n/l10n_util_win_unittest.cc',
+ 'l10n/time_format_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',
],
'all_sources': [
# Note: file list duplicated in GN build.
'<@(_common_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',
+ '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',
],
'include_dirs': [
- '../',
+ '../..',
],
'conditions': [
['OS!="ios"', {
@@ -99,19 +105,19 @@
'action_name': 'copy_test_data',
'variables': {
'test_data_files': [
- 'base/test/data',
+ 'test/data',
],
- 'test_data_prefix' : 'ui',
+ 'test_data_prefix' : 'base',
},
- 'includes': [ '../build/copy_test_data_ios.gypi' ],
+ 'includes': [ '../../build/copy_test_data_ios.gypi' ],
},
],
}],
['OS == "win"', {
'sources': [
- 'base/dragdrop/os_exchange_data_win_unittest.cc',
- 'base/win/hwnd_subclass_unittest.cc',
- 'base/win/open_file_name_win_unittest.cc',
+ 'dragdrop/os_exchange_data_win_unittest.cc',
+ 'win/hwnd_subclass_unittest.cc',
+ 'win/open_file_name_win_unittest.cc',
],
'msvs_settings': {
'VCLinkerTool': {
@@ -136,44 +142,44 @@
}],
['OS == "android"', {
'dependencies': [
- '../testing/android/native_test.gyp:native_test_native_code',
+ '../../testing/android/native_test.gyp:native_test_native_code',
],
}],
['use_pango == 1', {
'dependencies': [
- '../build/linux/system.gyp:pangocairo',
+ '../../build/linux/system.gyp:pangocairo',
],
'conditions': [
['use_allocator!="none"', {
'dependencies': [
- '../base/allocator/allocator.gyp:allocator',
+ '../../base/allocator/allocator.gyp:allocator',
],
}],
],
}],
['use_x11==1', {
'dependencies': [
- '../build/linux/system.gyp:x11',
- '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
- 'events/platform/x11/x11_events_platform.gyp:x11_events_platform',
- 'gfx/x/gfx_x11.gyp:gfx_x11',
+ '../../build/linux/system.gyp:x11',
+ '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+ '../events/platform/x11/x11_events_platform.gyp:x11_events_platform',
+ '../gfx/x/gfx_x11.gyp:gfx_x11',
],
}],
['OS!="win" or use_aura==0', {
'sources!': [
- 'base/view_prop_unittest.cc',
+ 'view_prop_unittest.cc',
],
}],
['use_x11==1 and use_aura==1', {
'sources': [
- 'base/cursor/cursor_loader_x11_unittest.cc',
+ 'cursor/cursor_loader_x11_unittest.cc',
],
}],
['OS=="mac"', {
'dependencies': [
- '../third_party/mozilla/mozilla.gyp:mozilla',
- 'events/events.gyp:events_test_support',
- 'ui_unittests_bundle',
+ '../../third_party/mozilla/mozilla.gyp:mozilla',
+ '../events/events.gyp:events_test_support',
+ 'ui_base_tests_bundle',
],
'conditions': [
['component=="static_library"', {
@@ -184,35 +190,35 @@
}],
['use_aura==1 or toolkit_views==1', {
'sources': [
- 'base/dragdrop/os_exchange_data_unittest.cc',
+ 'dragdrop/os_exchange_data_unittest.cc',
],
'dependencies': [
- 'events/events.gyp:events',
- 'events/events.gyp:events_base',
- 'events/events.gyp:events_test_support',
- 'events/platform/events_platform.gyp:events_platform',
+ '../events/events.gyp:events',
+ '../events/events.gyp:events_base',
+ '../events/events.gyp:events_test_support',
+ '../events/platform/events_platform.gyp:events_platform',
],
}],
['chromeos==1', {
'dependencies': [
- '../chromeos/chromeos.gyp:chromeos',
- 'aura/aura.gyp:aura_test_support',
- 'chromeos/ui_chromeos.gyp:ui_chromeos',
- 'events/events.gyp:gesture_detection',
+ '../../chromeos/chromeos.gyp:chromeos',
+ '../aura/aura.gyp:aura_test_support',
+ '../chromeos/ui_chromeos.gyp:ui_chromeos',
+ '../events/events.gyp:gesture_detection',
],
'sources': [
- 'chromeos/touch_exploration_controller_unittest.cc'
+ '../chromeos/touch_exploration_controller_unittest.cc'
],
'sources!': [
- 'base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc',
- 'base/x/selection_requestor_unittest.cc',
+ 'dragdrop/os_exchange_data_provider_aurax11_unittest.cc',
+ 'x/selection_requestor_unittest.cc',
],
}],
['use_x11==0', {
'sources!': [
- 'base/ime/chromeos/character_composer_unittest.cc',
- 'base/ime/input_method_chromeos_unittest.cc',
- 'base/ime/composition_text_util_pango_unittest.cc',
+ 'ime/chromeos/character_composer_unittest.cc',
+ 'ime/input_method_chromeos_unittest.cc',
+ 'ime/composition_text_util_pango_unittest.cc',
],
}],
],
@@ -221,7 +227,7 @@
'sources/': [
# Pull in specific Mac files for iOS (which have been filtered out
# by file name rules).
- ['include', '^base/l10n/l10n_util_mac_unittest\\.mm$'],
+ ['include', '^l10n/l10n_util_mac_unittest\\.mm$'],
],
}],
],
@@ -232,12 +238,12 @@
['OS == "mac"', {
'targets': [
{
- 'target_name': 'ui_unittests_bundle',
+ 'target_name': 'ui_base_tests_bundle',
'type': 'shared_library',
'dependencies': [
- 'resources/ui_resources.gyp:ui_test_pak',
+ '../resources/ui_resources.gyp:ui_test_pak',
],
- 'includes': [ 'ui_unittests_bundle.gypi' ],
+ 'includes': [ 'ui_base_tests_bundle.gypi' ],
},
],
}],
@@ -252,7 +258,7 @@
'variables': {
'test_suite_name': 'ui_unittests',
},
- 'includes': [ '../build/apk_test.gypi' ],
+ 'includes': [ '../../build/apk_test.gypi' ],
},
],
}],
« no previous file with comments | « chrome/chrome.gyp ('k') | ui/base/ui_base_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698