Commit b5ec90e6 authored by tfarina@chromium.org's avatar tfarina@chromium.org

Rename test_support_ash and test_support_aura.

test_support_ash -> ash_test_support
test_support_aura -> aura_test_support

this means all the target names will align:

foo
foo_unittests
foo_test_support
et al.

BUG=163674
R=ben@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11428130

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171084 0039d316-1c4b-4281-b951-d872f2087c98
parent 087b9595
...@@ -457,7 +457,7 @@ ...@@ -457,7 +457,7 @@
], ],
}, },
{ {
'target_name': 'test_support_ash', 'target_name': 'ash_test_support',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'../skia/skia.gyp:skia', '../skia/skia.gyp:skia',
...@@ -502,7 +502,7 @@ ...@@ -502,7 +502,7 @@
'../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc', '../third_party/icu/icu.gyp:icuuc',
'../ui/aura/aura.gyp:aura', '../ui/aura/aura.gyp:aura',
'../ui/aura/aura.gyp:test_support_aura', '../ui/aura/aura.gyp:aura_test_support',
'../ui/app_list/app_list.gyp:app_list', '../ui/app_list/app_list.gyp:app_list',
'../ui/compositor/compositor.gyp:compositor', '../ui/compositor/compositor.gyp:compositor',
'../ui/compositor/compositor.gyp:compositor_test_support', '../ui/compositor/compositor.gyp:compositor_test_support',
...@@ -516,7 +516,7 @@ ...@@ -516,7 +516,7 @@
'../ui/views/views.gyp:views_with_content_test_support', '../ui/views/views.gyp:views_with_content_test_support',
'ash', 'ash',
'ash_resources', 'ash_resources',
'test_support_ash', 'ash_test_support',
], ],
'sources': [ 'sources': [
'../ui/views/test/test_views_delegate.cc', '../ui/views/test/test_views_delegate.cc',
......
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
}], }],
['use_ash==1', { ['use_ash==1', {
'dependencies': [ 'dependencies': [
'../ash/ash.gyp:test_support_ash', '../ash/ash.gyp:ash_test_support',
], ],
}], }],
['chromeos==1', { ['chromeos==1', {
...@@ -1348,7 +1348,7 @@ ...@@ -1348,7 +1348,7 @@
}], }],
['use_ash==1', { ['use_ash==1', {
'dependencies': [ 'dependencies': [
'../ash/ash.gyp:test_support_ash', '../ash/ash.gyp:ash_test_support',
], ],
}], }],
['chromeos==0', { ['chromeos==0', {
......
...@@ -1741,7 +1741,7 @@ ...@@ -1741,7 +1741,7 @@
], ],
'dependencies': [ 'dependencies': [
'../ash/ash.gyp:ash_resources', '../ash/ash.gyp:ash_resources',
'../ash/ash.gyp:test_support_ash', '../ash/ash.gyp:ash_test_support',
], ],
# We eventually want to compile both in Win Aura builds, see # We eventually want to compile both in Win Aura builds, see
# http://crbug.com/155545. # http://crbug.com/155545.
...@@ -1759,7 +1759,7 @@ ...@@ -1759,7 +1759,7 @@
}], }],
['use_aura==1', { ['use_aura==1', {
'dependencies': [ 'dependencies': [
'../ui/aura/aura.gyp:test_support_aura', '../ui/aura/aura.gyp:aura_test_support',
], ],
'sources/': [ 'sources/': [
['exclude', '^browser/automation/automation_provider_unittest.cc'], ['exclude', '^browser/automation/automation_provider_unittest.cc'],
...@@ -1935,7 +1935,7 @@ ...@@ -1935,7 +1935,7 @@
'dependencies': [ 'dependencies': [
'../build/linux/system.gyp:dbus', '../build/linux/system.gyp:dbus',
'../dbus/dbus.gyp:dbus_test_support', '../dbus/dbus.gyp:dbus_test_support',
'../ui/aura/aura.gyp:test_support_aura', '../ui/aura/aura.gyp:aura_test_support',
], ],
}], }],
['OS=="linux" and branding=="Chrome" and target_arch=="ia32"', { ['OS=="linux" and branding=="Chrome" and target_arch=="ia32"', {
......
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
}], }],
['use_aura==1', { ['use_aura==1', {
'dependencies': [ 'dependencies': [
'../ui/aura/aura.gyp:test_support_aura', '../ui/aura/aura.gyp:aura_test_support',
'../ui/compositor/compositor.gyp:compositor', '../ui/compositor/compositor.gyp:compositor',
], ],
}], }],
......
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
], ],
}, },
{ {
'target_name': 'test_support_aura', 'target_name': 'aura_test_support',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'../../skia/skia.gyp:skia', '../../skia/skia.gyp:skia',
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
'../ui.gyp:ui', '../ui.gyp:ui',
'../ui.gyp:ui_test_support', '../ui.gyp:ui_test_support',
'aura', 'aura',
'test_support_aura_pak', 'aura_test_support_pak',
], ],
'include_dirs': [ 'include_dirs': [
'..', '..',
...@@ -158,8 +158,8 @@ ...@@ -158,8 +158,8 @@
], ],
}, },
{ {
# We build a minimal set of resources required for test_support_aura. # We build a minimal set of resources required for aura_test_support.
'target_name': 'test_support_aura_pak', 'target_name': 'aura_test_support_pak',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'<(DEPTH)/ui/ui.gyp:ui_resources', '<(DEPTH)/ui/ui.gyp:ui_resources',
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
}, },
'actions': [ 'actions': [
{ {
'action_name': 'repack_test_support_aura_pack', 'action_name': 'repack_aura_test_support_pack',
'variables': { 'variables': {
'pak_inputs': [ 'pak_inputs': [
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
'<@(pak_inputs)', '<@(pak_inputs)',
], ],
'outputs': [ 'outputs': [
'<(PRODUCT_DIR)/test_support_aura_resources.pak', '<(PRODUCT_DIR)/aura_test_support_resources.pak',
], ],
'action': ['python', '<(repack_path)', '<@(_outputs)', 'action': ['python', '<(repack_path)', '<@(_outputs)',
'<@(pak_inputs)'], '<@(pak_inputs)'],
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
'../ui.gyp:ui_resources', '../ui.gyp:ui_resources',
'../../ipc/ipc.gyp:ipc', '../../ipc/ipc.gyp:ipc',
'aura', 'aura',
'test_support_aura', 'aura_test_support',
], ],
'include_dirs': [ 'include_dirs': [
'..', '..',
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
'../ui.gyp:ui', '../ui.gyp:ui',
'../ui.gyp:ui_resources', '../ui.gyp:ui_resources',
'aura', 'aura',
'test_support_aura', 'aura_test_support',
], ],
'include_dirs': [ 'include_dirs': [
'..', '..',
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
'../ui.gyp:ui', '../ui.gyp:ui',
'../ui.gyp:ui_resources', '../ui.gyp:ui_resources',
'../ui.gyp:ui_test_support', '../ui.gyp:ui_test_support',
'test_support_aura', 'aura_test_support',
'aura', 'aura',
], ],
'include_dirs': [ 'include_dirs': [
......
...@@ -16,7 +16,7 @@ TestAuraInitializer::TestAuraInitializer() { ...@@ -16,7 +16,7 @@ TestAuraInitializer::TestAuraInitializer() {
FilePath pak_file; FilePath pak_file;
PathService::Get(base::DIR_MODULE, &pak_file); PathService::Get(base::DIR_MODULE, &pak_file);
pak_file = pak_file.Append(FILE_PATH_LITERAL( pak_file = pak_file.Append(FILE_PATH_LITERAL(
"test_support_aura_resources.pak")); "aura_test_support_resources.pak"));
ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file); ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
#endif #endif
} }
......
...@@ -591,7 +591,7 @@ ...@@ -591,7 +591,7 @@
'conditions': [ 'conditions': [
['use_aura==1', { ['use_aura==1', {
'dependencies': [ 'dependencies': [
'../aura/aura.gyp:test_support_aura', '../aura/aura.gyp:aura_test_support',
'../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor',
], ],
}, { # use_aura==0 }, { # use_aura==0
...@@ -725,7 +725,7 @@ ...@@ -725,7 +725,7 @@
}], }],
[ 'use_aura==1', { [ 'use_aura==1', {
'dependencies': [ 'dependencies': [
'../aura/aura.gyp:test_support_aura', '../aura/aura.gyp:aura_test_support',
], ],
'sources/': [ 'sources/': [
['exclude', 'controls/table/table_view_unittest.cc'], ['exclude', 'controls/table/table_view_unittest.cc'],
......
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