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

5 files changed, 46 insertions, 8 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',
diff --git a/build/all.gyp b/build/all.gyp
index 32518f4..2f6be02f 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -646,6 +646,11 @@
             ['use_ash==1', {
               'dependencies': [
                 '../ash/ash.gyp:ash_shell',
+                # With aura_shell_unittests as a target ash_unittests (the new
+                # name) will be built as well.  We need both until all build
+                # bots are running ash_unittests as the test target.
+                # TODO(jamescook): Switch to ash_unittests after all bots on
+                # waterfall are using the new name.  crbug.com/110107
                 '../ash/ash.gyp:aura_shell_unittests',
               ],
             }],
diff --git a/build/cp.py b/build/cp.py
index d0c46f41..dd98e1d 100755
--- a/build/cp.py
+++ b/build/cp.py
@@ -14,7 +14,8 @@ import sys
 
 
 def Main(src, dst):
-  return shutil.copyfile(src, dst)
+  # Use copy instead of copyfile to ensure the executable bit is copied.
+  return shutil.copy(src, dst)
 
 
 if __name__ == '__main__':
diff --git a/tools/heapcheck/chrome_tests.py b/tools/heapcheck/chrome_tests.py
index c8dfcae..52af2e9 100755
--- a/tools/heapcheck/chrome_tests.py
+++ b/tools/heapcheck/chrome_tests.py
@@ -78,7 +78,7 @@ class ChromeTests(object):
     # The known list of tests.
     # Recognise the original abbreviations as well as full executable names.
     self._test_list = {
-      "ash": self.TestAsh,              "aura_shell_unittests": self.TestAsh,
+      "ash": self.TestAsh,              "ash_unittests": self.TestAsh,
       "aura": self.TestAura,            "aura_unittests": self.TestAura,
       "base": self.TestBase,            "base_unittests": self.TestBase,
       "browser": self.TestBrowser,      "browser_tests": self.TestBrowser,
@@ -244,7 +244,7 @@ class ChromeTests(object):
     return heapcheck_test.RunTool(cmd, supp, module)
 
   def TestAsh(self):
-    return self.SimpleTest("ash", "aura_shell_unittests")
+    return self.SimpleTest("ash", "ash_unittests")
 
   def TestAura(self):
     return self.SimpleTest("aura", "aura_unittests")
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index 0b88cb5..07285fe7 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -225,7 +225,7 @@ class ChromeTests:
     return tool.Run(cmd, None)
 
   def TestAsh(self):
-    return self.SimpleTest("ash", "aura_shell_unittests")
+    return self.SimpleTest("ash", "ash_unittests")
 
   def TestAura(self):
     return self.SimpleTest("aura", "aura_unittests")
@@ -474,7 +474,7 @@ class ChromeTests:
   # Recognise the original abbreviations as well as full executable names.
   _test_list = {
     "cmdline" : RunCmdLine,
-    "ash": TestAsh,              "aura_shell_unittests": TestAsh,
+    "ash": TestAsh,              "ash_unittests": TestAsh,
     "aura": TestAura,            "aura_unittests": TestAura,
     "automated_ui" : TestAutomatedUI,
     "base": TestBase,            "base_unittests": TestBase,