diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 21:27:03 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 21:27:03 +0000 |
| commit | c11172a63e28cd015bb29fb5dcd6c5291d40f1cf (patch) | |
| tree | 96dae502ac01f7adfa260a0e6e3f771c2006e262 /ash | |
| parent | bc6d4db439f0eb5bf3a7f3147639349171db1107 (diff) | |
| download | chromium_src-c11172a63e28cd015bb29fb5dcd6c5291d40f1cf.zip chromium_src-c11172a63e28cd015bb29fb5dcd6c5291d40f1cf.tar.gz chromium_src-c11172a63e28cd015bb29fb5dcd6c5291d40f1cf.tar.bz2 | |
Rename aura_shell_unittests to ash_unittests, part 1
* Rename aura_shell_unittests target to ash_unittests
* Add a target for aura_shell_unittests that makes a copy of ash_unittests
We need the old copy until we can switch the build bots to using the new copy.
cp.py needs to change slightly to preserve the executable bit of the test binary.
BUG=110107
TEST=Run build/gyp_chromium, inspected build.ninja files to verify rules existed for both ash_unittests and aura_shell_unittests, built and ran both targets
TBR=thestig@chromium.org for trivial rename in tools/valgrind/chrome_test.py
Review URL: https://chromiumcodereview.appspot.com/10700163
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146654 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/ash.gyp | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index cbc620f..101740b 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -354,7 +354,7 @@ ], }, { - 'target_name': 'aura_shell_unittests', + 'target_name': 'ash_unittests', 'type': 'executable', 'dependencies': [ '../base/base.gyp:base', @@ -394,7 +394,7 @@ 'launcher/launcher_context_menu_unittest.cc', 'launcher/launcher_model_unittest.cc', 'launcher/launcher_navigator_unittest.cc', - 'launcher/launcher_tooltip_manager_unittest.cc', + 'launcher/launcher_tooltip_manager_unittest.cc', 'launcher/launcher_unittest.cc', 'launcher/launcher_view_unittest.cc', 'root_window_controller_unittest.cc', @@ -468,7 +468,7 @@ 'sources/': [ ['exclude', 'accelerators/accelerator_controller_unittest.cc'], ['exclude', 'accelerators/accelerator_filter_unittest.cc'], - ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc'], + ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc'], ['exclude', 'drag_drop/drag_drop_controller_unittest.cc'], ['exclude', 'tooltips/tooltip_controller_unittest.cc'], ], @@ -482,6 +482,38 @@ }], ], }, + # ash_unittests was formerly named aura_shell_unittests. While the build + # bots are being switched to use the new name we need to support both + # executables. + # TODO(jamescook): Remove this section when build bots are building and + # running ash_unittests. + { + 'target_name': 'aura_shell_unittests', + 'type': 'none', + 'dependencies': [ + 'ash_unittests', + ], + 'actions': [ + { + 'message': 'TEMPORARY: Copy ash_unittests to aura_shell_unittests', + 'action_name': 'copy_ash_unittests', + 'variables': { + 'source_file': '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)', + 'dest_file': '<(PRODUCT_DIR)/aura_shell_unittests<(EXECUTABLE_SUFFIX)', + }, + 'inputs': [ + '<(DEPTH)/build/cp.py', + '<(source_file)', + ], + 'outputs': [ + '<(dest_file)', + ], + 'action': [ + 'python', '<(DEPTH)/build/cp.py', '<(source_file)', '<(dest_file)', + ], + }, + ], + }, { 'target_name': 'ash_shell', 'type': 'executable', |